* Minor change to room list algorithm

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 047ae669a171e1bfc54fadb2cb784f08faeabb9e..fa7f5940957a79072531791642b447e8508272e6 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 410.18  2003/05/02 03:23:41  ajc
+* Minor change to room list algorithm
+
 Revision 410.17  2003/05/01 15:33:05  ajc
 * Fixed a potential memory leak in enumeration of MIME parts
 
@@ -1355,4 +1358,3 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
-

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 67f674aafd8a4d801629efda287844ebb7cf5f2d..a2c1f8f4ded2f4b8371d5e51e52cbae96a1a3082 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -93,12 +93,12 @@ void room_tree_list(struct roomlisting *rp)
        char rmname[64];
        int f;
 
-       if (rp == NULL)
+       if (rp == NULL) {
                return;
-
-       if (rp->lnext != NULL) {
-               room_tree_list(rp->lnext);
        }
+
+       room_tree_list(rp->lnext);
+
        strcpy(rmname, rp->rlname);
        f = rp->rlflags;
 
@@ -117,9 +117,7 @@ void room_tree_list(struct roomlisting *rp)
                wprintf(">");
        wprintf("</A><TT> </TT>\n");
 
-       if (rp->rnext != NULL) {
-               room_tree_list(rp->rnext);
-       }
+       room_tree_list(rp->rnext);
        free(rp);
 }
 

diff --git a/webcit/webcit.c b/webcit/webcit.c
index c524270b5a1aaa4f6ec1159255daa7e9813e0356..fc7931ebbd69045e26cb87a52e1f78fc9f9afcaa 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -686,13 +686,8 @@ void upload_handler(char *name, char *filename, char *partnum, char *disp,
 {
        struct urlcontent *u;
 
-       lprintf(5, "UPLOAD HANDLER CALLED\n");
-       lprintf(5, "       name = %s\n", name);
-       lprintf(5, "   filename = %s\n", filename);
-       lprintf(5, "   encoding = %s\n", encoding);
-       lprintf(5, "       type = %s\n", cbtype);
-       lprintf(5, "     length = %ld\n", (long)length);
-       lprintf(5, "disposition = %s\n", disp);
+       lprintf(5, "Upload handler called: %s, %ld bytes\n",
+               cbtype, (long)length);
 
        /* Form fields */
        if ( (length > 0) && (strlen(cbtype) == 0) ) {