Changeset 2437

Timestamp:

08/11/07 07:01:23 (1 year ago)

Author:

jerryyu

Message:

g_string_vprintf isn't able to deal with a string with NULL pointer on Solaris

A string with null pointer is often passed to osync_trace function in which
g_strdup_vprintf will deal with the string. On Solaris platform, g_strdup_vprintf
isn't able to deal with a string with NULL pointer. On Linux platform, although
it could be dealt with, I think it's not a good way.

Files:

• plugins/palm/src/Makefile.am (modified) (1 diff)
• plugins/palm/src/palm_contact.c (modified) (5 diffs)
• plugins/palm/src/palm_event.c (modified) (5 diffs)
• plugins/palm/src/palm_format.c (modified) (38 diffs)
• plugins/palm/src/palm_note.c (modified) (6 diffs)
• plugins/palm/src/palm_sync.c (modified) (17 diffs)
• plugins/palm/src/palm_todo.c (modified) (4 diffs)

plugins/palm/src/Makefile.am

@@ -4 +4 @@
-opensyncheaderdir=@OPENSYNC_HEADERDIR@
-
--Wall -Werror
+
-
-EXTRA_DIST = \

plugins/palm/src/palm_contact.c

@@ -84 +84 @@
-        osync_change_unref(change);
-error:
-
+ ? osync_error_print(error) : "nil"
-        return NULL;
-}
@@ -144 +144 @@
-        psyncDBClose(db);
-error:
-
+ ? osync_error_print(&error) : "nil"
-        osync_context_report_osyncerror(ctx, error);
-        osync_error_unref(&error);
@@ -236 +236 @@
-                        GList *c = NULL;
-                        for (c = contact->categories; c; c = c->next) {
-
+ ? c->data : "nil"
-                                entry->category = psyncDBCategoryToId(db, c->data, NULL);
-                                if (entry->category != 0) {
@@ -281 +281 @@
-error:
-        osync_context_report_osyncerror(ctx, error);
-
+ ? osync_error_print(&error) : "nil"
-        osync_error_unref(&error);
-}
@@ -300 +300 @@
-        } else {
-                osync_context_report_osyncerror(ctx, error);
-
+ ? osync_error_print(&error) : "nil"
-                osync_error_unref(&error);
-                return;

plugins/palm/src/palm_event.c

@@ -60 +60 @@
-            const char *catname = psyncDBCategoryFromId(entry->db, entry->category, NULL);
-            if (catname) {
-
+ ? catname : "nil"
-                        event->categories = g_list_append(event->categories, g_strdup(catname));
-            } else {
@@ -81 +81 @@
-        osync_change_free(change);
-error:
-
+ ? osync_error_print(error) : "nil"
-        return NULL;
-}
@@ -145 +145 @@
-        psyncDBClose(db);
-error:
-
+ ? osync_error_print(error) : "nil"
-        return FALSE;
-}
@@ -204 +204 @@
-                        GList *c = NULL;
-                        for (c = event->categories; c; c = c->next) {
-
+ ? c->data : "nil"
-                                entry->category = psyncDBCategoryToId(db, c->data, NULL);
-                                if (entry->category != 0) {
@@ -254 +254 @@
-error:
-        osync_context_report_osyncerror(ctx, &error);
-
+ ? osync_error_print(&error) : "nil"
-        return FALSE;
-}

plugins/palm/src/palm_format.c

@@ -32 +32 @@
-        ret = g_convert(text, strlen(text), "utf8", "cp1252", NULL, NULL, NULL);
-
-, ret
+ ? text : "nil", ret ? ret : "nil"
-
-        return ret;
@@ -42 +42 @@
-        ret = g_convert(text, strlen(text), "cp1252", "utf8", NULL, NULL, NULL);
-
-, ret
+ ? text : "nil", ret ? ret: "nil"
-
-        return ret;
@@ -61 +61 @@
-        }
-
-
+ ? entry->codepage : "nil"
-        osync_trace(TRACE_SENSITIVE, "event: %i\n alarm: %i\n",
-                       entry->appointment.event, entry->appointment.alarm);     
@@ -90 +90 @@
-                        entry->appointment.repeatDays[5], entry->appointment.repeatDays[6],
-                        entry->appointment.repeatWeekstart);
-
-
+
-
-        int i;
@@ -143 +142 @@
-                xmlNewTextChild(current, NULL, (xmlChar*) "Value", (xmlChar*)"DATE");
-
-
+ ? vtime : "nil"
-
-                g_free(tmp);
@@ -157 +156 @@
-                xmlNewTextChild(current, NULL, (xmlChar*) "Value", (xmlChar*)"DATE");
-
-
+ ? vtime : "nil"
-
-                g_free(tmp);
@@ -172 +171 @@
-                xmlNewTextChild(current, NULL, (xmlChar*)"Content", (xmlChar*)vtime);
-
-
+ ? vtime : "nil"
-
-                g_free(vtime);
@@ -184 +183 @@
-                xmlNewTextChild(current, NULL, (xmlChar*)"Content", (xmlChar*)vtime);
-
-
+ ? vtime : "nil"
-
-                g_free(vtime);
@@ -375 +374 @@
-        *outpsize = sizeof(doc);
-
-
+ ? osxml_write_to_string((xmlDoc *)doc) : "nil"
-        
-        osync_trace(TRACE_EXIT, "%s", __func__);
@@ -381 +380 @@
-
-error:
-
+ ? osync_error_print(error) : "nil"
-        return FALSE;
-}
@@ -389 +388 @@
-        osync_trace(TRACE_ENTRY, "%s(%p, %p, %i, %p, %p, %p, %p)", __func__, user_data, input, inpsize, output, outpsize, free_input, error);
-
-
+ ? osxml_write_to_string((xmlDoc *)input) : "nil"
-
-        int i = 0;
@@ -479 +478 @@
-                                entry->appointment.begin.tm_min,
-                                entry->appointment.begin.tm_sec,
-
+ ? vtime : "nil"
-
-                g_free(vtime);
@@ -510 +509 @@
-                                entry->appointment.end.tm_min,
-                                entry->appointment.end.tm_sec,
-
+ ? vtime : "nil"
-
-                g_free(vtime);
@@ -707 +706 @@
-                                // when repeat_end is euqal or less then begin palm shows strange phenomenons
-                                if ((unsigned int) mktime(repeat_end) > (unsigned int) mktime(&(entry->appointment.begin))) {
-
+ ? vtime : "nil"
-                                        entry->appointment.repeatEnd = *repeat_end;
-                                        entry->appointment.repeatForever = 0;
@@ -762 +761 @@
-
-error:
-
+ ? osync_error_print(error) : "nil"
-        return FALSE;
-}
@@ -961 +960 @@
-        pos += 1;
-
-
+ ? newevent->codepage : "nil"
-                        
-        osync_trace(TRACE_SENSITIVE, "note: [%s] desc: [%s]",
-
-
+ ? newevent->appointment.note : "nil"
+ ? newevent->appointment.description : "nil"
-
-        *output = (char*) newevent;
@@ -1071 +1070 @@
-        *outpsize = sizeof(doc);
-
-
+ ? osxml_write_to_string((xmlDoc *)doc) : "nil"
-        
-        osync_trace(TRACE_EXIT, "%s", __func__);
@@ -1077 +1076 @@
-
-error:
-
+ ? osync_error_print(error) : "nil"
-        return FALSE;
-}
@@ -1087 +1086 @@
-        char *tmp = NULL;
-
-
+ ? osxml_write_to_string((xmlDoc *)input) : "nil"
-        
-        //Get the root node of the input document
@@ -1185 +1184 @@
-
-error:
-
+ ? osync_error_print(error) : "nil"
-        return FALSE;
-}
@@ -1366 +1365 @@
-        pos += 1;
-
-ewtodo->codepage
+newtodo->codepage ? ewtodo->codepage : "nil"
-
-
-        osync_trace(TRACE_SENSITIVE, "desc: [%s] note: [%s]",
-
-
+ ? newtodo->todo.description : "nil"
+ ? newtodo->todo.note : "nil"
-
-        *output = (char*) newtodo;
@@ -1389 +1388 @@
-        char *tmp = NULL;
-        
-
+ ? entry->address.entry[i] : "nil"
-        if (entry->address.entry[i] && strlen(entry->address.entry[i]) > 0)
-                tmp = conv_enc_palm_to_xml(entry->address.entry[i]);
@@ -1404 +1403 @@
-static osync_bool conv_palm_contact_to_xml(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, OSyncError **error)
-{
-
+ ? config : "nil"
-
-        PSyncContactEntry *entry = (PSyncContactEntry *)input;
@@ -1418 +1417 @@
-        
-        for (i = 0; i < 19; i++)
-
+ ? entry->address.entry[i] : "nil"
-        
-        //Create a new xml document
@@ -1455 +1454 @@
-                        current = xmlNewTextChild(root, NULL, (xmlChar*)"FormattedName", NULL);
-                        osxml_node_add(current, "Content", formatted_name->str);
-
+ ? formatted_name->str : "nil"
-
-                        g_string_free(formatted_name, TRUE);
@@ -1591 +1590 @@
-        *outpsize = sizeof(doc);
-
-
+ ? osxml_write_to_string((xmlDoc *)doc) : "nil"
-        
-        osync_trace(TRACE_EXIT, "%s", __func__);
@@ -1597 +1596 @@
-
-error:
-
+ ? osync_error_print(error) : "nil"
-        return FALSE;
-}
@@ -1603 +1602 @@
-static osync_bool conv_xml_to_palm_contact(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, OSyncError **error)
-{
-
-
+ ? config : "nil"
+ ? osxml_write_to_string((xmlDoc *)input) : "nil"
-
-        char *tmp = NULL;
@@ -1657 +1656 @@
-                entry->address.entry[3 + i] = (char*)osxml_find_node(cur, "Content");
-
-
+ ? entry->address.entry[3 + i] : "nil"
-
-                if (osxml_has_property(cur, "WORK")) {
@@ -1728 +1727 @@
-                g_free(entry->address.entry[i]);
-                entry->address.entry[i] = tmp;
-
+ ? entry->address.entry[i] : "nil"
-          }
-        }
@@ -1742 +1741 @@
-
-error:
-
+ ? osync_error_print(error) : "nil"
-        return FALSE;
-}
@@ -1832 +1831 @@
-static osync_bool conv_palm_note_to_xml(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, OSyncError **error)
-{
-
+ ? config : "nil"
-        PSyncNoteEntry *entry = (PSyncNoteEntry *)input;
-
@@ -1880 +1879 @@
-        *outpsize = sizeof(doc);
-
-
+ ? osxml_write_to_string((xmlDoc *)doc) : "nil"
-        
-        osync_trace(TRACE_EXIT, "%s", __func__);
@@ -1886 +1885 @@
-
-error:
-
+ ? osync_error_print(error) : "nil"
-        return FALSE;
-}
@@ -1893 +1892 @@
-static osync_bool conv_xml_to_palm_note(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, OSyncError **error)
-{
-
+ ? config : "nil"
-
-        char *tmp = NULL;
@@ -1899 +1898 @@
-        GString *memo = g_string_new("");
-
-
+ ? osxml_write_to_string((xmlDoc *)input) : "nil"
-
-        //Get the root node of the input document
@@ -1956 +1955 @@
-
-error:
-
+ ? osync_error_print(error) : "nil"
-        return FALSE;
-}
@@ -2118 +2117 @@
-        pos += 1;
-
-
+ ? newnote->codepage : "nil"
-
-        osync_trace(TRACE_SENSITIVE, "memo.text: [%s]",
-
+ ? newnote->memo.text : "nil"
-
-        *output = (char*) newnote;

plugins/palm/src/palm_note.c

@@ -60 +60 @@
-            const char *catname = psyncDBCategoryFromId(entry->db, entry->category, NULL);
-            if (catname) {
-
+ ? catname: "nil"
-                        note->categories = g_list_append(note->categories, g_strdup(catname));
-            } else {
@@ -81 +81 @@
-        osync_change_free(change);
-error:
-
+ ? osync_error_print(error) : "nil"
-        return NULL;
-}
@@ -145 +145 @@
-        psyncDBClose(db);
-error:
-
+ ? osync_error_print(error) : "nil"
-        return FALSE;
-}
@@ -204 +204 @@
-                        GList *c = NULL;
-                        for (c = note->categories; c; c = c->next) {
-
+ ? c->data : "nil"
-                                entry->category = psyncDBCategoryToId(db, c->data, NULL);
-                                if (entry->category != 0) {
@@ -254 +254 @@
-error:
-        osync_context_report_osyncerror(ctx, &error);
-
+ ? osync_error_print(&error) : "nil"
-        return FALSE;
-}
@@ -290 +290 @@
-        const char *catname = psyncDBCategoryFromId(entry->db, entry->category, NULL);
-        if (catname) {
-
+ ? catname : "nil"
-                note->categories = g_list_append(note->categories, g_strdup(catname));
-        }
-                
-
+ ? note->memo.text : "nil"
-        osync_change_set_data(change, (void *)note, sizeof(PSyncNoteEntry), TRUE);
-

plugins/palm/src/palm_sync.c

@@ -91 +91 @@
-PSyncDatabase *psyncDBOpen(PSyncEnv *env, char *name, OSyncError **error)
-{
-
+ ? name : "nil"
-        
-        struct DBInfo dbInfo;
@@ -157 +157 @@
-        g_free(db);
-error:
-
+ ? osync_error_print(error) : "nil"
-        return NULL;
-}
@@ -205 +205 @@
-error:
-        if (osync_error_is_set(error))
-
+ ? osync_error_print(error) : "nil"
-        else
-                osync_trace(TRACE_EXIT, "%s: Not Found", __func__);
@@ -255 +255 @@
-error:
-        if (osync_error_is_set(error))
-
+ ? osync_error_print(error) : "nil"
-        else
-                osync_trace(TRACE_EXIT, "%s: Not Found", __func__);
@@ -306 +306 @@
-error:
-        if (osync_error_is_set(error))
-
+ ? osync_error_print(error) : "nil"
-        else
-                osync_trace(TRACE_EXIT, "%s: Not Found", __func__);
@@ -326 +326 @@
-
-error:
-
+ ? osync_error_print(error) : "nil"
-        return FALSE;
-}
@@ -352 +352 @@
-
-error:
-
+ ? osync_error_print(error) : "nil"
-        return FALSE;
-}
@@ -385 +385 @@
-
-error:
-
+ ? osync_error_print(error) : "nil"
-        return FALSE;
-}
@@ -400 +400 @@
-        const char *ret = db->cai.name[id];
-
-
+ ? ret : "nil"
-        return ret;
-
-error:
-
+ ? osync_error_print(error) : "nil"
-        return NULL;
-}
@@ -410 +410 @@
-int psyncDBCategoryToId(PSyncDatabase *db, const char *name, OSyncError **error)
-{       
-
+ ? name : "nil"
-        
-        int i = 0;
-        for (i = 0; i < CATCOUNT; i++) {
-                if (db->cai.name[i][0] != '\0') {
-
+ ? db->cai.name[i] : "nil"
-                        if (!strcmp(db->cai.name[i], name)) {
-                                osync_trace(TRACE_EXIT, "%s: %i", __func__, i);
@@ -501 +501 @@
-        pi_close(listen_sd);
-error:
-
+ ? osync_error_print(error) : "nil"
-        return FALSE;
-}
@@ -564 +564 @@
-static osync_bool psyncSettingsParse(PSyncEnv *env, const char *config, OSyncError **error)
-{
-
+ ? config : "nil"
-        xmlDoc *doc = NULL;
-        xmlNode *cur = NULL;
@@ -643 +643 @@
-                xmlFreeDoc(doc);
-error:
-
+ ? osync_error_print(error) : "nil"
-        return FALSE;
-}
@@ -684 +684 @@
-                strcpy(env->user.username, "");
-                
-
+ ? env->user.username : "nil"
-        /*if (strcmp(User.username, conn->username) || User.userID != conn->id) {
-                //Id or username mismatch
@@ -729 +729 @@
-        
-        osync_context_report_osyncerror(ctx, error);
-
+ ? osync_error_print(&error) : "nil"
-}
-
@@ -812 +812 @@
-        g_free(env);
-error:
-
+ ? osync_error_print(error) : "nil"
-        return NULL;
-}
@@ -857 +857 @@
-        
-error:
-
+ ? osync_error_print(error) : "nil"
-        osync_error_unref(error);
-        return FALSE;

plugins/palm/src/palm_todo.c

@@ -80 +80 @@
-        osync_change_free(change);
-error:
-
+ ? osync_error_print(error) : "nil"
-        return NULL;
-}
@@ -144 +144 @@
-        psyncDBClose(db);
-error:
-
+ ? osync_error_print(error) : "nil"
-        return FALSE;
-}
@@ -202 +202 @@
-                        GList *c = NULL;
-                        for (c = todo->categories; c; c = c->next) {
-
+ ? c->data : "nil"
-                                entry->category = psyncDBCategoryToId(db, c->data, NULL);
-                                if (entry->category != 0) {
@@ -252 +252 @@
-error:
-        osync_context_report_osyncerror(ctx, &error);
-
+ ? osync_error_print(&error) : "nil"
-        return FALSE;
-}