Menu
▾
▴
[Opensync-commits] r5128 - in trunk: opensync/archive opensync/capabilities opensync/common opensync/data opensync/db opensync/engine opensync/format opensync/helper opensync/ipc opensync/mapping opensync/module opensync/plugin opensync/version tests/group-tests
|
From: <dg...@su...> - 2009-01-13 16:12:58
|
Author: ianmartin Date: Tue Jan 13 17:12:00 2009 New Revision: 5128 URL: http://www.opensync.org/changeset/5128 Log: Prefer opensync memory allocation to glib. Ticket #977 Modified: trunk/opensync/archive/opensync_archive.c trunk/opensync/capabilities/opensync_capabilities.c trunk/opensync/capabilities/opensync_capability.c trunk/opensync/common/opensync_list.c trunk/opensync/common/opensync_list.h trunk/opensync/data/opensync_change.c trunk/opensync/data/opensync_data.c trunk/opensync/db/opensync_db.c trunk/opensync/engine/opensync_engine.c trunk/opensync/engine/opensync_engine_private.h trunk/opensync/engine/opensync_mapping_engine.c trunk/opensync/engine/opensync_mapping_engine_internals.h trunk/opensync/engine/opensync_mapping_entry_engine.c trunk/opensync/engine/opensync_obj_engine.c trunk/opensync/engine/opensync_obj_engine_internals.h trunk/opensync/engine/opensync_sink_engine.c trunk/opensync/engine/opensync_status.c trunk/opensync/format/opensync_converter.c trunk/opensync/format/opensync_converter_private.h trunk/opensync/format/opensync_filter.c trunk/opensync/format/opensync_format_env.c trunk/opensync/format/opensync_format_env_internals.h trunk/opensync/format/opensync_objformat.c trunk/opensync/format/opensync_objformat_sink.c trunk/opensync/helper/opensync_anchor.c trunk/opensync/helper/opensync_hashtable.c trunk/opensync/ipc/opensync_queue.c trunk/opensync/ipc/opensync_queue_private.h trunk/opensync/ipc/opensync_serializer.c trunk/opensync/mapping/opensync_mapping.c trunk/opensync/mapping/opensync_mapping_entry.c trunk/opensync/mapping/opensync_mapping_internals.h trunk/opensync/mapping/opensync_mapping_table.c trunk/opensync/mapping/opensync_mapping_table_internals.h trunk/opensync/module/opensync_module.c trunk/opensync/plugin/opensync_context.c trunk/opensync/plugin/opensync_objtype_sink.c trunk/opensync/plugin/opensync_objtype_sink_private.h trunk/opensync/plugin/opensync_plugin.c trunk/opensync/plugin/opensync_plugin.h trunk/opensync/plugin/opensync_plugin_advancedoptions.c trunk/opensync/plugin/opensync_plugin_authentication.c trunk/opensync/plugin/opensync_plugin_config.c trunk/opensync/plugin/opensync_plugin_connection.c trunk/opensync/plugin/opensync_plugin_env.c trunk/opensync/plugin/opensync_plugin_env_private.h trunk/opensync/plugin/opensync_plugin_info.c trunk/opensync/plugin/opensync_plugin_info_private.h trunk/opensync/plugin/opensync_plugin_localization.c trunk/opensync/plugin/opensync_plugin_resource.c trunk/opensync/version/opensync_version.c trunk/tests/group-tests/check_lock.c Modified: trunk/opensync/archive/opensync_archive.c ============================================================================== --- trunk/opensync/archive/opensync_archive.c Mon Jan 12 23:22:19 2009 (r5127) +++ trunk/opensync/archive/opensync_archive.c Tue Jan 13 17:12:00 2009 (r5128) @@ -162,7 +162,7 @@ goto error_and_free; if (!osync_db_open(archive->db, filename, error)) { - g_free(archive->db); + osync_free(archive->db); goto error_and_free; } @@ -170,7 +170,7 @@ return archive; error_and_free: - g_free(archive); + osync_free(archive); error: osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error)); @@ -198,8 +198,8 @@ osync_trace(TRACE_INTERNAL, "Can't close database"); } - g_free(archive->db); - g_free(archive); + osync_free(archive->db); + osync_free(archive); osync_trace(TRACE_EXIT, "%s", __func__); } @@ -220,16 +220,16 @@ // FIXME: Avoid subselect - this query needs up to 0.5s escaped_objtype = osync_db_sql_escape(objtype); - query = g_strdup_printf("REPLACE INTO tbl_archive (objtype, mappingid, data) VALUES('%s', %lli, ?)", escaped_objtype, id); - g_free(escaped_objtype); + query = osync_strdup_printf("REPLACE INTO tbl_archive (objtype, mappingid, data) VALUES('%s', %lli, ?)", escaped_objtype, id); + osync_free(escaped_objtype); escaped_objtype = NULL; if (!osync_db_bind_blob(archive->db, query, data, size, error)) { - g_free(query); + osync_free(query); goto error; } - g_free(query); + osync_free(query); osync_trace(TRACE_EXIT, "%s", __func__); return TRUE; @@ -257,15 +257,15 @@ escaped_uid = osync_db_sql_escape(uid); escaped_objtype = osync_db_sql_escape(objtype); - query = g_strdup_printf("SELECT data FROM tbl_archive WHERE objtype='%s' AND mappingid=(SELECT mappingid FROM tbl_changes WHERE objtype='%s' AND uid='%s' LIMIT 1)", escaped_objtype, escaped_objtype, escaped_uid); - g_free(escaped_objtype); + query = osync_strdup_printf("SELECT data FROM tbl_archive WHERE objtype='%s' AND mappingid=(SELECT mappingid FROM tbl_changes WHERE objtype='%s' AND uid='%s' LIMIT 1)", escaped_objtype, escaped_objtype, escaped_uid); + osync_free(escaped_objtype); escaped_objtype = NULL; ret = osync_db_get_blob(archive->db, query, data, size, error); - g_free(query); - g_free(escaped_uid); + osync_free(query); + osync_free(escaped_uid); if (ret < 0) { goto error; @@ -300,21 +300,21 @@ escaped_objtype = osync_db_sql_escape(objtype); if (!id) { - query = g_strdup_printf("INSERT INTO tbl_changes (objtype, uid, mappingid, memberid) VALUES('%s', '%s', '%lli', '%lli')", escaped_objtype, escaped_uid, mappingid, memberid); + query = osync_strdup_printf("INSERT INTO tbl_changes (objtype, uid, mappingid, memberid) VALUES('%s', '%s', '%lli', '%lli')", escaped_objtype, escaped_uid, mappingid, memberid); } else { - query = g_strdup_printf("UPDATE tbl_changes SET uid='%s', mappingid='%lli', memberid='%lli' WHERE objtype='%s' AND id=%lli", escaped_uid, mappingid, memberid, escaped_objtype, id); + query = osync_strdup_printf("UPDATE tbl_changes SET uid='%s', mappingid='%lli', memberid='%lli' WHERE objtype='%s' AND id=%lli", escaped_uid, mappingid, memberid, escaped_objtype, id); } - g_free(escaped_objtype); - g_free(escaped_uid); + osync_free(escaped_objtype); + osync_free(escaped_uid); escaped_objtype = NULL; escaped_uid = NULL; if (!osync_db_query(archive->db, query, error)) { - g_free(query); + osync_free(query); goto error; } - g_free(query); + osync_free(query); if (!id) id = osync_db_last_rowid(archive->db); @@ -339,15 +339,15 @@ goto error; escaped_objtype = osync_db_sql_escape(objtype); - query = g_strdup_printf("DELETE FROM tbl_changes WHERE objtype='%s' AND id=%lli", escaped_objtype, id); - g_free(escaped_objtype); + query = osync_strdup_printf("DELETE FROM tbl_changes WHERE objtype='%s' AND id=%lli", escaped_objtype, id); + osync_free(escaped_objtype); escaped_objtype = NULL; if (!osync_db_query(archive->db, query, error)) { - g_free(query); + osync_free(query); goto error; } - g_free(query); + osync_free(query); osync_trace(TRACE_EXIT, "%s", __func__); return TRUE; @@ -379,12 +379,12 @@ goto error; escaped_objtype = osync_db_sql_escape(objtype); - query = g_strdup_printf("SELECT id, uid, mappingid, memberid FROM tbl_changes WHERE objtype='%s' ORDER BY mappingid", escaped_objtype); - g_free(escaped_objtype); + query = osync_strdup_printf("SELECT id, uid, mappingid, memberid FROM tbl_changes WHERE objtype='%s' ORDER BY mappingid", escaped_objtype); + osync_free(escaped_objtype); escaped_objtype = NULL; result = osync_db_query_table(archive->db, query, error); - g_free(query); + osync_free(query); /* Check for error of osync_db_query_table() call. */ if (osync_error_is_set(error)) @@ -421,7 +421,7 @@ memberid = g_ascii_strtoull(value_str, NULL, 0); *ids = osync_list_append((*ids), GINT_TO_POINTER((int)id)); - *uids = osync_list_append((*uids), g_strdup(uid)); + *uids = osync_list_append((*uids), osync_strdup(uid)); *mappingids = osync_list_append((*mappingids), GINT_TO_POINTER((int)mappingid)); *memberids = osync_list_append((*memberids), GINT_TO_POINTER((int)memberid)); @@ -450,16 +450,16 @@ goto error; escaped_objtype = osync_db_sql_escape(objtype); - query = g_strdup_printf("DELETE FROM tbl_changes WHERE objtype='%s'", escaped_objtype); - g_free(escaped_objtype); + query = osync_strdup_printf("DELETE FROM tbl_changes WHERE objtype='%s'", escaped_objtype); + osync_free(escaped_objtype); escaped_objtype = NULL; if (!osync_db_query(archive->db, query, error)) { - g_free(query); + osync_free(query); goto error; } - g_free(query); + osync_free(query); osync_trace(TRACE_EXIT, "%s", __func__); return TRUE; @@ -488,12 +488,12 @@ goto error; escaped_objtype = osync_db_sql_escape(objtype); - query = g_strdup_printf("SELECT entryid, changetype FROM tbl_changelog WHERE objtype='%s' ORDER BY id", escaped_objtype); - g_free(escaped_objtype); + query = osync_strdup_printf("SELECT entryid, changetype FROM tbl_changelog WHERE objtype='%s' ORDER BY id", escaped_objtype); + osync_free(escaped_objtype); escaped_objtype = NULL; result = osync_db_query_table(archive->db, query, error); - g_free(query); + osync_free(query); /* Check for error of osync_db_query_table() call. */ if (osync_error_is_set(error)) @@ -533,16 +533,16 @@ goto error; escaped_objtype = osync_db_sql_escape(objtype); - query = g_strdup_printf("INSERT INTO tbl_changelog (objtype, entryid, changetype) VALUES('%s', '%lli', '%i')", escaped_objtype, id, changetype); - g_free(escaped_objtype); + query = osync_strdup_printf("INSERT INTO tbl_changelog (objtype, entryid, changetype) VALUES('%s', '%lli', '%i')", escaped_objtype, id, changetype); + osync_free(escaped_objtype); escaped_objtype = NULL; if (!osync_db_query(archive->db, query, error)) { - g_free(query); + osync_free(query); goto error; } - g_free(query); + osync_free(query); osync_trace(TRACE_EXIT, "%s: %lli", __func__, id); return TRUE; @@ -564,16 +564,16 @@ goto error; escaped_objtype = osync_db_sql_escape(objtype); - query = g_strdup_printf("DELETE FROM tbl_changelog WHERE objtype='%s'", escaped_objtype); - g_free(escaped_objtype); + query = osync_strdup_printf("DELETE FROM tbl_changelog WHERE objtype='%s'", escaped_objtype); + osync_free(escaped_objtype); escaped_objtype = NULL; if (!osync_db_query(archive->db, query, error)) { - g_free(query); + osync_free(query); goto error; } - g_free(query); + osync_free(query); osync_trace(TRACE_EXIT, "%s", __func__); return TRUE; Modified: trunk/opensync/capabilities/opensync_capabilities.c ============================================================================== --- trunk/opensync/capabilities/opensync_capabilities.c Mon Jan 12 23:22:19 2009 (r5127) +++ trunk/opensync/capabilities/opensync_capabilities.c Tue Jan 13 17:12:00 2009 (r5128) @@ -260,17 +260,17 @@ osync_trace(TRACE_ENTRY, "%s(%s, %p)", __func__, file, error); osync_assert(file); - filename = g_strdup_printf("%s%c%s", OPENSYNC_CAPABILITIESDIR, G_DIR_SEPARATOR, file); + filename = osync_strdup_printf("%s%c%s", OPENSYNC_CAPABILITIESDIR, G_DIR_SEPARATOR, file); b = osync_file_read(filename, &buffer, &size, error); - g_free(filename); + osync_free(filename); if(!b) { osync_trace(TRACE_EXIT_ERROR, "%s: %s" , __func__, osync_error_print(error)); return NULL; } capabilities = osync_capabilities_parse(buffer, size, error); - g_free(buffer); + osync_free(buffer); if(!capabilities) { osync_trace(TRACE_EXIT_ERROR, "%s: %s" , __func__, osync_error_print(error)); return NULL; @@ -288,9 +288,9 @@ osync_trace(TRACE_ENTRY, "%s(%p)", __func__, member); osync_assert(member); - filename = g_strdup_printf("%s%ccapabilities.xml", osync_member_get_configdir(member), G_DIR_SEPARATOR); + filename = osync_strdup_printf("%s%ccapabilities.xml", osync_member_get_configdir(member), G_DIR_SEPARATOR); res = g_file_test(filename, G_FILE_TEST_IS_REGULAR); - g_free(filename); + osync_free(filename); osync_trace(TRACE_EXIT, "%s: %i", __func__, res); return res; @@ -306,9 +306,9 @@ osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, member, error); osync_assert(member); - filename = g_strdup_printf("%s%ccapabilities.xml", osync_member_get_configdir(member), G_DIR_SEPARATOR); + filename = osync_strdup_printf("%s%ccapabilities.xml", osync_member_get_configdir(member), G_DIR_SEPARATOR); res = osync_file_read(filename, &buffer, &size, error); - g_free(filename); + osync_free(filename); if(!res) { osync_trace(TRACE_EXIT_ERROR, "%s: %s" , __func__, osync_error_print(error)); @@ -316,7 +316,7 @@ } capabilities = osync_capabilities_parse(buffer, size, error); - g_free(buffer); + osync_free(buffer); if(!capabilities) { osync_trace(TRACE_EXIT_ERROR, "%s: %s" , __func__, osync_error_print(error)); return NULL; @@ -340,10 +340,10 @@ osync_assert(capabilities); osync_capabilities_assemble(capabilities, &buffer, &size); - filename = g_strdup_printf("%s%ccapabilities.xml", osync_member_get_configdir(member), G_DIR_SEPARATOR); + filename = osync_strdup_printf("%s%ccapabilities.xml", osync_member_get_configdir(member), G_DIR_SEPARATOR); res = osync_file_write(filename, buffer, size, 0600, error); - g_free(filename); - g_free(buffer); + osync_free(filename); + osync_free(buffer); if(!res) { osync_trace(TRACE_EXIT_ERROR, "%s: %s" , __func__, osync_error_print(error)); return FALSE; Modified: trunk/opensync/capabilities/opensync_capability.c ============================================================================== --- trunk/opensync/capabilities/opensync_capability.c Mon Jan 12 23:22:19 2009 (r5127) +++ trunk/opensync/capabilities/opensync_capability.c Tue Jan 13 17:12:00 2009 (r5128) @@ -140,7 +140,7 @@ capability->child = tmp; } - g_free(capability); + osync_free(capability); } int osync_capability_compare_stdlib(const void *capability1, const void *capability2) Modified: trunk/opensync/common/opensync_list.c ============================================================================== --- trunk/opensync/common/opensync_list.c Mon Jan 12 23:22:19 2009 (r5127) +++ trunk/opensync/common/opensync_list.c Tue Jan 13 17:12:00 2009 (r5128) @@ -376,7 +376,7 @@ OSyncList* osync_list_find (OSyncList *list, - void * data) + const void *data) { while (list) { @@ -390,7 +390,7 @@ OSyncList* osync_list_find_custom (OSyncList *list, - void * data, + const void *data, OSyncCompareFunc func) { g_return_val_if_fail (func != NULL, list); Modified: trunk/opensync/common/opensync_list.h ============================================================================== --- trunk/opensync/common/opensync_list.h Mon Jan 12 23:22:19 2009 (r5127) +++ trunk/opensync/common/opensync_list.h Tue Jan 13 17:12:00 2009 (r5128) @@ -40,8 +40,8 @@ OSyncList *prev; }; -typedef int (*OSyncCompareFunc)(void *a, void *b); -typedef int (*OSyncCompareDataFunc)(void *a, void *b, void *user_data); +typedef int (*OSyncCompareFunc)(const void *a, const void *b); +typedef int (*OSyncCompareDataFunc)(const void *a, const void *b, void *user_data); typedef void (*OSyncFunc)(void *data, void *user_data); /* Doubly linked lists @@ -84,9 +84,9 @@ OSYNC_EXPORT OSyncList* osync_list_nth_prev (OSyncList *list, unsigned int n); OSYNC_EXPORT OSyncList* osync_list_find (OSyncList *list, - void * data); + const void * data); OSYNC_EXPORT OSyncList* osync_list_find_custom (OSyncList *list, - void * data, + const void * data, OSyncCompareFunc func); OSYNC_EXPORT int osync_list_position (OSyncList *list, OSyncList *llink); Modified: trunk/opensync/data/opensync_change.c ============================================================================== --- trunk/opensync/data/opensync_change.c Mon Jan 12 23:22:19 2009 (r5127) +++ trunk/opensync/data/opensync_change.c Tue Jan 13 17:12:00 2009 (r5128) @@ -60,12 +60,12 @@ osync_data_unref(change->data); if (change->uid) - g_free(change->uid); + osync_free(change->uid); if (change->hash) - g_free(change->hash); + osync_free(change->hash); - g_free(change); + osync_free(change); } } @@ -111,8 +111,8 @@ { osync_assert(change); if (change->hash) - g_free(change->hash); - change->hash = g_strdup(hash); + osync_free(change->hash); + change->hash = osync_strdup(hash); } const char *osync_change_get_hash(OSyncChange *change) @@ -127,8 +127,8 @@ osync_assert(uid); if (change->uid) - g_free(change->uid); - change->uid = g_strdup(uid); + osync_free(change->uid); + change->uid = osync_strdup(uid); } const char *osync_change_get_uid(OSyncChange *change) @@ -166,10 +166,10 @@ osync_change_set_data(change, source->data); if (source->uid) - change->uid = g_strdup(source->uid); + change->uid = osync_strdup(source->uid); if (source->hash) - change->hash = g_strdup(source->hash); + change->hash = osync_strdup(source->hash); if (source->changetype) change->changetype = osync_change_get_changetype(source); @@ -238,7 +238,7 @@ if (newuid) { osync_change_set_uid(change, newuid); - g_free(newuid); + osync_free(newuid); } if (output) { Modified: trunk/opensync/data/opensync_data.c ============================================================================== --- trunk/opensync/data/opensync_data.c Mon Jan 12 23:22:19 2009 (r5127) +++ trunk/opensync/data/opensync_data.c Tue Jan 13 17:12:00 2009 (r5128) @@ -66,9 +66,9 @@ osync_objformat_unref(data->objformat); if (data->objtype) - g_free(data->objtype); + osync_free(data->objtype); - g_free(data); + osync_free(data); } } @@ -107,8 +107,8 @@ { osync_assert(data); if (data->objtype) - g_free(data->objtype); - data->objtype = g_strdup(objtype); + osync_free(data->objtype); + data->objtype = osync_strdup(objtype); } void osync_data_get_data(OSyncData *data, char **buffer, unsigned int *size) @@ -162,7 +162,7 @@ if (!data) return NULL; - data->objtype = g_strdup(source->objtype); + data->objtype = osync_strdup(source->objtype); if (source->data) { if (!osync_objformat_copy(source->objformat, source->data, source->size, &buffer, &size, error)) { Modified: trunk/opensync/db/opensync_db.c ============================================================================== --- trunk/opensync/db/opensync_db.c Mon Jan 12 23:22:19 2009 (r5127) +++ trunk/opensync/db/opensync_db.c Tue Jan 13 17:12:00 2009 (r5128) @@ -149,7 +149,7 @@ OSyncList *row = NULL; for (i=0; i < numcolumns; i++) /* speed up - prepend instead of append */ - row = osync_list_prepend(row, g_strdup(result[column_count++])); + row = osync_list_prepend(row, osync_strdup(result[column_count++])); /* items got prepended, reverse the list again */ row = osync_list_reverse(row); @@ -172,7 +172,7 @@ osync_trace(TRACE_ENTRY, "%s(%p)", __func__, list); for (row = list; row; row = row->next) { - osync_list_foreach((OSyncList *) row->data, (GFunc) g_free, NULL); + osync_list_foreach((OSyncList *) row->data, (GFunc) osync_free, NULL); osync_list_free((OSyncList *) row->data); } @@ -202,7 +202,7 @@ return NULL; } - result = g_strdup((const char *)sqlite3_column_text(ppStmt, 0)); + result = osync_strdup((const char *)sqlite3_column_text(ppStmt, 0)); if (sqlite3_step(ppStmt) == SQLITE_ROW) { osync_error_set(error, OSYNC_ERROR_GENERIC, "Returned more than one result! This function only handle a single string!"); @@ -215,7 +215,7 @@ return result; error: - g_free(result); + osync_free(result); sqlite3_finalize(ppStmt); osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error)); return NULL; @@ -268,17 +268,17 @@ osync_assert(db); osync_assert(tablename); - query = g_strdup_printf("DELETE FROM %s", tablename); + query = osync_strdup_printf("DELETE FROM %s", tablename); if (!osync_db_query(db, query, error)) goto error; - g_free(query); + osync_free(query); osync_trace(TRACE_EXIT, "%s", __func__); return TRUE; error: - g_free(query); + osync_free(query); osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error)); return FALSE; } @@ -291,7 +291,7 @@ osync_assert(db); - query = g_strdup("SELECT name FROM (SELECT * FROM sqlite_master) WHERE type='table'"); + query = osync_strdup("SELECT name FROM (SELECT * FROM sqlite_master) WHERE type='table'"); if (sqlite3_prepare(db->sqlite3db, query, -1, &ppStmt, NULL) != SQLITE_OK) { osync_error_set(error, OSYNC_ERROR_GENERIC, "Query Error: %s", sqlite3_errmsg(db->sqlite3db)); @@ -346,12 +346,12 @@ osync_assert(db); osync_assert(tablename); - query = g_strdup_printf("SELECT name FROM (SELECT * FROM sqlite_master UNION ALL SELECT * FROM sqlite_temp_master) WHERE type='table' AND name='%s'", + query = osync_strdup_printf("SELECT name FROM (SELECT * FROM sqlite_master UNION ALL SELECT * FROM sqlite_temp_master) WHERE type='table' AND name='%s'", tablename); if (sqlite3_prepare(db->sqlite3db, query, -1, &ppStmt, NULL) != SQLITE_OK) { sqlite3_finalize(ppStmt); - g_free(query); + osync_free(query); osync_error_set(error, OSYNC_ERROR_GENERIC, "Query Error: %s", sqlite3_errmsg(db->sqlite3db)); osync_trace(TRACE_EXIT_ERROR, "Database query error: %s", sqlite3_errmsg(db->sqlite3db)); @@ -361,14 +361,14 @@ if (sqlite3_step(ppStmt) != SQLITE_ROW) { sqlite3_finalize(ppStmt); - g_free(query); + osync_free(query); osync_trace(TRACE_EXIT, "%s: table \"%s\" doesn't exist.", __func__, tablename); return 0; } sqlite3_finalize(ppStmt); - g_free(query); + osync_free(query); osync_trace(TRACE_EXIT, "%s: table \"%s\" exists.", __func__, tablename); return 1; Modified: trunk/opensync/engine/opensync_engine.c ============================================================================== --- trunk/opensync/engine/opensync_engine.c Mon Jan 12 23:22:19 2009 (r5127) +++ trunk/opensync/engine/opensync_engine.c Tue Jan 13 17:12:00 2009 (r5128) @@ -116,7 +116,7 @@ osync_assert(engine); osync_assert(proxy); - ret = g_list_index(engine->proxies, proxy); + ret = osync_list_index(engine->proxies, proxy); osync_assert(ret >= 0); @@ -137,7 +137,7 @@ osync_assert(engine); osync_assert(objengine); - ret = g_list_index(engine->object_engines, objengine); + ret = osync_list_index(engine->object_engines, objengine); osync_assert(ret >= 0); @@ -150,7 +150,7 @@ return; osync_trace(TRACE_INTERNAL, "Setting internal format of %s to %p:%s", objtype, format, osync_objformat_get_name(format)); - g_hash_table_insert(engine->internalFormats, g_strdup(objtype), g_strdup(osync_objformat_get_name(format))); + g_hash_table_insert(engine->internalFormats, osync_strdup(objtype), osync_strdup(osync_objformat_get_name(format))); } static OSyncFormatConverterPath *_osync_engine_get_converter_path(OSyncEngine *engine, const char *member_objtype) @@ -164,7 +164,7 @@ osync_trace(TRACE_INTERNAL, "Setting converter_path of %s to %p", member_objtype, converter_path); if (!converter_path) return; - g_hash_table_insert(engine->converterPathes, g_strdup(member_objtype), converter_path); + g_hash_table_insert(engine->converterPathes, osync_strdup(member_objtype), converter_path); } static void _osync_engine_converter_path_unref(gpointer data) { @@ -213,7 +213,7 @@ objtype = osync_objformat_get_objtype(detected_format); } - member_objtype = g_strdup_printf("%lli_%s", memberid, objtype); + member_objtype = osync_strdup_printf("%lli_%s", memberid, objtype); /* Convert the format to the internal format */ internalFormat = _osync_engine_get_internal_format(engine, objtype); @@ -311,7 +311,7 @@ } /* Search for the correct objengine */ - {GList * o = NULL; + {OSyncList * o = NULL; for (o = engine->object_engines; o; o = o->next) { OSyncObjEngine *objengine = o->data; if (!strcmp(osync_change_get_objtype(change), osync_obj_engine_get_objtype(objengine))) { @@ -327,13 +327,13 @@ goto error; } - g_free(member_objtype); + osync_free(member_objtype); osync_trace(TRACE_EXIT, "%s", __func__); return; error: - g_free(member_objtype); + osync_free(member_objtype); osync_engine_set_error(engine, error); osync_status_update_member(engine, osync_client_proxy_get_member(proxy), OSYNC_CLIENT_EVENT_ERROR, NULL, error); @@ -354,7 +354,7 @@ osync_trace(TRACE_INTERNAL, "Dispatching %p: %i", command, command->cmd); osync_engine_command(engine, command); - g_free(command); + osync_free(command); } osync_trace(TRACE_EXIT, "%s: Done dispatching", __func__); @@ -463,9 +463,9 @@ if (!g_thread_supported ()) g_thread_init (NULL); - engine->internalFormats = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); - engine->internalSchemas = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); - engine->converterPathes = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, _osync_engine_converter_path_unref); + engine->internalFormats = g_hash_table_new_full(g_str_hash, g_str_equal, osync_free, osync_free); + engine->internalSchemas = g_hash_table_new_full(g_str_hash, g_str_equal, osync_free, NULL); + engine->converterPathes = g_hash_table_new_full(g_str_hash, g_str_equal, osync_free, _osync_engine_converter_path_unref); engine->context = g_main_context_new(); engine->thread = osync_thread_new(engine->context, error); @@ -480,15 +480,17 @@ if (!osync_group_get_configdir(group)) { osync_trace(TRACE_INTERNAL, "No config dir found. Making stateless sync"); } else { - char *filename = g_strdup_printf("%s%carchive.db", osync_group_get_configdir(group), G_DIR_SEPARATOR); + char *filename = osync_strdup_printf("%s%carchive.db", osync_group_get_configdir(group), G_DIR_SEPARATOR); engine->archive = osync_archive_new(filename, error); - g_free(filename); + osync_free(filename); if (!engine->archive) goto error_free_engine; } /* Now we attach a queue to the engine which handles our commands */ - engine->command_functions = g_malloc0(sizeof(GSourceFuncs)); + engine->command_functions = osync_try_malloc0(sizeof(GSourceFuncs), error); + if (!engine->command_functions) + goto error_free_engine; engine->command_functions->prepare = _command_prepare; engine->command_functions->check = _command_check; engine->command_functions->dispatch = _command_dispatch; @@ -505,15 +507,15 @@ g_source_attach(engine->command_source, engine->context); g_main_context_ref(engine->context); - enginesdir = g_strdup_printf("%s%cengines", osync_group_get_configdir(group), G_DIR_SEPARATOR); - engine->engine_path = g_strdup_printf("%s%cenginepipe", enginesdir, G_DIR_SEPARATOR); + enginesdir = osync_strdup_printf("%s%cengines", osync_group_get_configdir(group), G_DIR_SEPARATOR); + engine->engine_path = osync_strdup_printf("%s%cenginepipe", enginesdir, G_DIR_SEPARATOR); if (g_mkdir_with_parents(enginesdir, 0755) < 0) { osync_error_set(error, OSYNC_ERROR_GENERIC, "Couldn't create engines directory: %s", g_strerror(errno)); - g_free(enginesdir); + osync_free(enginesdir); goto error_free_engine; } - g_free(enginesdir); + osync_free(enginesdir); engine->syncing_mutex = g_mutex_new(); engine->syncing = g_cond_new(); @@ -550,7 +552,7 @@ while (engine->object_engines) { OSyncObjEngine *objengine = engine->object_engines->data; osync_obj_engine_unref(objengine); - engine->object_engines = g_list_remove(engine->object_engines, engine->object_engines->data); + engine->object_engines = osync_list_remove(engine->object_engines, engine->object_engines->data); } if (engine->internalFormats) @@ -563,13 +565,13 @@ osync_group_unref(engine->group); if (engine->engine_path) - g_free(engine->engine_path); + osync_free(engine->engine_path); if (engine->plugin_dir) - g_free(engine->plugin_dir); + osync_free(engine->plugin_dir); if (engine->format_dir) - g_free(engine->format_dir); + osync_free(engine->format_dir); if (engine->thread) osync_thread_unref(engine->thread); @@ -596,7 +598,7 @@ g_source_unref(engine->command_source); if (engine->command_functions) - g_free(engine->command_functions); + osync_free(engine->command_functions); if (engine->archive) osync_archive_unref(engine->archive); @@ -609,10 +611,10 @@ #ifdef OPENSYNC_UNITTESTS if (engine->schema_dir) - g_free(engine->schema_dir); + osync_free(engine->schema_dir); #endif /* OPENSYNC_UNITTESTS */ - g_free(engine); + osync_free(engine); osync_trace(TRACE_EXIT, "%s", __func__); } } @@ -621,8 +623,8 @@ { osync_assert(engine); if (engine->plugin_dir) - g_free(engine->plugin_dir); - engine->plugin_dir = g_strdup(dir); + osync_free(engine->plugin_dir); + engine->plugin_dir = osync_strdup(dir); } OSyncGroup *osync_engine_get_group(OSyncEngine *engine) @@ -641,8 +643,8 @@ { osync_assert(engine); if (engine->format_dir) - g_free(engine->format_dir); - engine->format_dir = g_strdup(dir); + osync_free(engine->format_dir); + engine->format_dir = osync_strdup(dir); } static osync_bool _osync_engine_start(OSyncEngine *engine, OSyncError **error) @@ -700,7 +702,7 @@ if (!osync_client_proxy_shutdown(proxy, error)) goto error; - engine->proxies = g_list_remove(engine->proxies, proxy); + engine->proxies = osync_list_remove(engine->proxies, proxy); osync_client_proxy_unref(proxy); @@ -767,7 +769,7 @@ //FIXME while (engine->busy) { g_usleep(100); } - engine->proxies = g_list_append(engine->proxies, proxy); + engine->proxies = osync_list_append(engine->proxies, proxy); if (engine->error) { _osync_engine_finalize_member(engine, proxy, NULL); @@ -794,11 +796,11 @@ { OSyncError *locerror = NULL; - if (osync_bitcount(engine->proxy_errors | engine->proxy_connects) != g_list_length(engine->proxies)) + if (osync_bitcount(engine->proxy_errors | engine->proxy_connects) != osync_list_length(engine->proxies)) return FALSE; - if (osync_bitcount(engine->obj_errors | engine->obj_connects) == g_list_length(engine->object_engines)) { - if (osync_bitcount(engine->obj_errors) == g_list_length(engine->object_engines)) { + if (osync_bitcount(engine->obj_errors | engine->obj_connects) == osync_list_length(engine->object_engines)) { + if (osync_bitcount(engine->obj_errors) == osync_list_length(engine->object_engines)) { osync_error_set(&locerror, OSYNC_ERROR_GENERIC, "No objtypes left without error. Aborting"); osync_trace(TRACE_ERROR, "%s", osync_error_print(&locerror)); osync_engine_set_error(engine, locerror); @@ -825,10 +827,10 @@ static void _osync_engine_generate_connect_done_event(OSyncEngine *engine) { - if (osync_bitcount(engine->proxy_errors | engine->proxy_connect_done) != g_list_length(engine->proxies)) + if (osync_bitcount(engine->proxy_errors | engine->proxy_connect_done) != osync_list_length(engine->proxies)) return; - if (osync_bitcount(engine->obj_errors | engine->obj_connect_done) == g_list_length(engine->object_engines)) { + if (osync_bitcount(engine->obj_errors | engine->obj_connect_done) == osync_list_length(engine->object_engines)) { if (osync_bitcount(engine->obj_errors)) { OSyncError *locerror = NULL; osync_error_set(&locerror, OSYNC_ERROR_GENERIC, "At least one object engine failed within connect_done. Aborting"); @@ -845,12 +847,12 @@ osync_bool osync_engine_check_get_changes(OSyncEngine *engine) { - if (osync_bitcount(engine->proxy_errors | engine->proxy_get_changes) != g_list_length(engine->proxies)) { - osync_trace(TRACE_INTERNAL, "Not yet. main sinks still need to read: %i", osync_bitcount(engine->proxy_errors | engine->proxy_get_changes), g_list_length(engine->proxies)); + if (osync_bitcount(engine->proxy_errors | engine->proxy_get_changes) != osync_list_length(engine->proxies)) { + osync_trace(TRACE_INTERNAL, "Not yet. main sinks still need to read: %i", osync_bitcount(engine->proxy_errors | engine->proxy_get_changes), osync_list_length(engine->proxies)); return FALSE; } - if (osync_bitcount(engine->obj_errors | engine->obj_get_changes) == g_list_length(engine->object_engines)) + if (osync_bitcount(engine->obj_errors | engine->obj_get_changes) == osync_list_length(engine->object_engines)) return TRUE; osync_trace(TRACE_INTERNAL, "Not yet. Obj Engines still need to read: %i", osync_bitcount(engine->obj_errors | engine->obj_get_changes)); @@ -879,7 +881,7 @@ static void _osync_engine_generate_prepared_map(OSyncEngine *engine) { - if (osync_bitcount(engine->obj_errors | engine->obj_prepared_map) == g_list_length(engine->object_engines)) { + if (osync_bitcount(engine->obj_errors | engine->obj_prepared_map) == osync_list_length(engine->object_engines)) { if (osync_bitcount(engine->obj_errors)) { OSyncError *locerror = NULL; osync_error_set(&locerror, OSYNC_ERROR_GENERIC, "At least one object engine failed while preparing for mapping the changes. Aborting"); @@ -901,7 +903,7 @@ static void _osync_engine_generate_mapped_event(OSyncEngine *engine) { - if (osync_bitcount(engine->obj_errors | engine->obj_mapped) == g_list_length(engine->object_engines)) { + if (osync_bitcount(engine->obj_errors | engine->obj_mapped) == osync_list_length(engine->object_engines)) { if (osync_bitcount(engine->obj_errors)) { OSyncError *locerror = NULL; osync_error_set(&locerror, OSYNC_ERROR_GENERIC, "At least one object engine failed while mapping changes. Aborting"); @@ -925,7 +927,7 @@ static void _osync_engine_generate_end_conflicts_event(OSyncEngine *engine) { - if (osync_bitcount(engine->obj_errors | engine->obj_solved) == g_list_length(engine->object_engines)) { + if (osync_bitcount(engine->obj_errors | engine->obj_solved) == osync_list_length(engine->object_engines)) { if (osync_bitcount(engine->obj_errors)) { OSyncError *locerror = NULL; osync_error_set(&locerror, OSYNC_ERROR_GENERIC, "At least one object engine failed while solving conflicts. Aborting"); @@ -948,7 +950,7 @@ void osync_engine_trace_multiply_summary(OSyncEngine *engine) { - GList *o, *s; + OSyncList *o, *s; OSyncList *e; unsigned int added, modified, deleted, unmodified, unknown; long long int memberid; @@ -1010,7 +1012,7 @@ static void _osync_engine_generate_multiplied_event(OSyncEngine *engine) { - if (osync_bitcount(engine->obj_errors | engine->obj_multiplied) == g_list_length(engine->object_engines)) { + if (osync_bitcount(engine->obj_errors | engine->obj_multiplied) == osync_list_length(engine->object_engines)) { if (osync_bitcount(engine->obj_errors)) { OSyncError *locerror = NULL; osync_error_set(&locerror, OSYNC_ERROR_GENERIC, "At least one object engine failed while multiplying changes. Aborting"); @@ -1036,7 +1038,7 @@ static void _osync_engine_generate_prepared_write_event(OSyncEngine *engine) { - if (osync_bitcount(engine->obj_errors | engine->obj_prepared_write) == g_list_length(engine->object_engines)) { + if (osync_bitcount(engine->obj_errors | engine->obj_prepared_write) == osync_list_length(engine->object_engines)) { if (osync_bitcount(engine->obj_errors)) { OSyncError *locerror = NULL; osync_error_set(&locerror, OSYNC_ERROR_GENERIC, "At least one object engine failed while preparing the write event. Aborting"); @@ -1057,10 +1059,10 @@ static void _osync_engine_generate_written_event(OSyncEngine *engine) { - if (osync_bitcount(engine->proxy_errors | engine->proxy_written) != g_list_length(engine->proxies)) + if (osync_bitcount(engine->proxy_errors | engine->proxy_written) != osync_list_length(engine->proxies)) return; - if (osync_bitcount(engine->obj_errors | engine->obj_written) == g_list_length(engine->object_engines)) { + if (osync_bitcount(engine->obj_errors | engine->obj_written) == osync_list_length(engine->object_engines)) { if (osync_bitcount(engine->obj_errors)) { OSyncError *locerror = NULL; osync_error_set(&locerror, OSYNC_ERROR_GENERIC, "At least one object engine failed while writting changes. Aborting"); @@ -1080,10 +1082,10 @@ static void _osync_engine_generate_sync_done_event(OSyncEngine *engine) { - if (osync_bitcount(engine->proxy_errors | engine->proxy_sync_done) != g_list_length(engine->proxies)) + if (osync_bitcount(engine->proxy_errors | engine->proxy_sync_done) != osync_list_length(engine->proxies)) return; - if (osync_bitcount(engine->obj_errors | engine->obj_sync_done) == g_list_length(engine->object_engines)) { + if (osync_bitcount(engine->obj_errors | engine->obj_sync_done) == osync_list_length(engine->object_engines)) { if (osync_bitcount(engine->obj_errors)) { OSyncError *locerror = NULL; osync_error_set(&locerror, OSYNC_ERROR_GENERIC, "At least one object engine failed within sync_done. Aborting"); @@ -1101,10 +1103,10 @@ static osync_bool _osync_engine_generate_disconnected_event(OSyncEngine *engine) { - if (osync_bitcount(engine->proxy_errors | engine->proxy_disconnects) != g_list_length(engine->proxies)) + if (osync_bitcount(engine->proxy_errors | engine->proxy_disconnects) != osync_list_length(engine->proxies)) return FALSE; - if (osync_bitcount(engine->obj_errors | engine->obj_disconnects) == g_list_length(engine->object_engines)) { + if (osync_bitcount(engine->obj_errors | engine->obj_disconnects) == osync_list_length(engine->object_engines)) { /* Error handling in this case is quite special. We have to call OSYNC_ENGINE_EVENT_DISCONNECTED, even on errors. Since OSYNC_ENGINE_EVENT_ERROR would emit this DISCONNECTED event again - deadlock! */ @@ -1119,7 +1121,7 @@ static void _osync_engine_connect_callback(OSyncClientProxy *proxy, void *userdata, osync_bool slowsync, OSyncError *error) { - GList *o = NULL; + OSyncList *o = NULL; OSyncEngine *engine = NULL; int position = 0; @@ -1502,7 +1504,7 @@ goto error; osync_obj_engine_set_callback(objengine, _osync_engine_event_callback, engine); - engine->object_engines = g_list_append(engine->object_engines, objengine); + engine->object_engines = osync_list_append(engine->object_engines, objengine); /* If previous sync was unclean, then trigger SlowSync for all ObjEngines. * Also trigger SlowSync if this is the first synchronization. */ @@ -1538,7 +1540,7 @@ while (engine->object_engines) { OSyncObjEngine *objengine = engine->object_engines->data; osync_obj_engine_unref(objengine); - engine->object_engines = g_list_remove(engine->object_engines, engine->object_engines->data); + engine->object_engines = osync_list_remove(engine->object_engines, engine->object_engines->data); } while (engine->proxies) { @@ -1578,8 +1580,8 @@ void osync_engine_command(OSyncEngine *engine, OSyncEngineCommand *command) { - GList *o = NULL; - GList *p = NULL; + OSyncList *o = NULL; + OSyncList *p = NULL; OSyncError *locerror = NULL; OSyncClientProxy *proxy = NULL; @@ -1712,7 +1714,7 @@ void osync_engine_event(OSyncEngine *engine, OSyncEngineEvent event) { - GList *o = NULL; + OSyncList *o = NULL; OSyncError *locerror = NULL; osync_trace(TRACE_ENTRY, "%s(%p, %s)", __func__, engine, osync_engine_get_eventstr(event)); @@ -1962,7 +1964,7 @@ if (engine->error) { char *msg = osync_error_print_stack(&(engine->error)); osync_trace(TRACE_ERROR, "error while synchronizing: %s", msg); - g_free(msg); + osync_free(msg); osync_error_set_from_error(error, &(engine->error)); goto error; } @@ -2074,18 +2076,18 @@ unsigned int osync_engine_num_proxies(OSyncEngine *engine) { osync_return_val_if_fail(engine, 0); - return g_list_length(engine->proxies); + return osync_list_length(engine->proxies); } OSyncClientProxy *osync_engine_nth_proxy(OSyncEngine *engine, unsigned int nth) { osync_return_val_if_fail(engine, NULL); - return g_list_nth_data(engine->proxies, nth); + return osync_list_nth_data(engine->proxies, nth); } OSyncClientProxy *osync_engine_find_proxy(OSyncEngine *engine, OSyncMember *member) { - GList *p = NULL; + OSyncList *p = NULL; OSyncClientProxy *proxy = NULL; osync_return_val_if_fail(engine, NULL); @@ -2102,18 +2104,18 @@ unsigned int osync_engine_num_objengines(OSyncEngine *engine) { osync_return_val_if_fail(engine, 0); - return g_list_length(engine->object_engines); + return osync_list_length(engine->object_engines); } OSyncObjEngine *osync_engine_nth_objengine(OSyncEngine *engine, unsigned int nth) { osync_return_val_if_fail(engine, NULL); - return g_list_nth_data(engine->object_engines, nth); + return osync_list_nth_data(engine->object_engines, nth); } OSyncObjEngine *osync_engine_find_objengine(OSyncEngine *engine, const char *objtype) { - GList *p = NULL; + OSyncList *p = NULL; OSyncObjEngine *objengine = NULL; osync_return_val_if_fail(engine, NULL); @@ -2190,7 +2192,7 @@ /* ...and flush all pending commands. To make sure the abort command will be the next and last command. */ while ((pending_command = g_async_queue_try_pop_unlocked(engine->command_queue))) - g_free(pending_command); + osync_free(pending_command); /* Push the abort command on the empty queue. */ g_async_queue_push_unlocked(engine->command_queue, cmd); @@ -2366,9 +2368,9 @@ osync_assert(schema_dir); if (engine->schema_dir) - g_free(engine->schema_dir); + osync_free(engine->schema_dir); - engine->schema_dir = g_strdup(schema_dir); + engine->schema_dir = osync_strdup(schema_dir); } #endif /* OPENSYNC_UNITTESTS */ Modified: trunk/opensync/engine/opensync_engine_private.h ============================================================================== --- trunk/opensync/engine/opensync_engine_private.h Mon Jan 12 23:22:19 2009 (r5127) +++ trunk/opensync/engine/opensync_engine_private.h Tue Jan 13 17:12:00 2009 (r5128) @@ -95,10 +95,10 @@ GMutex* started_mutex; /** proxies contains a list of all OSyncClientProxy objects **/ - GList *proxies; + OSyncList *proxies; /** object_engines contains a list of all OSyncObjEngine objects **/ - GList *object_engines; + OSyncList *object_engines; osync_bool man_dispatch; osync_bool allow_sync_alert; Modified: trunk/opensync/engine/opensync_mapping_engine.c ============================================================================== --- trunk/opensync/engine/opensync_mapping_engine.c Mon Jan 12 23:22:19 2009 (r5127) +++ trunk/opensync/engine/opensync_mapping_engine.c Tue Jan 13 17:12:00 2009 (r5128) @@ -49,7 +49,7 @@ OSyncMappingEngine *osync_mapping_engine_new(OSyncObjEngine *parent, OSyncMapping *mapping, OSyncError **error) { OSyncMappingEngine *engine = NULL; - GList *s = NULL; + OSyncList *s = NULL; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, parent, mapping, error); osync_assert(parent); @@ -83,7 +83,7 @@ if (!entry_engine) goto error_free_engine; - engine->entries = g_list_append(engine->entries, entry_engine); + engine->entries = osync_list_append(engine->entries, entry_engine); } osync_trace(TRACE_EXIT, "%s: %p", __func__, engine); @@ -120,16 +120,16 @@ OSyncMappingEntryEngine *entry = engine->entries->data; osync_entry_engine_unref(entry); - engine->entries = g_list_remove(engine->entries, engine->entries->data); + engine->entries = osync_list_remove(engine->entries, engine->entries->data); } - g_free(engine); + osync_free(engine); } } static OSyncMappingEntryEngine *_osync_mapping_engine_find_entry(OSyncMappingEngine *engine, OSyncChange *change) { - GList *e; + OSyncList *e; for (e = engine->entries; e; e = e->next) { OSyncMappingEntryEngine *entry = e->data; if (change && entry->change == change) @@ -223,7 +223,7 @@ { OSyncObjEngine *parent = NULL; osync_bool ignore_supported = TRUE; - GList *s = NULL; + OSyncList *s = NULL; osync_trace(TRACE_ENTRY, "%s(%p)", __func__, engine); osync_assert(engine); @@ -267,7 +267,7 @@ osync_bool osync_mapping_engine_multiply(OSyncMappingEngine *engine, OSyncError **error) { - GList *e = NULL; + OSyncList *e = NULL; osync_assert(engine); osync_assert(engine->mapping); @@ -426,7 +426,7 @@ osync_bool osync_mapping_engine_check_conflict(OSyncMappingEngine *engine) { int is_same = 0; - GList *e = NULL; + OSyncList *e = NULL; osync_trace(TRACE_ENTRY, "%s(%p)", __func__, engine); osync_assert(engine != NULL); @@ -446,7 +446,7 @@ OSyncChange *leftchange = osync_entry_engine_get_change(leftentry); OSyncChange *rightchange = NULL; - GList *n = NULL; + OSyncList *n = NULL; osync_trace(TRACE_INTERNAL, "change: %p: %i", leftchange, leftchange ? osync_change_get_changetype(leftchange) : OSYNC_CHANGE_TYPE_UNKNOWN); if (leftchange == NULL) continue; @@ -485,7 +485,7 @@ if (engine->conflict) { //conflict, solve conflict osync_trace(TRACE_INTERNAL, "Got conflict for mapping_engine %p", engine); - engine->parent->conflicts = g_list_append(engine->parent->conflicts, engine); + engine->parent->conflicts = osync_list_append(engine->parent->conflicts, engine); if (!osync_status_conflict(engine->parent->parent, engine)) goto error; @@ -496,8 +496,8 @@ osync_assert(engine->master); osync_status_update_mapping(engine->parent->parent, engine, OSYNC_MAPPING_EVENT_SOLVED, NULL); - if (is_same == prod(g_list_length(engine->entries) - 1)) { - GList *e = NULL; + if (is_same == prod(osync_list_length(engine->entries) - 1)) { + OSyncList *e = NULL; osync_trace(TRACE_INTERNAL, "No need to sync. All entries are the same"); for (e = engine->entries; e; e = e->next) { OSyncMappingEntryEngine *entry = e->data; @@ -518,7 +518,7 @@ OSyncMappingEntryEngine *osync_mapping_engine_get_entry(OSyncMappingEngine *engine, OSyncSinkEngine *sinkengine) { - GList *e = NULL; + OSyncList *e = NULL; for (e = engine->entries; e; e = e->next) { OSyncMappingEntryEngine *entry_engine = e->data; if (sinkengine == entry_engine->sink_engine) @@ -533,7 +533,7 @@ int osync_mapping_engine_num_changes(OSyncMappingEngine *engine) { int num = 0; - GList *e = NULL; + OSyncList *e = NULL; osync_assert(engine); for (e = engine->entries; e; e = e->next) { OSyncMappingEntryEngine *entry = e->data; @@ -547,7 +547,7 @@ OSyncChange *osync_mapping_engine_nth_change(OSyncMappingEngine *engine, int nth) { int num = 0; - GList *e = NULL; + OSyncList *e = NULL; osync_assert(engine); for (e = engine->entries; e; e = e->next) { OSyncMappingEntryEngine *entry = e->data; @@ -563,7 +563,7 @@ OSyncChange *osync_mapping_engine_member_change(OSyncMappingEngine *engine, int memberid) { - GList *e = NULL; + OSyncList *e = NULL; osync_assert(engine); for (e = engine->entries; e; e = e->next) { OSyncMappingEntryEngine *entry = e->data; @@ -585,7 +585,7 @@ engine->conflict = FALSE; osync_mapping_engine_set_master(engine, entry); osync_status_update_mapping(engine->parent->parent, engine, OSYNC_MAPPING_EVENT_SOLVED, NULL); - engine->parent->conflicts = g_list_remove(engine->parent->conflicts, engine); + engine->parent->conflicts = osync_list_remove(engine->parent->conflicts, engine); if (!osync_obj_engine_command(engine->parent, OSYNC_ENGINE_COMMAND_END_CONFLICTS, error)) goto error; @@ -604,7 +604,7 @@ OSyncArchive *archive = NULL; char *objtype = NULL; long long int id = 0; - GList *c = NULL; + OSyncList *c = NULL; osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, engine, error); engine->conflict = FALSE; @@ -621,7 +621,7 @@ } osync_status_update_mapping(engine->parent->parent, engine, OSYNC_MAPPING_EVENT_SOLVED, NULL); - engine->parent->conflicts = g_list_remove(engine->parent->conflicts, engine); + engine->parent->conflicts = osync_list_remove(engine->parent->conflicts, engine); if (!osync_obj_engine_command(engine->parent, OSYNC_ENGINE_COMMAND_END_CONFLICTS, error)) goto error; @@ -648,7 +648,7 @@ engine->conflict = FALSE; osync_status_update_mapping(engine->parent->parent, engine, OSYNC_MAPPING_EVENT_SOLVED, NULL); - engine->parent->conflicts = g_list_remove(engine->parent->conflicts, engine); + engine->parent->conflicts = osync_list_remove(engine->parent->conflicts, engine); if (!osync_obj_engine_command(engine->parent, OSYNC_ENGINE_COMMAND_END_CONFLICTS, error)) goto error; @@ -675,7 +675,7 @@ { int elevation = 0; OSyncObjEngine *objengine = NULL; - GList *entries = NULL, *e = NULL, *mappings = NULL; + OSyncList *entries = NULL, *e = NULL, *mappings = NULL; osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, existingMapping, error); g_assert(existingMapping); @@ -690,7 +690,7 @@ if (osync_change_get_changetype(entry->change) == OSYNC_CHANGE_TYPE_MODIFIED || osync_change_get_changetype(entry->change) == OSYNC_CHANGE_TYPE_ADDED) { osync_trace(TRACE_INTERNAL, "Appending entry %s, changetype %i from member %lli", osync_change_get_uid(entry->change), osync_change_get_changetype(entry->change), osync_member_get_id(osync_client_proxy_get_member(entry->sink_engine->proxy))); - entries = g_list_append(entries, entry); + entries = osync_list_append(entries, entry); } else { osync_trace(TRACE_INTERNAL, "Removing entry %s, changetype %i from member %lli", osync_change_get_uid(entry->change), osync_change_get_changetype(entry->change), osync_member_get_id(osync_client_proxy_get_member(entry->sink_engine->proxy))); osync_entry_engine_update(entry, NULL); @@ -701,14 +701,14 @@ } /* Create a list with mappings. In the beginning, only the exisiting mapping is in the list */ - mappings = g_list_append(NULL, existingMapping); + mappings = osync_list_append(NULL, existingMapping); osync_mapping_engine_ref(existingMapping); while (entries) { OSyncMappingEntryEngine *existingEntry = entries->data; /* Now lets see which mapping is the correct one for the entry */ - GList *m = NULL; + OSyncList *m = NULL; OSyncMappingEngine *mapping = NULL; OSyncChange *existingChange = NULL; osync_bool dirty = FALSE; @@ -716,7 +716,7 @@ elevation = 0; for (m = mappings; m; m = m->next) { - GList *e = NULL; + OSyncList *e = NULL; OSyncChange *change = NULL; OSyncMappingEntryEngine *entry = NULL; mapping = m->data; @@ -751,8 +751,8 @@ mapping = _osync_obj_engine_create_mapping_engine(objengine, error); if (!mapping) goto error; - mappings = g_list_append(mappings, mapping); - objengine->mapping_engines = g_list_append(objengine->mapping_engines, mapping); + mappings = osync_list_append(mappings, mapping); + objengine->mapping_engines = osync_list_append(objengine->mapping_engines, mapping); osync_mapping_engine_ref(mapping); } @@ -775,17 +775,17 @@ * this information here */ newEntry->dirty = dirty; - entries = g_list_remove(entries, existingEntry); + entries = osync_list_remove(entries, existingEntry); } while (mappings) { OSyncMappingEngine *mapping = mappings->data; osync_mapping_engine_unref(mapping); - mappings = g_list_remove(mappings, mapping); + mappings = osync_list_remove(mappings, mapping); } - objengine->conflicts = g_list_remove(objengine->conflicts, existingMapping); + objengine->conflicts = osync_list_remove(objengine->conflicts, existingMapping); osync_status_update_mapping(objengine->parent, existingMapping, OSYNC_MAPPING_EVENT_SOLVED, NULL); if (!osync_obj_engine_command(objengine, OSYNC_ENGINE_COMMAND_END_CONFLICTS, error)) @@ -798,7 +798,7 @@ while (mappings) { OSyncMappingEngine *mapping = mappings->data; osync_mapping_engine_unref(mapping); - mappings = g_list_remove(mappings, mapping); + mappings = osync_list_remove(mappings, mapping); } osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error)); return FALSE; Modified: trunk/opensync/engine/opensync_mapping_engine_internals.h ============================================================================== --- trunk/opensync/engine/opensync_mapping_engine_internals.h Mon Jan 12 23:22:19 2009 (r5127) +++ trunk/opensync/engine/opensync_mapping_engine_internals.h Tue Jan 13 17:12:00 2009 (r5128) @@ -36,7 +36,7 @@ int ref_count; OSyncMapping *mapping; OSyncMappingEntryEngine *master; - GList *entries; /* OSyncMappingEntryEngine */ + OSyncList *entries; /* OSyncMappingEntryEngine */ OSyncObjEngine *parent; osync_bool conflict; osync_bool synced; Modified: trunk/opensync/engine/opensync_mapping_entry_engine.c ============================================================================== --- trunk/opensync/engine/opensync_mapping_entry_engine.c Mon Jan 12 23:22:19 2009 (r5127) +++ trunk/opensync/engine/opensync_mapping_entry_engine.c Tue Jan 13 17:12:00 2009 (r5128) @@ -95,7 +95,7 @@ if (engine->entry) osync_mapping_entry_unref(engine->entry); - g_free(engine); + osync_free(engine); } } @@ -218,7 +218,7 @@ osync_trace(TRACE_INTERNAL, "Starting to convert from objtype %s and format %s", osync_change_get_objtype(entry_engine->change), osync_objformat_get_name(osync_change_get_objformat(entry_engine->change))); /* We have to save the objtype of the change so that it does not get * overwritten by the conversion */ - objtype = g_strdup(osync_change_get_objtype(change)); + objtype = osync_strdup(osync_change_get_objtype(change)); /* Now we have to convert to one of the formats * that the client can understand */ @@ -256,14 +256,14 @@ *cachedpath = path; osync_change_set_objtype(change, objtype); - g_free(objtype); + osync_free(objtype); return TRUE; error_free_path: osync_converter_path_unref(path); error_free_objtype: - g_free(objtype); + osync_free(objtype); /*error:*/ return FALSE; } Modified: trunk/opensync/engine/opensync_obj_engine.c ============================================================================== --- trunk/opensync/engine/opensync_obj_engine.c Mon Jan 12 23:22:19 2009 (r5127) +++ trunk/opensync/engine/opensync_obj_engine.c Tue Jan 13 17:12:00 2009 (r5128) @@ -53,7 +53,7 @@ { /* If there is none, create one */ OSyncMapping *mapping = osync_mapping_new(error); - GList *s = NULL; + OSyncList *s = NULL; OSyncMappingEngine *mapping_engine = NULL; if (!mapping) goto error; @@ -198,10 +198,10 @@ * return value is MISMATCH if no mapping could be found, * SIMILAR if a mapping has been found but its not completely the same * SAME if a mapping has been found and is the same */ -static OSyncConvCmpResult _osync_obj_engine_mapping_find(GList *mapping_engines, OSyncChange *change, OSyncSinkEngine *sinkengine, OSyncMappingEngine **mapping_engine) +static OSyncConvCmpResult _osync_obj_engine_mapping_find(OSyncList *mapping_engines, OSyncChange *change, OSyncSinkEngine *sinkengine, OSyncMappingEngine **mapping_engine) { - GList *m = NULL; - GList *e = NULL; + OSyncList *m = NULL; + OSyncList *e = NULL; osync_bool found_similar = FALSE; OSyncConvCmpResult result = OSYNC_CONV_DATA_MISMATCH; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, mapping_engines, change, sinkengine, mapping_engine); @@ -251,8 +251,8 @@ osync_bool osync_obj_engine_map_changes(OSyncObjEngine *engine, OSyncError **error) { OSyncMappingEngine *mapping_engine = NULL; - GList *new_mappings = NULL, *v = NULL; - GList *unmapped_mappings = NULL; + OSyncList *new_mappings = NULL, *v = NULL; + OSyncList *unmapped_mappings = NULL; OSyncConvCmpResult result = 0; OSyncMappingEntryEngine *entry_engine = NULL; @@ -270,7 +270,7 @@ long long int memberid = osync_member_get_id(osync_client_proxy_get_member(sinkengine->proxy)); osync_trace(TRACE_INTERNAL, "Sinkengine of member %lli", memberid); - unmapped_mappings = g_list_copy(new_mappings); + unmapped_mappings = osync_list_copy(new_mappings); /* For each sinkengine, go through all unmapped changes */ while (sinkengine->unmapped) { @@ -288,12 +288,12 @@ osync_trace(TRACE_INTERNAL, "Unable to find mapping. Creating new mapping with id %lli", osync_mapping_get_id(mapping_engine->mapping)); /* TODO: what about _prepend (O(1)) instead of _append (O(n))? Order doesn't matter here - right? */ - new_mappings = g_list_append(new_mappings, mapping_engine); - unmapped_mappings = g_list_append(unmapped_mappings, mapping_engine); + new_mappings = osync_list_append(new_mappings, mapping_engine); + unmapped_mappings = osync_list_append(unmapped_mappings, mapping_engine); } else if (result == OSYNC_CONV_DATA_SIMILAR) { mapping_engine->conflict = TRUE; } else if (result == OSYNC_CONV_DATA_SAME) { - unmapped_mappings = g_list_remove(unmapped_mappings, mapping_engine); + unmapped_mappings = osync_list_remove(unmapped_mappings, mapping_engine); } /* Update the entry which belongs to our sinkengine with the the change */ entry_engine = osync_mapping_engine_get_entry(mapping_engine, sinkengine); @@ -304,11 +304,11 @@ osync_change_unref(change); } - g_list_free(unmapped_mappings); + osync_list_free(unmapped_mappings); } - engine->mapping_engines = g_list_concat(engine->mapping_engines, new_mappings); + engine->mapping_engines = osync_list_concat(engine->mapping_engines, new_mappings); //osync_trace_enable(); osync_trace(TRACE_EXIT, "%s", __func__); @@ -362,7 +362,7 @@ osync_bool osync_obj_engine_receive_change(OSyncObjEngine *objengine, OSyncClientProxy *proxy, OSyncChange *change, OSyncError **error) { OSyncSinkEngine *sinkengine = NULL; - GList *s = NULL; + OSyncList *s = NULL; OSyncList *e = NULL; osync_assert(objengine); @@ -422,7 +422,7 @@ static void _osync_obj_engine_generate_written_event(OSyncObjEngine *engine, OSyncError *error) { osync_bool dirty = FALSE; - GList *p = NULL; + OSyncList *p = NULL; OSyncList *e = NULL; OSyncSinkEngine *sinkengine = NULL; OSyncError *locerror = NULL; @@ -601,7 +601,7 @@ if (!mapping_engine) goto error; - engine->mapping_engines = g_list_append(engine->mapping_engines, mapping_engine); + engine->mapping_engines = osync_list_append(engine->mapping_engines, mapping_engine); } osync_trace(TRACE_EXIT, "%s", __func__); @@ -634,12 +634,12 @@ OSyncMapping *ignored_mapping = osync_mapping_table_find_mapping(engine->mapping_table, id); - GList *e; + OSyncList *e; for (e = engine->mapping_engines; e; e = e->next) { OSyncMappingEngine *mapping_engine = e->data; if (mapping_engine->mapping == ignored_mapping) { - GList *m; + OSyncList *m; for (m = mapping_engine->entries; m; m = m->next) { OSyncMappingEntryEngine *entry = m->data; OSyncChangeType changetype = (OSyncChangeType) t->data; @@ -693,7 +693,7 @@ * dependent on the engine anyways */ engine->parent = parent; - engine->objtype = g_strdup(objtype); + engine->objtype = osync_strdup(objtype); engine->formatenv = osync_format_env_ref(formatenv); engine->mapping_table = osync_mapping_table_new(error); @@ -730,21 +730,21 @@ OSyncSinkEngine *sinkengine = engine->sink_engines->data; osync_sink_engine_unref(sinkengine); - engine->sink_engines = g_list_remove(engine->sink_engines, sinkengine); + engine->sink_engines = osync_list_remove(engine->sink_engines, sinkengine); } while (engine->mapping_engines) { OSyncMappingEngine *mapping_engine = engine->mapping_engines->data; osync_mapping_engine_unref(mapping_engine); - engine->mapping_engines = g_list_remove(engine->mapping_engines, mapping_engine); + engine->mapping_engines = osync_list_remove(engine->mapping_engines, mapping_engine); } if (engine->error) osync_error_unref(&engine->error); if (engine->objtype) - g_free(engine->objtype); + osync_free(engine->objtype); if (engine->mapping_table) osync_mapping_table_unref(engine->mapping_table); @@ -752,13 +752,13 @@ if (engine->formatenv) osync_format_env_unref(engine->formatenv); - g_free(engine); + osync_free(engine); } } static int _osync_obj_engine_num_write_sinks(OSyncObjEngine *objengine) { int num = 0; - GList *p = NULL; + OSyncList *p = NULL; OSyncSinkEngine *sink; osync_trace(TRACE_ENTRY, "%s(%p)", __func__, objengine); @@ -814,7 +814,7 @@ engine->dummies++; } - engine->sink_engines = g_list_append(engine->sink_engines, sinkengine); + engine->sink_engines = osync_list_append(engine->sink_engines, sinkengine); } if (engine->archive && e... [truncated message content] |
