From: Wilfried Göesgens <willi@citadel.org>
Date: Wed, 11 Aug 2010 16:25:47 +0000 (+0000)
Subject: * remove no longer used room/floor loading functions
X-Git-Tag: v8.01~928
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=f6217395d8bbcd52875c0746f59b042655d0e19c

* remove no longer used room/floor loading functions
---

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 319b80f4e..139543ca4 100644
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -71,7 +71,7 @@ int is_view_allowed_as_default(int which_view)
 
 /*
  * load the list of floors
- */
+ * /
 void load_floorlist(StrBuf *Buf)
 {
 	int a;
@@ -95,132 +95,7 @@ void load_floorlist(StrBuf *Buf)
 		extract_token(floorlist[StrBufExtract_int(Buf, 0, '|')], ChrPtr(Buf), 1, '|', sizeof floorlist[0]);
 	}
 }
-
-
-
-
-/*
- * display rooms in tree structure
- */
-void room_tree_list(struct roomlisting *rp)
-{
-	char rmname[64];
-	int f;
-
-	if (rp == NULL) {
-		return;
-	}
-
-	room_tree_list(rp->lnext);
-
-	strcpy(rmname, rp->rlname);
-	f = rp->rlflags;
-
-	wc_printf("<a href=\"dotgoto?room=");
-	urlescputs(rmname);
-	wc_printf("\"");
-	wc_printf(">");
-	escputs1(rmname, 1, 1);
-	if ((f & QR_DIRECTORY) && (f & QR_NETWORK))
-		wc_printf("}");
-	else if (f & QR_DIRECTORY)
-		wc_printf("]");
-	else if (f & QR_NETWORK)
-		wc_printf(")");
-	else
-		wc_printf("&gt;");
-	wc_printf("</a><tt> </tt>\n");
-
-	room_tree_list(rp->rnext);
-	free(rp);
-}
-
-
-/* 
- * Room ordering stuff (compare first by floor, then by order)
- */
-int rordercmp(struct roomlisting *r1, struct roomlisting *r2)
-{
-	if ((r1 == NULL) && (r2 == NULL))
-		return (0);
-	if (r1 == NULL)
-		return (-1);
-	if (r2 == NULL)
-		return (1);
-	if (r1->rlfloor < r2->rlfloor)
-		return (-1);
-	if (r1->rlfloor > r2->rlfloor)
-		return (1);
-	if (r1->rlorder < r2->rlorder)
-		return (-1);
-	if (r1->rlorder > r2->rlorder)
-		return (1);
-	return (0);
-}
-
-
-/*
- * Common code for all room listings
- */
-void listrms(char *variety)
-{
-	char buf[SIZ];
-	int num_rooms = 0;
-
-	struct roomlisting *rl = NULL;
-	struct roomlisting *rp;
-	struct roomlisting *rs;
-
-	/* Ask the server for a room list */
-	serv_puts(variety);
-	serv_getln(buf, sizeof buf);
-	if (buf[0] != '1') {
-		wc_printf("&nbsp;");
-		return;
-	}
-
-	while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-		++num_rooms;
-		rp = malloc(sizeof(struct roomlisting));
-		extract_token(rp->rlname, buf, 0, '|', sizeof rp->rlname);
-		rp->rlflags = extract_int(buf, 1);
-		rp->rlfloor = extract_int(buf, 2);
-		rp->rlorder = extract_int(buf, 3);
-		rp->lnext = NULL;
-		rp->rnext = NULL;
-
-		rs = rl;
-		if (rl == NULL) {
-			rl = rp;
-		} else
-			while (rp != NULL) {
-				if (rordercmp(rp, rs) < 0) {
-					if (rs->lnext == NULL) {
-						rs->lnext = rp;
-						rp = NULL;
-					} else {
-						rs = rs->lnext;
-					}
-				} else {
-					if (rs->rnext == NULL) {
-						rs->rnext = rp;
-						rp = NULL;
-					} else {
-						rs = rs->rnext;
-					}
-				}
-			}
-	}
-
-	room_tree_list(rl);
-
-	/*
-	 * If no rooms were listed, print an nbsp to make the cell
-	 * borders show up anyway.
-	 */
-	if (num_rooms == 0) wc_printf("&nbsp;");
-}
-
+*/
 
 
 /*
@@ -1251,9 +1126,9 @@ void display_editroom(void)
 	tab = bstr("tab");
 	if (IsEmptyStr(tab)) tab = "admin";
 
-	Buf = NewStrBuf();
-	load_floorlist(Buf);
-	FreeStrBuf(&Buf);
+//	Buf = NewStrBuf();
+//	load_floorlist(Buf);
+//	FreeStrBuf(&Buf);
 	output_headers(1, 1, 1, 0, 0, 0);
 
 	wc_printf("<div class=\"fix_scrollbar_bug\">");
@@ -2585,7 +2460,7 @@ void display_entroom(void)
 	wc_printf("<tr class=\"odd\"><td>");
 	wc_printf(_("Resides on floor: "));
 	wc_printf("</td><td>");
-        load_floorlist(Buf); 
+//        load_floorlist(Buf); 
         wc_printf("<select name=\"er_floor\" size=\"1\">\n");
         for (i = 0; i < 128; ++i)
                 if (!IsEmptyStr(floorlist[i])) {
diff --git a/webcit/webcit.h b/webcit/webcit.h
index ba66fcceb..4ed2c2f24 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -730,7 +730,6 @@ void serv_gets(char *strbuf);
 void serv_write(const char *buf, int nbytes);
 void serv_putbuf(const StrBuf *string);
 void serv_printf(const char *format,...)__attribute__((__format__(__printf__,1,2)));
-void load_floorlist(StrBuf *Buf);
 void shutdown_sessions(void);
 void do_housekeeping(void);
 void smart_goto(const StrBuf *);