Changeset 2368

Timestamp:

07/29/07 13:57:38 (1 year ago)

Author:

dgollub

Message:

Revert previous change ... until we found a more clean solution for this problem.

Files:

• trunk/opensync/archive/opensync_archive.c (modified) (26 diffs)
• trunk/opensync/client/opensync_client.c (modified) (24 diffs)
• trunk/opensync/client/opensync_client_proxy.c (modified) (21 diffs)
• trunk/opensync/client/osplugin.c (modified) (1 diff)
• trunk/opensync/data/opensync_data.c (modified) (1 diff)
• trunk/opensync/db/opensync_db.c (modified) (29 diffs)
• trunk/opensync/engine/opensync_engine.c (modified) (24 diffs)
• trunk/opensync/engine/opensync_obj_engine.c (modified) (28 diffs)
• trunk/opensync/engine/opensync_status.c (modified) (1 diff)
• trunk/opensync/format/opensync_converter.c (modified) (4 diffs)
• trunk/opensync/format/opensync_filter.c (modified) (7 diffs)
• trunk/opensync/format/opensync_format_env.c (modified) (17 diffs)
• trunk/opensync/format/opensync_time.c (modified) (23 diffs)
• trunk/opensync/group/opensync_group.c (modified) (10 diffs)
• trunk/opensync/group/opensync_group_env.c (modified) (4 diffs)
• trunk/opensync/group/opensync_member.c (modified) (11 diffs)
• trunk/opensync/group/opensync_xml.c (modified) (1 diff)
• trunk/opensync/helper/opensync_anchor.c (modified) (11 diffs)
• trunk/opensync/helper/opensync_hashtable.c (modified) (11 diffs)
• trunk/opensync/ipc/opensync_queue.c (modified) (10 diffs)
• trunk/opensync/mapping/opensync_mapping.c (modified) (1 diff)
• trunk/opensync/mapping/opensync_mapping_table.c (modified) (7 diffs)
• trunk/opensync/mapping/opensync_mapping_view.c (modified) (2 diffs)
• trunk/opensync/merger/opensync_capabilities.c (modified) (12 diffs)
• trunk/opensync/merger/opensync_merger.c (modified) (6 diffs)
• trunk/opensync/merger/opensync_xmlfield.c (modified) (3 diffs)
• trunk/opensync/merger/opensync_xmlformat.c (modified) (9 diffs)
• trunk/opensync/module/opensync_module.c (modified) (7 diffs)
• trunk/opensync/opensync_context.c (modified) (4 diffs)
• trunk/opensync/opensync_support.c (modified) (6 diffs)
• trunk/opensync/opensync_xml.c (modified) (3 diffs)
• trunk/opensync/plugin/opensync_plugin.c (modified) (1 diff)
• trunk/opensync/plugin/opensync_plugin_env.c (modified) (9 diffs)
• trunk/opensync/plugin/opensync_plugin_info.c (modified) (1 diff)
• trunk/opensync/plugin/opensync_sink.c (modified) (1 diff)
• trunk/opensync/version/opensync_version.c (modified) (5 diffs)

trunk/opensync/archive/opensync_archive.c

