Cleaned up some commented-out stuff that was left in various files

[citadel.git] / citadel / serv_imap.c

diff --git a/citadel/serv_imap.c b/citadel/serv_imap.c
index fd64162af26a53ea7370303c1ae1f09a8ca79263..7862a298bb70d5a41bab7ae1e0b952b09b8f502e 100644 (file)
--- a/citadel/serv_imap.c
+++ b/citadel/serv_imap.c
@@ -2,7 +2,7 @@
  * $Id$ 
  *
  * IMAP server for the Citadel system
- * Copyright (C) 2000-2005 by Art Cancro and others.
+ * Copyright (C) 2000-2006 by Art Cancro and others.
  * This code is released under the terms of the GNU General Public License.
  *
  * WARNING: the IMAP protocol is badly designed.  No implementation of it
@@ -726,7 +726,9 @@ int imap_do_expunge(void)
                                delmsgs[num_delmsgs++] = IMAP->msgids[i];
                        }
                }
-               CtdlDeleteMessages(CC->room.QRname, delmsgs, num_delmsgs, "", 1);
+               if (num_delmsgs > 0) {
+                       CtdlDeleteMessages(CC->room.QRname, delmsgs, num_delmsgs, "", 1);
+               }
                num_expunged += num_delmsgs;
                free(delmsgs);
        }
@@ -1372,8 +1374,7 @@ void imap_rename(int num_parms, char *parms[])
                                           irl->irl_newfloor);
                        if (r != crr_ok) {
                                /* FIXME handle error returns better */
-                               lprintf(CTDL_ERR, "CtdlRenameRoom() error %d\n",
-                                       r);
+                               lprintf(CTDL_ERR, "CtdlRenameRoom() error %d\n", r);
                        }
                        irlp = irl;
                        irl = irl->next;