From: <svn...@op...> - 2009-03-28 19:50:15
|
Author: dgollub Date: Sat Mar 28 20:50:04 2009 New Revision: 5404 URL: http://www.opensync.org/changeset/5404 Log: Fix build of osynctool. Replaced opensync-merger.h include with opensync-capabilities.h Ported OSyncPluginEnv API use to latest list interface pattern cleanup refs #975 Modified: osynctool/trunk/tools/osynctool.c Modified: osynctool/trunk/tools/osynctool.c ============================================================================== --- osynctool/trunk/tools/osynctool.c Sat Mar 28 20:45:59 2009 (r5403) +++ osynctool/trunk/tools/osynctool.c Sat Mar 28 20:50:04 2009 (r5404) @@ -26,7 +26,7 @@ #include <opensync/opensync-plugin.h> #include <opensync/opensync-engine.h> #include <opensync/opensync-data.h> -#include <opensync/opensync-merger.h> +#include <opensync/opensync-capabilities.h> #include <stdio.h> @@ -177,15 +177,19 @@ { int i; OSyncPlugin *plugin; + OSyncList *plugins, *p; osync_trace(TRACE_ENTRY, "%s(%p)", __func__, env); printf("Available plugins:\n"); - for (i = 0; i < osync_plugin_env_num_plugins(env); i++) { - plugin = osync_plugin_env_nth_plugin(env, i); + plugins = osync_plugin_env_get_plugins(env); + for (p = plugins; p; p = p->next) { + plugin = (OSyncPlugin *) p->data; printf("%s\n", osync_plugin_get_name(plugin)); } + osync_list_free(plugins); + osync_trace(TRACE_EXIT, "%s", __func__); } |