Cleaned up some syntax. Also cleaned up a

memory leak resulting from failure to free a struct
recptypes after calling validate_recipients()

diff --git a/citadel/serv_calendar.c b/citadel/serv_calendar.c
index fc087ff50f754449a8e9807e3b9b52df15d1e8eb..ec3f6f99036c9d4bf515ccd327c1c31447e3d052 100644 (file)
--- a/citadel/serv_calendar.c
+++ b/citadel/serv_calendar.c
@@ -323,6 +323,7 @@ void ical_send_a_reply(icalcomponent *request, char *action) {
                        valid = validate_recipients(organizer_string);
                        CtdlSubmitMsg(msg, valid, "");
                        CtdlFreeMessage(msg);
+                       free (valid);
                }
        }
        free(serialized_reply);

diff --git a/citadel/serv_network.c b/citadel/serv_network.c
index 94c3896bb43ac1233b8c169501e52b8c087a5b5e..09f4ec321a0de05739faa992aff24fcf8a55ea38 100644 (file)
--- a/citadel/serv_network.c
+++ b/citadel/serv_network.c
@@ -566,8 +566,7 @@ void network_deliver_list(struct CtdlMessage *msg, struct SpoolControl *sc) {
        /* Generate delivery instructions for each recipient */
        for (nptr = sc->listrecps; nptr != NULL; nptr = nptr->next) {
                size_t tmp = strlen(instr);
-               snprintf(&instr[tmp], instr_len - tmp,
-                        "remote|%s|0||\n", nptr->name);
+               snprintf(&instr[tmp], instr_len - tmp, "remote|%s|0||\n", nptr->name);
        }
 
        /*
@@ -1488,8 +1487,8 @@ void network_process_buffer(char *buffer, long size) {
                recp = validate_recipients(msg->cm_fields['R']);
                if (recp != NULL) if (recp->num_error != 0) {
                        network_bounce(msg,
-"A message you sent could not be delivered due to an invalid address.\n"
-"Please check the address and try sending the message again.\n");
+                               "A message you sent could not be delivered due to an invalid address.\n"
+                               "Please check the address and try sending the message again.\n");
                        msg = NULL;
                        free(recp);
                        return;

diff --git a/citadel/serv_smtp.c b/citadel/serv_smtp.c
index c52fca5864cd33ba9372d036f403e0c08854dff5..a3bcd4b665b9a72c7ccb95c984e2820db8a17418 100644 (file)
--- a/citadel/serv_smtp.c
+++ b/citadel/serv_smtp.c
@@ -106,11 +106,6 @@ enum {                             /* Command states for login authentication */
        smtp_plain
 };
 
-enum {                         /* Delivery modes */
-       smtp_deliver_local,
-       smtp_deliver_remote
-};
-
 #define SMTP           CC->SMTP
 #define SMTP_RECPS     CC->SMTP_RECPS
 #define SMTP_ROOMS     CC->SMTP_ROOMS

diff --git a/citadel/serv_vcard.c b/citadel/serv_vcard.c
index ff28f4d4d14ca893b23a00880c92a1fb19ddde37..49b21360cbb6e09914082e16546a3e8415fb4b6f 100644 (file)
--- a/citadel/serv_vcard.c
+++ b/citadel/serv_vcard.c
@@ -1006,7 +1006,6 @@ void check_get(void) {
                }
                if (rcpt != NULL) free (rcpt);
        }
-///    CC->kill_me = 1;
 }
 
 void check_get_greeting(void) {