* Tweaks to above

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index b18945eda31d9a553e360e69381cfb56bfe48d57..f6658fffa5e23e244dc5288b84f94766aaf4553e 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 625.28  2004/09/21 02:09:30  ajc
+ * Tweaks to above
+
  Revision 625.27  2004/09/21 01:43:23  ajc
  * imap_search.c: when search criteria permit, do not fetch messages.
 
@@ -6100,4 +6103,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/imap_search.c b/citadel/imap_search.c
index e42595904b39054c59d6aadc63b49543b035d565..5ab4738b4d6abff701252ed3627fa85d475fd439 100644 (file)
--- a/citadel/imap_search.c
+++ b/citadel/imap_search.c
@@ -77,7 +77,9 @@ int imap_do_search_msg(int seq, struct CtdlMessage *supplied_msg,
        struct CtdlMessage *msg = NULL;
        int need_to_free_msg = 0;
 
-       if (num_items == 0) return(0);
+       if (num_items == 0) {
+               return(0);
+       }
        msg = supplied_msg;
 
        /* Initially we start at the beginning. */
@@ -427,7 +429,6 @@ int imap_do_search_msg(int seq, struct CtdlMessage *supplied_msg,
        }
 
        if (need_to_free_msg) {
-               lprintf(CTDL_DEBUG, "imap search freeing message\n");
                CtdlFreeMessage(msg);
        }
        return(match);

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index a5ee3d785de13f5ea7618992ef2cd3b77604de31..d31663dc85d296fdb4d1c1ee6f59efcaf95e60b6 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -796,6 +796,8 @@ struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body)
        cit_uint8_t field_header;
        size_t field_length;
 
+       lprintf(CTDL_DEBUG, "CtdlFetchMessage(%ld, %d)\n", msgnum, with_body);
+
        dmsgtext = cdb_fetch(CDB_MSGMAIN, &msgnum, sizeof(long));
        if (dmsgtext == NULL) {
                return NULL;