Menu
▾
▴
[Opensync-commits] r5410 - in trunk: . opensync/client opensync/plugin tests/engine-tests tests/mock-plugin tools wrapper
|
From: <svn...@op...> - 2009-03-28 22:22:35
|
Author: dgollub Date: Sat Mar 28 23:22:30 2009 New Revision: 5410 URL: http://www.opensync.org/changeset/5410 Log: Renamed osync_plugin_info_get_objtypes to osync_plugin_info_get_objtype_sinks. Thsi should avoid confusion between "objtype" which is often just const char* and between OSyncObjTypeSink. Modified: trunk/opensync.sym trunk/opensync/client/opensync_client.c trunk/opensync/plugin/opensync_plugin_info.c trunk/opensync/plugin/opensync_plugin_info.h trunk/opensync/plugin/opensync_plugin_info_private.h trunk/tests/engine-tests/check_engine_error.c trunk/tests/mock-plugin/mock_sync.c trunk/tools/osyncplugin.c trunk/wrapper/opensync-plugin.i Modified: trunk/opensync.sym ============================================================================== --- trunk/opensync.sym Sat Mar 28 22:57:04 2009 (r5409) +++ trunk/opensync.sym Sat Mar 28 23:22:30 2009 (r5410) @@ -558,7 +558,7 @@ osync_plugin_info_get_groupname osync_plugin_info_get_loop osync_plugin_info_get_main_sink -osync_plugin_info_get_objtypes +osync_plugin_info_get_objtype_sinks osync_plugin_info_get_version osync_plugin_info_new osync_plugin_info_ref Modified: trunk/opensync/client/opensync_client.c ============================================================================== --- trunk/opensync/client/opensync_client.c Sat Mar 28 22:57:04 2009 (r5409) +++ trunk/opensync/client/opensync_client.c Sat Mar 28 23:22:30 2009 (r5410) @@ -697,7 +697,7 @@ goto error; } - objtypesinks = osync_plugin_info_get_objtypes(client->plugin_info); + objtypesinks = osync_plugin_info_get_objtype_sinks(client->plugin_info); list = objtypesinks; while (list) { sink = (OSyncObjTypeSink*)list->data; @@ -847,7 +847,7 @@ else osync_message_write_int(reply, 0); - objtypesinks = osync_plugin_info_get_objtypes(client->plugin_info); + objtypesinks = osync_plugin_info_get_objtype_sinks(client->plugin_info); list = objtypesinks; while(list) { sink = (OSyncObjTypeSink*)list->data; Modified: trunk/opensync/plugin/opensync_plugin_info.c ============================================================================== --- trunk/opensync/plugin/opensync_plugin_info.c Sat Mar 28 22:57:04 2009 (r5409) +++ trunk/opensync/plugin/opensync_plugin_info.c Sat Mar 28 23:22:30 2009 (r5410) @@ -62,10 +62,10 @@ if (info->groupname) osync_free(info->groupname); - while (info->objtypes) { - OSyncObjTypeSink *sink = info->objtypes->data; + while (info->objtype_sinks) { + OSyncObjTypeSink *sink = info->objtype_sinks->data; osync_objtype_sink_unref(sink); - info->objtypes = osync_list_remove(info->objtypes, sink); + info->objtype_sinks = osync_list_remove(info->objtype_sinks, sink); } if (info->main_sink) @@ -149,7 +149,7 @@ osync_trace(TRACE_ENTRY, "%s(%p, %s)", __func__, info, name); osync_assert(info); - for (p = info->objtypes; p; p = p->next) { + for (p = info->objtype_sinks; p; p = p->next) { sink = p->data; if (g_ascii_strcasecmp(osync_objtype_sink_get_name(sink), name) == 0) goto done; @@ -167,13 +167,13 @@ void osync_plugin_info_add_objtype(OSyncPluginInfo *info, OSyncObjTypeSink *sink) { osync_assert(info); - info->objtypes = osync_list_append(info->objtypes, sink); + info->objtype_sinks = osync_list_append(info->objtype_sinks, sink); osync_objtype_sink_ref(sink); } -OSyncList *osync_plugin_info_get_objtypes(OSyncPluginInfo *info) { +OSyncList *osync_plugin_info_get_objtype_sinks(OSyncPluginInfo *info) { osync_assert(info); - return osync_list_copy(info->objtypes); + return osync_list_copy(info->objtype_sinks); } OSyncObjTypeSink *osync_plugin_info_get_main_sink(OSyncPluginInfo *info) Modified: trunk/opensync/plugin/opensync_plugin_info.h ============================================================================== --- trunk/opensync/plugin/opensync_plugin_info.h Sat Mar 28 22:57:04 2009 (r5409) +++ trunk/opensync/plugin/opensync_plugin_info.h Sat Mar 28 23:22:30 2009 (r5410) @@ -116,7 +116,7 @@ * @param Pointer to a OSyncPluginInfo * @return A shallow copy of the internal objtype list */ -OSYNC_EXPORT OSyncList *osync_plugin_info_get_objtypes(OSyncPluginInfo *info); +OSYNC_EXPORT OSyncList *osync_plugin_info_get_objtype_sinks(OSyncPluginInfo *info); /** @brief Returns the Main Sink * Modified: trunk/opensync/plugin/opensync_plugin_info_private.h ============================================================================== --- trunk/opensync/plugin/opensync_plugin_info_private.h Sat Mar 28 22:57:04 2009 (r5409) +++ trunk/opensync/plugin/opensync_plugin_info_private.h Sat Mar 28 23:22:30 2009 (r5410) @@ -34,7 +34,7 @@ struct OSyncPluginInfo { void *loop; OSyncPluginConfig *config; - OSyncList *objtypes; + OSyncList *objtype_sinks; char *configdir; /* The main sink */ Modified: trunk/tests/engine-tests/check_engine_error.c ============================================================================== --- trunk/tests/engine-tests/check_engine_error.c Sat Mar 28 22:57:04 2009 (r5409) +++ trunk/tests/engine-tests/check_engine_error.c Sat Mar 28 23:22:30 2009 (r5410) @@ -130,7 +130,7 @@ mock_env *env = osync_try_malloc0(sizeof(mock_env), error); osync_assert(env); - OSyncList *objtypesinks = osync_plugin_info_get_objtypes(info); + OSyncList *objtypesinks = osync_plugin_info_get_objtype_sinks(info); OSyncObjTypeSink *sink = (OSyncObjTypeSink*)objtypesinks->data; osync_assert(sink); Modified: trunk/tests/mock-plugin/mock_sync.c ============================================================================== --- trunk/tests/mock-plugin/mock_sync.c Sat Mar 28 22:57:04 2009 (r5409) +++ trunk/tests/mock-plugin/mock_sync.c Sat Mar 28 23:22:30 2009 (r5410) @@ -607,7 +607,7 @@ /* Now we register the objtypes that we can sync. This plugin is special. It can * synchronize any objtype we configure it to sync and where a conversion * path to the file format can be found */ - OSyncList *objtypesinks = osync_plugin_info_get_objtypes(info); + OSyncList *objtypesinks = osync_plugin_info_get_objtype_sinks(info); OSyncList *list = objtypesinks; while(list) { MockDir *dir = osync_try_malloc0(sizeof(MockDir), error); Modified: trunk/tools/osyncplugin.c ============================================================================== --- trunk/tools/osyncplugin.c Sat Mar 28 22:57:04 2009 (r5409) +++ trunk/tools/osyncplugin.c Sat Mar 28 23:22:30 2009 (r5410) @@ -452,7 +452,7 @@ osync_bool couldinit; couldinit = osync_plugin_initialize(plugin, &(plugin_data), plugin_info, error); - objtypesinks = osync_plugin_info_get_objtypes(plugin_info); + objtypesinks = osync_plugin_info_get_objtype_sinks(plugin_info); list = objtypesinks; while(list) { OSyncObjTypeSink *sink = (OSyncObjTypeSink*)list->data; @@ -619,7 +619,7 @@ } else { /* all available objtypes */ - objtypesinks = osync_plugin_info_get_objtypes(plugin_info); + objtypesinks = osync_plugin_info_get_objtype_sinks(plugin_info); list = objtypesinks; while(list) { sink = (OSyncObjTypeSink*)list->data; @@ -721,7 +721,7 @@ if (!connect_sink(cmd, sink, error)) goto error; } else { - objtypesinks = osync_plugin_info_get_objtypes(plugin_info); + objtypesinks = osync_plugin_info_get_objtype_sinks(plugin_info); list = objtypesinks; while(list) { sink = (OSyncObjTypeSink*)list->data; @@ -818,7 +818,7 @@ if (!disconnect_sink(cmd, sink, error)) goto error; } else { - objtypesinks = osync_plugin_info_get_objtypes(plugin_info); + objtypesinks = osync_plugin_info_get_objtype_sinks(plugin_info); list = objtypesinks; while(list) { sink = (OSyncObjTypeSink*)list->data; @@ -917,7 +917,7 @@ if (!commit_sink(cmd, sink, change, error)) goto error; } else { - objtypesinks = osync_plugin_info_get_objtypes(plugin_info); + objtypesinks = osync_plugin_info_get_objtype_sinks(plugin_info); list = objtypesinks; while(list){ sink = (OSyncObjTypeSink*)list->data; @@ -1037,7 +1037,7 @@ if (!syncdone_sink(cmd, sink, error)) goto error; } else { - objtypesinks = osync_plugin_info_get_objtypes(plugin_info); + objtypesinks = osync_plugin_info_get_objtype_sinks(plugin_info); list = objtypesinks; while(list) { sink = (OSyncObjTypeSink*)list->data; @@ -1127,7 +1127,7 @@ if (!committedall_sink(cmd, sink, error)) goto error; } else { - objtypesinks = osync_plugin_info_get_objtypes(plugin_info); + objtypesinks = osync_plugin_info_get_objtype_sinks(plugin_info); list = objtypesinks; while(list) { sink = (OSyncObjTypeSink*)list->data; Modified: trunk/wrapper/opensync-plugin.i ============================================================================== --- trunk/wrapper/opensync-plugin.i Sat Mar 28 22:57:04 2009 (r5409) +++ trunk/wrapper/opensync-plugin.i Sat Mar 28 23:22:30 2009 (r5410) @@ -193,8 +193,8 @@ osync_plugin_info_add_objtype(self, sink); } - unsigned int num_objtypes() { - OSyncList *objtypesinks = osync_plugin_info_get_objtypes(self); + unsigned int num_objtype_sinks() { + OSyncList *objtypesinks = osync_plugin_info_get_objtype_sinks(self); unsigned int num = osync_list_length(objtypesinks); osync_list_free(objtypesinks); return num; @@ -202,7 +202,7 @@ ObjTypeSink *nth_objtype(int nth) { /* TODO: return a list structure of phython */ - OSyncList *objtypesinks = osync_plugin_info_get_objtypes(self); + OSyncList *objtypesinks = osync_plugin_info_get_objtype_sinks(self); ObjTypeSink *ret = (ObjTypeSink*)osync_list_nth_data(objtypesinks, nth); if (ret) osync_objtype_sink_ref(ret); @@ -277,7 +277,7 @@ __oldinit = __init__ def __init__(self, *args): self.__oldinit(*args) - self.objtypes = _ListWrapper(self.num_objtypes, self.nth_objtype) + self.objtypes = _ListWrapper(self.num_objtype_sinks, self.nth_objtype) %} } |