@@ -41 +41 @@
-void _osync_archive_trace(void *data, const char *query)
-{
- ? query : "nil"
+
-}
-
@@ -58 +58 @@
-static osync_bool osync_archive_create_changes(OSyncDB *db, const char *objtype, OSyncError **error)
-{
- ? objtype : "nil"
+
-
-        osync_assert(db);
@@ -89 +89 @@
-
-error:  
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -95 +95 @@
-static osync_bool osync_archive_create_changelog(OSyncDB *db, const char *objtype, OSyncError **error)
-{
- ? objtype : "nil"
+
-
-        osync_assert(db);
@@ -125 +125 @@
-
-error:  
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -131 +131 @@
-static osync_bool osync_archive_create(OSyncDB *db, const char *objtype, OSyncError **error)
-{
- ? objtype : "nil"
+
-
-        osync_assert(db);
@@ -162 +162 @@
-
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -174 +174 @@
-OSyncArchive *osync_archive_new(const char *filename, OSyncError **error)
-{
- ? filename : "nil"
+
-        osync_assert(filename);
-        
@@ -199 +199 @@
-
-error:
- ? osync_error_print(error) : "nil"
+
-        return NULL;
-}
@@ -251 +251 @@
-osync_bool osync_archive_save_data(OSyncArchive *archive, const char *uid, const char *objtype, const char *data, unsigned int size, OSyncError **error)
-{
- ? uid : "nil", objtype ? objtype : "nil"
+, objtype
-        osync_assert(archive);
-        osync_assert(uid);
@@ -276 +276 @@
-
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -293 +293 @@
-int osync_archive_load_data(OSyncArchive *archive, const char *uid, const char *objtype, char **data, unsigned int *size, OSyncError **error)
-{
- ? uid : "nil", objtype ? objtype : "nil"
+, objtype
-        osync_assert(archive);
-        osync_assert(uid);
@@ -319 +319 @@
-        
-error:
- ? osync_error_print(error) : "nil"
+
-        return -1;
-}
@@ -338 +338 @@
-{
-        
- ? uid : "nil", objtype ? objtype : "nil"
+, objtype
-        osync_assert(archive);
-        osync_assert(uid);
@@ -372 +372 @@
-        
-error:
- ? osync_error_print(error) : "nil"
+
-        return 0;
-}
@@ -387 +387 @@
-osync_bool osync_archive_delete_change(OSyncArchive *archive, long long int id, const char *objtype, OSyncError **error)
-{
- ? objtype : "nil"
+
-        osync_assert(archive);
-        osync_assert(objtype);
@@ -406 +406 @@
-
-error:  
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -424 +424 @@
-osync_bool osync_archive_load_changes(OSyncArchive *archive, const char *objtype, OSyncList **ids, OSyncList **uids, OSyncList **mappingids, OSyncList **memberids, OSyncError **error)
-{
- ? objtype : "nil"
+
-
-        osync_assert(archive);
@@ -460 +460 @@
-                *memberids = osync_list_append((*memberids), GINT_TO_POINTER((int)memberid));
-                
- ? uid : "nil"
+
-        }
-
@@ -468 +468 @@
-        return TRUE;
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;   
-}
@@ -484 +484 @@
-osync_bool osync_archive_load_ignored_conflicts(OSyncArchive *archive, const char *objtype, OSyncList **ids, OSyncList **changetypes, OSyncError **error)
-{
- ? objtype : "nil"
+
-
-        osync_assert(archive);
@@ -523 +523 @@
-        return TRUE;
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;   
-}
@@ -539 +539 @@
-osync_bool osync_archive_save_ignored_conflict(OSyncArchive *archive, const char *objtype, long long int id, OSyncChangeType changetype, OSyncError **error)
-{
- ? objtype : "nil"
+
-
-        osync_assert(archive);
@@ -560 +560 @@
-        
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -575 +575 @@
-{
-        
- ? objtype : "nil"
+
-        osync_assert(archive);
-        osync_assert(objtype);
@@ -595 +595 @@
-        
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}

trunk/opensync/client/opensync_client.c

@@ -450 +450 @@
-        osync_message_read_string(message, &config);
-        
- ? enginepipe : "nil", formatdir ? formatdir : "nil", plugindir ? plugindir : "nil", pluginname ? pluginname : "nil"
+, formatdir, plugindir, pluginname
-                
-        /* First we connect the engine pipe if necessary*/
@@ -538 +538 @@
-        g_free(formatdir);
-        g_free(config);
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -589 +589 @@
-        osync_message_unref(reply);
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -667 +667 @@
-        osync_message_unref(reply);
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -681 +681 @@
-        osync_message_read_string(message, &objtype);
-        osync_message_read_int(message, &slowsync);
- ? objtype : "nil"
+
-        
-        OSyncObjTypeSink *sink = NULL;
@@ -732 +732 @@
-        osync_message_unref(reply);
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -744 +744 @@
-        
-        osync_message_read_string(message, &objtype);
- ? objtype : "nil"
+
-        
-        OSyncObjTypeSink *sink = NULL;
@@ -785 +785 @@
-        osync_message_unref(reply);
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -797 +797 @@
-        
-        osync_message_read_string(message, &objtype);
- ? objtype : "nil"
+
-        
-        OSyncObjTypeSink *sink = NULL;
@@ -840 +840 @@
-        osync_message_unref(reply);
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -899 +899 @@
-        osync_message_unref(reply);
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -917 +917 @@
-        OSyncData *data = osync_change_get_data(change);
-        
- ? osync_data_get_objtype(data) : "nil"
+
-        
-        OSyncObjTypeSink *sink = NULL;
@@ -942 +942 @@
-
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -954 +954 @@
-        
-        osync_message_read_string(message, &objtype);
- ? objtype : "nil"
+
-        
-        OSyncObjTypeSink *sink = NULL;
@@ -995 +995 @@
-        osync_message_unref(reply);
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -1007 +1007 @@
-        
-        osync_message_read_string(message, &objtype);
- ? objtype : "nil"
+
-        
-        OSyncObjTypeSink *sink = NULL;
@@ -1048 +1048 @@
-        osync_message_unref(reply);
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -1158 +1158 @@
-                client->thread = NULL;
-                osync_client_shutdown(client);
- ? osync_error_print(&error) : "nil"
+
-                osync_error_unref(&error);
-                return;
@@ -1168 +1168 @@
-                osync_client_error_shutdown(client, locerror);
-                osync_error_unref(&error);
- ? osync_error_print(&locerror) : "nil"
+
-                osync_error_unref(&locerror);
-                return;
@@ -1176 +1176 @@
-                osync_client_error_shutdown(client, locerror);
-                osync_error_unref(&error);
- ? osync_error_print(&locerror) : "nil"
+
-                osync_error_unref(&locerror);
-                return;
@@ -1183 +1183 @@
-        osync_message_unref(errorreply);
-
- ? osync_error_print(&error) : "nil"
+
-        osync_error_unref(&error);
-}
@@ -1226 +1226 @@
-        OSyncClient *client = osync_try_malloc0(sizeof(OSyncClient), error);
-        if (!client) {
- ? osync_error_print(error) : "nil"
+
-                return NULL;
-        }
@@ -1321 +1321 @@
-osync_bool osync_client_run_external(OSyncClient *client, char *pipe_path, OSyncPlugin *plugin, OSyncError **error)
-{
- ? pipe_path : "nil"
+
-        /* Create connection pipes **/
-        OSyncQueue *incoming = osync_queue_new(pipe_path, error);
@@ -1355 +1355 @@
-        osync_queue_free(incoming);
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}

trunk/opensync/client/opensync_client_proxy.c

@@ -168 +168 @@
-
-        if (_osync_kill(pid, SIGTERM) < 0) {
- ? g_strerror(errno) : "nil"
+
-                /* Don't return failure if kill() failed, because it may be a stale pid file */
-        }
@@ -319 +319 @@
-                        if (!osync_demarshal_objtype_sink(message, &sink, &locerror))
-                                goto error;
- ? osync_objtype_sink_get_name(sink) : "nil"
+
-        
-                        proxy->objtypes = g_list_append(proxy->objtypes, sink);
@@ -783 +783 @@
-        OSyncQueue *write2 = NULL;
-        
- ? path : "nil"
+
-        osync_assert(proxy);
-        osync_assert(type != OSYNC_START_TYPE_UNKNOWN);
@@ -911 +911 @@
-        osync_queue_free(write1);
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -973 +973 @@
-        
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -979 +979 @@
-osync_bool osync_client_proxy_initialize(OSyncClientProxy *proxy, initialize_cb callback, void *userdata, const char *formatdir, const char *plugindir, const char *plugin, const char *groupname, const char *configdir, const char *config, OSyncError **error)
-{
-s, %p, %p)", __func__, proxy, callback, userdata, formatdir ? formatdir : "nil", plugindir ? plugindir : "nil", plugin ? plugin : "nil", groupname ? groupname : "nil", configdir ? configdir : "nil"
+p, %p)", __func__, proxy, callback, userdata, formatdir, plugindir, plugin, groupname, configdir
-        osync_assert(proxy);
-        
@@ -1021 +1021 @@
-        osync_message_unref(message);
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -1054 +1054 @@
-        osync_message_unref(message);
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -1087 +1087 @@
-        osync_message_unref(message);
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -1105 +1105 @@
-osync_bool osync_client_proxy_connect(OSyncClientProxy *proxy, connect_cb callback, void *userdata, const char *objtype, osync_bool slowsync, OSyncError **error)
-{
- ? objtype : "nil"
+
-        
-        callContext *ctx = osync_try_malloc0(sizeof(callContext), error);
@@ -1135 +1135 @@
-        osync_message_unref(message);
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -1141 +1141 @@
-osync_bool osync_client_proxy_disconnect(OSyncClientProxy *proxy, disconnect_cb callback, void *userdata, const char *objtype, OSyncError **error)
-{
- ? objtype : "nil"
+
-        
-        callContext *ctx = osync_try_malloc0(sizeof(callContext), error);
@@ -1170 +1170 @@
-        osync_message_unref(message);
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -1206 +1206 @@
-        osync_message_unref(message);
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -1212 +1212 @@
-osync_bool osync_client_proxy_get_changes(OSyncClientProxy *proxy, get_changes_cb callback, void *userdata, const char *objtype, OSyncError **error)
-{
- ? objtype : "nil"
+
-        
-        callContext *ctx = osync_try_malloc0(sizeof(callContext), error);
@@ -1241 +1241 @@
-        osync_message_unref(message);
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -1279 +1279 @@
-        osync_message_unref(message);
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -1285 +1285 @@
-osync_bool osync_client_proxy_committed_all(OSyncClientProxy *proxy, committed_all_cb callback, void *userdata, const char *objtype, OSyncError **error)
-{
- ? objtype : "nil"
+
-        osync_assert(proxy);
-        
@@ -1315 +1315 @@
-        osync_message_unref(message);
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -1321 +1321 @@
-osync_bool osync_client_proxy_sync_done(OSyncClientProxy *proxy, sync_done_cb callback, void *userdata, const char *objtype, OSyncError **error)
-{
- ? objtype : "nil"
+
-        osync_assert(proxy);
-        
@@ -1351 +1351 @@
-        osync_message_unref(message);
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}

trunk/opensync/client/osplugin.c

@@ -128 +128 @@
-        osync_client_unref(client);
-        
- ? osync_error_print(&error) : "nil"
+
-        fprintf(stderr, "Unable to initialize environment: %s\n", osync_error_print(&error));
-        osync_error_unref(&error);

trunk/opensync/data/opensync_data.c

@@ -347 +347 @@
-        time_t time = osync_objformat_get_revision(format, data->data, data->size, error);
-        if (time == -1) {
- ? osync_error_print(error) : "nil"
+
-                return -1;
-        }

trunk/opensync/db/opensync_db.c

@@ -27 +27 @@
-static void _osync_db_trace(void *data, const char *query)
-{
- ? query: "nil"
+
-}
-*/
@@ -42 +42 @@
-        OSyncDB *db = osync_try_malloc0(sizeof(OSyncDB), error);
-        if (!db) {
- ? osync_error_print(error) : "nil"
+
-                return NULL;
-        }
@@ -60 +60 @@
-osync_bool osync_db_open(OSyncDB *db, const char *dbfile, OSyncError **error)
-{
- ? dbfile : "nil"
+
-
-        osync_assert(db);
@@ -67 +67 @@
-        if (sqlite3_open(dbfile, &(db->sqlite3db)) != SQLITE_OK) {
-                osync_error_set(error, OSYNC_ERROR_GENERIC, "Cannot open database: %s", sqlite3_errmsg(db->sqlite3db));
- ? sqlite3_errmsg(db->sqlite3db) : "nil"
+
-                return FALSE;
-        }
@@ -91 +91 @@
-        if (rc) {
-                osync_error_set(error, OSYNC_ERROR_GENERIC, "Cannot close database: %s", sqlite3_errmsg(db->sqlite3db));
- ? sqlite3_errmsg(db->sqlite3db) : "nil"
+
-                return FALSE;
-        }
@@ -109 +109 @@
-int osync_db_count(OSyncDB *db, const char *query, OSyncError **error)
-{
- ? query : "nil"
+
-        
-        osync_assert(db);
@@ -122 +122 @@
-                sqlite3_free_table(result);
-                g_free(errmsg);
- ? osync_error_print(error) : "nil"
+
-                return -1;
-        }
@@ -141 +141 @@
-osync_bool osync_db_query(OSyncDB *db, const char *query, OSyncError **error)
-{
- ? query :"nil"
+
-        
-        osync_assert(db);
@@ -150 +150 @@
-        if (sqlite3_exec(db->sqlite3db, query, NULL, NULL, &errmsg) != SQLITE_OK) {
-                osync_error_set(error, OSYNC_ERROR_GENERIC, "Unable to execute simple query: %s", errmsg);
- ? errmsg : "nil"
+
-                g_free(errmsg);
-                return FALSE;
@@ -170 +170 @@
-GList *osync_db_query_table(OSyncDB *db, const char *query, OSyncError **error)
-{
- ? query : "nil"
+
-        
-        osync_assert(db);
@@ -184 +184 @@
-                osync_error_set(error, OSYNC_ERROR_GENERIC, "Unable to query table: %s", errmsg);
-                g_free(errmsg);
- ? osync_error_print(error) : "nil"
+
-                return NULL;
-        }
@@ -237 +237 @@
-char *osync_db_query_single_string(OSyncDB *db, const char *query, OSyncError **error)
-{
- ? query : "nil"
+
-
-        osync_assert(db);
@@ -265 +265 @@
-        sqlite3_finalize(ppStmt);
-        
- ? result : "nil"
+
-        return result; 
-        
@@ -271 +271 @@
-        g_free(result);
-        sqlite3_finalize(ppStmt);
- ? osync_error_print(error) : "nil"
+
-        return NULL;
-}
@@ -287 +287 @@
-int osync_db_query_single_int(OSyncDB *db, const char *query, OSyncError **error)
-{
- ? query : "nil"
+
-
-        osync_assert(db);
@@ -320 +320 @@
-error:
-        sqlite3_finalize(ppStmt);
- ? osync_error_print(error) : "nil"
+
-        return -1;
-}
@@ -334 +334 @@
-osync_bool osync_db_reset(OSyncDB *db, const char *tablename, OSyncError **error)
-{
- ? tablename : "nil"
+
-
-        osync_assert(db);
@@ -350 +350 @@
-error:
-        g_free(query);
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -381 +381 @@
-error:
-        sqlite3_finalize(ppStmt);
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -387 +387 @@
-osync_bool osync_db_reset_full_by_path(const char *path, OSyncError **error)
-{
- ? path : "nil"
+
-
-        osync_assert(path);
@@ -401 +401 @@
-        return TRUE;
-error:
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-
@@ -417 +417 @@
-int osync_db_exists(OSyncDB *db, const char *tablename, OSyncError **error)
-{
- ? tablename : "nil"
+
-
-        osync_assert(db);
@@ -432 +432 @@
-
-                osync_error_set(error, OSYNC_ERROR_GENERIC, "Query Error: %s", sqlite3_errmsg(db->sqlite3db));
- ? sqlite3_errmsg(db->sqlite3db) : "nil"
+
-                return -1;
-        }
@@ -441 +441 @@
-                g_free(query);
-
- ? tablename : "nil"
+
-                return 0;
-        }
@@ -448 +448 @@
-        g_free(query);
-        
- ? tablename : "nil"
+
-        return 1;
-}
@@ -465 +465 @@
-osync_bool osync_db_bind_blob(OSyncDB *db, const char *query, const char *data, unsigned int size, OSyncError **error)
-{
- ? query : "nil", data ? data : "nil"
+, data
-
-        osync_assert(db);
@@ -506 +506 @@
-                sqlite3_finalize(sqlite_stmt);  
-        }
- ? osync_error_print(error) : "nil"
+
-        return FALSE;
-}
@@ -522 +522 @@
-int osync_db_get_blob(OSyncDB *db, const char *query, char **data, unsigned int *size, OSyncError **error)
-{
- ? query : "nil"
+
-
-        osync_assert(db);
@@ -577 +577 @@
-                sqlite3_finalize(sqlite_stmt);  
-        }
- ? osync_error_print(error) : "nil"
+
-        return -1;
-}

trunk/opensync/engine/opensync_engine.c

@@ -109 +109 @@
-        OSyncObjFormat *detectedFormat = NULL;
-
- ? uid : "nil", changetype, format ? format : "nil", objtype ? objtype : "nil"
+, changetype, format, objtype
-        
-        OSyncData *data = osync_change_get_data(change);
@@ -133 +133 @@
-                }
-
- ? osync_objformat_get_name(detectedFormat) : "nil", detected_objtype ? detected_objtype : "nil"
+, detected_objtype
-
-                /* ... only if the objtype is supported by one of the object engines we change the objtype of the change-entry (change). */
@@ -139 +139 @@
-                        osync_change_set_objtype(change, osync_objformat_get_objtype(detectedFormat));
-                else
- ? detected_objtype : "nil"
+
-                
-        }