Changeset 3305
- Timestamp:
- 05/03/08 02:06:29 (3 months ago)
- Files:
-
- trunk/opensync/engine/opensync_obj_engine.c (modified) (1 diff)
- trunk/opensync/helper/opensync_hashtable.c (modified) (1 diff)
- trunk/opensync/ipc/opensync_queue.c (modified) (1 diff)
- trunk/tests/mock-plugin/mock_sync.c (modified) (1 diff)
- trunk/tools/osyncplugin.c (modified) (5 diffs)
- trunk/wrapper/opensync-helper.i (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/opensync/engine/opensync_obj_engine.c
r3212 r3305 1111 1111 case OSYNC_ENGINE_COMMAND_SOLVE: 1112 1112 case OSYNC_ENGINE_COMMAND_DISCOVER: 1113 case OSYNC_ENGINE_COMMAND_ABORT: 1113 1114 break; 1114 1115 } trunk/opensync/helper/opensync_hashtable.c
r3290 r3305 412 412 osync_assert(table); 413 413 osync_assert(table->dbhandle); 414 415 osync_bool ret = FALSE;416 414 417 415 /* Reset persistent hashtable in database */ trunk/opensync/ipc/opensync_queue.c
r3208 r3305 710 710 { 711 711 osync_trace(TRACE_ENTRY, "%s(%p)", __func__, queue); 712 OSyncMessage *message = NULL;713 712 OSyncPendingMessage *pending = NULL; 714 713 trunk/tests/mock-plugin/mock_sync.c
r3295 r3305 444 444 OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); 445 445 OSyncFileDir *dir = osync_objtype_sink_get_userdata(sink); 446 int i = 0;447 446 OSyncError *error = NULL; 448 447 trunk/tools/osyncplugin.c
r3283 r3305 277 277 char *config; 278 278 unsigned int size; 279 void *plugin_data;280 281 279 if (!(plugin_env = osync_plugin_env_new(error))) 282 280 goto error; … … 321 319 return TRUE; 322 320 321 /* 323 322 error_free_loop: 324 323 g_main_context_unref(ctx); 324 */ 325 325 error_free_plugininfo: 326 326 osync_plugin_info_unref(plugin_info); … … 381 381 382 382 switch (osync_change_get_changetype(change)) { 383 case OSYNC_CHANGE_TYPE_UNKNOWN:384 type = "UNKNOWN";385 break;386 383 case OSYNC_CHANGE_TYPE_ADDED: 387 384 type = "ADDED"; … … 395 392 case OSYNC_CHANGE_TYPE_MODIFIED: 396 393 type = "MODIFIED"; 394 break; 395 case OSYNC_CHANGE_TYPE_UNKNOWN: 396 default: 397 type = "UNKNOWN"; 397 398 break; 398 399 } … … 758 759 for (i=0, c = changesList; c; c = c->next, i++) { 759 760 OSyncChange *change = c->data; 760 OSyncData *data = osync_change_get_data(change);761 761 osync_change_set_changetype(change, OSYNC_CHANGE_TYPE_DELETED); 762 762 trunk/wrapper/opensync-helper.i
r3296 r3305 77 77 PyObject *ret = PyList_New(0); 78 78 if (ret != NULL) { 79 int i;80 79 OSyncList *u; 81 80 for (u = uids; u; u = u->next) {
