* Third parameter of CtdlDeleteMessages() now takes "" instead of NULL to

  specify 'any MIME type'.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 5ffc5d98b3cc5a2c98cdad03ad0d5c88be2db5ff..30b10d0b1fde99767376afec31d50d1d316589d8 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 570.7  2000/03/27 03:08:19  ajc
+ * Third parameter of CtdlDeleteMessages() now takes "" instead of NULL to
+   specify 'any MIME type'.
+
  Revision 570.6  2000/03/27 01:14:08  nbryant
   * Makefile.in: generate parsedate.c automatically
   * configure.in: check for bison/byacc/yacc. bison seems to build cleaner
@@ -1791,4 +1795,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Initial CVS import 
-

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 486e89323a974d9403e56bff5f5b38fc739c59e3..54549f524cbab69a14fc362d227558b07622b90a 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1433,7 +1433,7 @@ void check_repl(long msgnum) {
        lprintf(9, "older!\n");
 
        /* Existing isn't newer?  Then delete the old one(s). */
-       CtdlDeleteMessages(CC->quickroom.QRname, msgnum, NULL);
+       CtdlDeleteMessages(CC->quickroom.QRname, msgnum, "");
 }
 
 
@@ -2178,7 +2178,7 @@ void cmd_ent3(char *entargs)
  */
 int CtdlDeleteMessages(char *room_name,                /* which room */
                       long dmsgnum,            /* or "0" for any */
-                      char *content_type       /* or NULL for any */
+                      char *content_type       /* or "" for any */
 )
 {
 
@@ -2192,7 +2192,7 @@ int CtdlDeleteMessages(char *room_name,           /* which room */
        struct SuppMsgInfo smi;
 
        lprintf(9, "CtdlDeleteMessages(%s, %ld, %s)\n",
-               room_name, dmsgnum, content_type ? content_type : "NULL");
+               room_name, dmsgnum, content_type);
 
        /* get room record, obtaining a lock... */
        if (lgetroom(&qrbuf, room_name) != 0) {
@@ -2217,7 +2217,7 @@ int CtdlDeleteMessages(char *room_name,           /* which room */
                        if ((dmsgnum == 0L) || (msglist[i] == dmsgnum)) {
                                delete_this |= 0x01;
                        }
-                       if (content_type == NULL) {
+                       if (strlen(content_type) > 0) {
                                delete_this |= 0x02;
                        } else {
                                GetSuppMsgInfo(&smi, msglist[i]);
@@ -2268,7 +2268,7 @@ void cmd_dele(char *delstr)
        }
        delnum = extract_long(delstr, 0);
 
-       num_deleted = CtdlDeleteMessages(CC->quickroom.QRname, delnum, NULL);
+       num_deleted = CtdlDeleteMessages(CC->quickroom.QRname, delnum, "");
 
        if (num_deleted) {
                cprintf("%d %d message%s deleted.\n", OK,
@@ -2319,7 +2319,7 @@ void cmd_move(char *args)
        /* Now delete the message from the source room,
         * if this is a 'move' rather than a 'copy' operation.
         */
-       if (is_copy == 0) CtdlDeleteMessages(CC->quickroom.QRname, num, NULL);
+       if (is_copy == 0) CtdlDeleteMessages(CC->quickroom.QRname, num, "");
 
        cprintf("%d Message %s.\n", OK, (is_copy ? "copied" : "moved") );
 }

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index 2c4cfa7eb2ef28d3f5958f8c50370d8d10e488fd..ffc406940e9f3151e1fa5447dcedd203111eeee9 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -1160,7 +1160,7 @@ void delete_room(struct quickroom *qrbuf)
        /* Delete the messages in the room
         * (Careful: this opens an S_QUICKROOM critical section!)
         */
-       CtdlDeleteMessages(qrbuf->QRname, 0L, NULL);
+       CtdlDeleteMessages(qrbuf->QRname, 0L, "");
 
        /* Flag the room record as not in use */
        lgetroom(qrbuf, qrbuf->QRname);

diff --git a/citadel/serv_pop3.c b/citadel/serv_pop3.c
index 59c7a2ca74c0282321826fd1b3fb900d907331ab..0a089c213b9968b81daa5364cb5448319c999f9f 100644 (file)
--- a/citadel/serv_pop3.c
+++ b/citadel/serv_pop3.c
@@ -366,7 +366,7 @@ void pop3_update(void) {
        if (POP3->num_msgs > 0) for (i=0; i<POP3->num_msgs; ++i) {
                if (POP3->msgs[i].deleted) {
                        CtdlDeleteMessages(MAILROOM,
-                               POP3->msgs[i].msgnum, NULL);
+                               POP3->msgs[i].msgnum, "");
                }
        }
 

diff --git a/citadel/serv_smtp.c b/citadel/serv_smtp.c
index 81d90956d56d6431342750c98491cb7cbc6a7626..de8aa98bff15e37e733ee1c0fb3f26492fe49789 100644 (file)
--- a/citadel/serv_smtp.c
+++ b/citadel/serv_smtp.c
@@ -583,7 +583,7 @@ int smtp_message_delivery(struct CtdlMessage *msg) {
        else {
                phree(instr);   /* only needed here, because CtdlSaveMsg()
                                 * would free this buffer otherwise */
-               CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, msgid, NULL); 
+               CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, msgid, ""); 
        }
 
        return(failed_saves);
@@ -1353,9 +1353,9 @@ void smtp_do_procmsg(long msgnum) {
         * No delivery instructions remain, so delete both the instructions
         * message and the message message.
         */
-       if (incomplete_deliveries_remaining <= 0)  {
-               CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, msgnum, NULL);    
-               CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, text_msgid, NULL);    
+       if (incomplete_deliveries_remaining <= 0) {
+               CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, msgnum, "");
+               CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, text_msgid, "");
        }
 
 
@@ -1364,7 +1364,7 @@ void smtp_do_procmsg(long msgnum) {
         * instructions and replace with the updated ones.
         */
        if (incomplete_deliveries_remaining > 0) {
-               CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, msgnum, NULL);    
+               CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, msgnum, "");
                msg = mallok(sizeof(struct CtdlMessage));
                memset(msg, 0, sizeof(struct CtdlMessage));
                msg->cm_magic = CTDLMESSAGE_MAGIC;