fix various incidents reported by CLANG Static analyzer:

[citadel.git] / webcit / notes.c

diff --git a/webcit/notes.c b/webcit/notes.c
index d9a50bc68791217c8ccab47a00cedde5a0b3237b..94176a31209e24d4fd7e3b6497a5074b9c562215 100644 (file)
--- a/webcit/notes.c
+++ b/webcit/notes.c
@@ -28,7 +28,6 @@ struct vnote *vnote_new_from_msg(long msgnum,int unread)
        StrBuf *Buf;
        StrBuf *Data = NULL;
        const char *bptr;
-       int Done = 0;
        char uid_from_headers[256];
        char mime_partnum[256];
        char mime_filename[256];
@@ -43,6 +42,7 @@ struct vnote *vnote_new_from_msg(long msgnum,int unread)
        struct vnote *vnote_from_body = NULL;
        int vnote_inline = 0;                   /* 1 = MSG4 gave us a text/x-vnote top level */
 
+       uid_from_headers[0] = '\0';
        relevant_partnum[0] = '\0';
        serv_printf("MSG4 %ld", msgnum);        /* we need the mime headers */
        Buf = NewStrBuf();
@@ -51,10 +51,9 @@ struct vnote *vnote_new_from_msg(long msgnum,int unread)
                FreeStrBuf (&Buf);
                return NULL;
        }
