Changeset 2145

Timestamp:

06/12/07 14:15:09 (1 year ago)

Author:

mjahn

Message:

r1052@semo: mjahn | 2007-06-09 02:57:29 +0200

r1050@semo (orig r2102): dgollub | 2007-06-09 00:32:45 +0200
Added missing osync_context_report() avoids deadlock.
Reporting deleted entries is broken at the moment ...
Fixed an issue with wrong userdata and the gnokii_sinenv.

r1051@semo (orig r2103): dgollub | 2007-06-09 01:12:14 +0200
Fixed memory leaks, invalid read of size, ...

Files:

• plugins/gnokii-sync/src/gnokii_calendar.c (modified) (1 diff)
• plugins/gnokii-sync/src/gnokii_contact.c (modified) (5 diffs)
• plugins/gnokii-sync/src/gnokii_contact_format.c (modified) (1 diff)
• plugins/gnokii-sync/src/gnokii_sync.c (modified) (7 diffs)

plugins/gnokii-sync/src/gnokii_calendar.c

@@ -443 +443 @@
-        g_free(caldata);
-
+        osync_context_report_success(ctx);
+
-        osync_trace(TRACE_EXIT, "%s", __func__);
-}

plugins/gnokii-sync/src/gnokii_contact.c

@@ -359 +359 @@
-        gn_phonebook_entry *contact = NULL;
-        gn_memory_status memstat;
-
-
-
+
-
-        OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info);
@@ -367 +365 @@
-        gnokii_sinkenv *sinkenv = osync_objtype_sink_get_userdata(sink);
-        gnokii_environment *env = (gnokii_environment *) plugindata;
+
+        osync_trace(TRACE_INTERNAL, "sinkenv: %p", sinkenv);
-
-
@@ -420 +420 @@
-                                continue;
-
-                        OSyncChange *change = osync_change_new(&error);
-
-                        // prepare UID with gnokii-contact-<memory type>-<memory location>
-                        uid = gnokii_contact_uid(contact);
+
+                        hash = gnokii_contact_hash(contact);
+                        OSyncChangeType type = osync_hashtable_get_changetype(sinkenv->hashtable, uid, hash);
+
+                        if (type == OSYNC_CHANGE_TYPE_UNMODIFIED) {
+                                g_free(hash);
+                                g_free(uid);
+                                g_free(contact);
+                                continue;
+                        }
+
+                        osync_hashtable_update_hash(sinkenv->hashtable, type, uid, hash);
+
+                        OSyncChange *change = osync_change_new(&error);
+
+
-                        osync_change_set_uid(change, uid);
-                        g_free(uid);
-
-                        // get hash of contact 
-                        hash = gnokii_contact_hash(contact);
-                        osync_change_set_hash(change, hash);    
-
-
+
-
-                        // set data
-
-
+
+
+
-                                osync_change_unref(change);
-                                osync_context_report_osyncwarning(ctx, error);
@@ -441 +451 @@
-                                g_free(hash);
-                                g_free(uid);
+                                g_free(contact);
-                                continue;
-                        }
-
-
-
-
-
-OSyncChangeType type = osync_hashtable_get_changetype(sinkenv->hashtable, uid, hash
-
-       
-       osync_context_report_change(ctx
-
-}      
+o
+o
+o
+
+osync_context_report_change(ctx, change
+
+
+osync_trace(TRACE_INTERNAL, "Change: %p"
+
+osync_change_unref(change);
-
-                        g_free(hash);
-                        g_free(uid);
-
-                }
-        }
-
-
-
+
+
+
+
-        int i;
+
-        char **uids = osync_hashtable_get_deleted(sinkenv->hashtable);
-        for (i = 0; uids[i]; i++) {
@@ -498 +511 @@
-        }
-        g_free(uids);
-
-
+
+
+
-
-        osync_trace(TRACE_EXIT, "%s()", __func__);

plugins/gnokii-sync/src/gnokii_contact_format.c

@@ -34 +34 @@
-static osync_bool conv_gnokii_contact_to_xmlformat(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, OSyncError **error)
-{
-p, %
+
-
-        OSyncXMLField *xmlfield = NULL;

plugins/gnokii-sync/src/gnokii_sync.c

@@ -24 +24 @@
-        osync_trace(TRACE_ENTRY, "%s()", __func__);
-
+        while (env->sinks) {
+                gnokii_sinkenv *sinkenv = env->sinks->data;
+
+                osync_objtype_sink_unref(sinkenv->sink);
+                g_free(sinkenv);
+
+                env->sinks = g_list_remove(env->sinks, sinkenv);
+        }
+
-        if (env->state)
-                g_free(env->state);
@@ -117 +126 @@
-        free_gnokiienv(env);
-
+
-        osync_trace(TRACE_EXIT, "%s", __func__);
-}
@@ -131 +141 @@
-        GList *s = NULL;
-        for (s = env->sinks; s; s = s->next) {
-OSyncObjTypeSink *sink
-
+gnokii_sinkenv *sinkenv
+env->sink
-        }
-
@@ -156 +166 @@
-        char *configdata = NULL;
-        
+        OSyncFormatEnv *formatenv = osync_plugin_info_get_format_env(info); 
+
-        // create gnokii_environment which stores config and statemachine for libgnokii
-malloc(sizeof(gnokii_environment)
-g_assert(env != NULL);
-memset(env, 0, sizeof(gnokii_environment))
+osync_try_malloc0(sizeof(gnokii_environment), error
+if (!env)
+       return NULL
-
-        env->sinks = NULL;
-
-
-
-
-
+
+
+
+
+
+
+
-        if (!gnokii_config_parse(env->state, osync_plugin_info_get_config(info), error)) {
-                free_gnokiienv(env);
@@ -173 +188 @@
-        
-        // init the contact sink
-OSyncObjTypeSink *contact_sink = NULL
-
-
+gnokii_sinkenv *contact_sinkenv = osync_try_malloc0(sizeof(gnokii_sinkenv), error)
+env->sink
+env->sink
-
-        OSyncObjTypeSinkFunctions contact_functions;
@@ -187 +202 @@
-        contact_functions.sync_done = sync_done;
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-        // init the event sink
-
-
+
+
+
-
-        OSyncObjTypeSinkFunctions event_functions;
@@ -207 +226 @@
-        event_functions.sync_done = sync_done;
-
-
-
-
-
-
+
+
+
+
+
+
-        
-        //Process the config data here and set the options on your environment