-       while ((StrBuf_ServGetln(Buf)>=0) && !Done) {
+       while ((StrBuf_ServGetln(Buf)>=0)) {
                if ( (StrLength(Buf)==3) && 
                     !strcmp(ChrPtr(Buf), "000")) {
-                       Done = 1;
                        break;
                }
                bptr = ChrPtr(Buf);
@@ -131,7 +130,7 @@ struct vnote *vnote_new_from_msg(long msgnum,int unread)
 
        if (StrLength(Data) > 0) {
                if (IsEmptyStr(uid_from_headers)) {
-                       // Convert an old-style note to a vNote
+                       /* Convert an old-style note to a vNote */
                        vnote_from_body = vnote_new();
                        vnote_from_body->uid = strdup(uid_from_headers);
                        vnote_from_body->color_red = pastel_palette[3][0];
@@ -144,8 +143,10 @@ struct vnote *vnote_new_from_msg(long msgnum,int unread)
                        return vnote_from_body;
                }
                else {
-                       struct vnote *v = vnote_new_from_str(ChrPtr(Data));
-                       FreeStrBuf(&Data);
+                       char *Buf = SmashStrBuf(&Data);
+                       
+                       struct vnote *v = vnote_new_from_str(Buf);
+                       free(Buf);
                        return(v);
                }
        }
@@ -211,40 +212,38 @@ void ajax_update_note(void) {
 
         if (!havebstr("note_uid")) {
                begin_ajax_response();
-               wprintf("Received ajax_update_note() request without a note UID.");
+               wc_printf("Received ajax_update_note() request without a note UID.");
                end_ajax_response();
                return;
        }
 
-       // lprintf(9, "Note UID = %s\n", bstr("note_uid"));
        serv_printf("EUID %s", bstr("note_uid"));
        serv_getln(buf, sizeof buf);
        if (buf[0] != '2') {
                begin_ajax_response();
-               wprintf("Cannot find message containing vNote with the requested uid!");
+               wc_printf("Cannot find message containing vNote with the requested uid!");
                end_ajax_response();
                return;
        }
        msgnum = atol(&buf[4]);
-       // lprintf(9, "Note msg = %ld\n", msgnum);
-
-       // Was this request a delete operation?  If so, nuke it...
+       
+       /* Was this request a delete operation?  If so, nuke it... */
        if (havebstr("deletenote")) {
                if (!strcasecmp(bstr("deletenote"), "yes")) {
                        serv_printf("DELE %d", msgnum);
                        serv_getln(buf, sizeof buf);
                        begin_ajax_response();
-                       wprintf("%s", buf);
+                       wc_printf("%s", buf);
                        end_ajax_response();
                        return;
                }
        }
 
-       // If we get to this point it's an update, not a delete
+       /* If we get to this point it's an update, not a delete */
        v = vnote_new_from_msg(msgnum, 0);
        if (!v) {
                begin_ajax_response();
-               wprintf("Cannot locate a vNote within message %d\n", msgnum);
+               wc_printf("Cannot locate a vNote within message %d\n", msgnum);
                end_ajax_response();
                return;
        }
@@ -271,7 +270,7 @@ void ajax_update_note(void) {
         if (havebstr("blue")) {
                v->color_blue = atoi(bstr("blue"));
        }
-        if (havebstr("value")) {       // I would have preferred 'body' but InPlaceEditor hardcodes 'value'
+        if (havebstr("value")) {       /* I would have preferred 'body' but InPlaceEditor hardcodes 'value' */
                if (v->body) free(v->body);
                v->body = strdup(bstr("value"));
        }
@@ -351,7 +350,7 @@ void add_new_note(void) {
                vnote_free(v);
        }
        
-       readloop(readfwd);
+       readloop(readfwd, eUseDefault);
 }
 
 
@@ -426,14 +425,14 @@ int notes_GetParamsGetServerCall(SharedMessageStatus *Stat,
 {
        strcpy(cmd, "MSGS ALL");
        Stat->maxmsgs = 32767;
-       wprintf("<div id=\"new_notes_here\"></div>\n");
+       wc_printf("<div id=\"new_notes_here\"></div>\n");
        return 200;
 
 }
 
 int notes_Cleanup(void **ViewSpecific)
 {
-       end_burst();
+       wDumpContent(1);
        return 0;
 }
 
@@ -446,21 +445,22 @@ InitModule_NOTES
                VIEW_NOTES,
                notes_GetParamsGetServerCall,
                NULL,
+               NULL,
                notes_LoadMsgFromServer,
                NULL,
                notes_Cleanup);
 
-       WebcitAddUrlHandler(HKEY("add_new_note"), add_new_note, 0);
-       WebcitAddUrlHandler(HKEY("ajax_update_note"), ajax_update_note, 0);
-
-       RegisterNamespace("VNOTE:POS:LEFT", 0, 0, tmpl_vcard_put_posleft, CTX_VNOTE);
-       RegisterNamespace("VNOTE:POS:TOP", 0, 0, tmpl_vcard_put_postop, CTX_VNOTE);
-       RegisterNamespace("VNOTE:POS:WIDTH", 0, 0, tmpl_vcard_put_poswidth, CTX_VNOTE);
-       RegisterNamespace("VNOTE:POS:HEIGHT", 0, 0, tmpl_vcard_put_posheight, CTX_VNOTE);
-       RegisterNamespace("VNOTE:POS:HEIGHT2", 0, 0, tmpl_vcard_put_posheight2, CTX_VNOTE);
-       RegisterNamespace("VNOTE:POS:WIDTH2", 0, 0, tmpl_vcard_put_width2, CTX_VNOTE);
-       RegisterNamespace("VNOTE:COLOR", 0, 0, tmpl_vcard_put_color, CTX_VNOTE);
-       RegisterNamespace("VNOTE:BGCOLOR", 0, 0,tmpl_vcard_put_bgcolor, CTX_VNOTE);
-       RegisterNamespace("VNOTE:MSG", 0, 1, tmpl_vcard_put_message, CTX_VNOTE);
-       RegisterNamespace("VNOTE:UID", 0, 0, tmpl_vcard_put_uid, CTX_VNOTE);
+       WebcitAddUrlHandler(HKEY("add_new_note"), "", 0, add_new_note, 0);
+       WebcitAddUrlHandler(HKEY("ajax_update_note"), "", 0, ajax_update_note, 0);
+
+       RegisterNamespace("VNOTE:POS:LEFT", 0, 0, tmpl_vcard_put_posleft, NULL, CTX_VNOTE);
+       RegisterNamespace("VNOTE:POS:TOP", 0, 0, tmpl_vcard_put_postop, NULL, CTX_VNOTE);
+       RegisterNamespace("VNOTE:POS:WIDTH", 0, 0, tmpl_vcard_put_poswidth, NULL, CTX_VNOTE);
+       RegisterNamespace("VNOTE:POS:HEIGHT", 0, 0, tmpl_vcard_put_posheight, NULL, CTX_VNOTE);
+       RegisterNamespace("VNOTE:POS:HEIGHT2", 0, 0, tmpl_vcard_put_posheight2, NULL, CTX_VNOTE);
+       RegisterNamespace("VNOTE:POS:WIDTH2", 0, 0, tmpl_vcard_put_width2, NULL, CTX_VNOTE);
+       RegisterNamespace("VNOTE:COLOR", 0, 0, tmpl_vcard_put_color, NULL, CTX_VNOTE);
+       RegisterNamespace("VNOTE:BGCOLOR", 0, 0,tmpl_vcard_put_bgcolor, NULL, CTX_VNOTE);
+       RegisterNamespace("VNOTE:MSG", 0, 1, tmpl_vcard_put_message, NULL, CTX_VNOTE);
+       RegisterNamespace("VNOTE:UID", 0, 0, tmpl_vcard_put_uid, NULL, CTX_VNOTE);
 }