Menu
▾
▴
[Opensync-commits] r5287 - in trunk: opensync/capabilities opensync/client opensync/engine opensync/format opensync/group opensync/mapping opensync/plugin opensync/xmlformat tests
Author: bricks Date: Tue Mar 10 12:18:28 2009 New Revision: 5287 URL: http://www.opensync.org/changeset/5287 Log: interface cleanup for osync_..._nth_... and osync_..._num_... functions now all these functions use unsigned int instead of int see ticket #973 Modified: trunk/opensync/capabilities/opensync_capability.c trunk/opensync/capabilities/opensync_capability.h trunk/opensync/client/opensync_client_proxy.c trunk/opensync/client/opensync_client_proxy_internals.h trunk/opensync/engine/opensync_engine.c trunk/opensync/engine/opensync_mapping_engine.c trunk/opensync/engine/opensync_mapping_engine.h trunk/opensync/engine/opensync_obj_engine.c trunk/opensync/format/opensync_format_env.c trunk/opensync/format/opensync_format_env.h trunk/opensync/format/opensync_format_env_internals.h trunk/opensync/group/opensync_group.c trunk/opensync/group/opensync_group.h trunk/opensync/group/opensync_group_internals.h trunk/opensync/group/opensync_updater.c trunk/opensync/group/opensync_updater_private.h trunk/opensync/mapping/opensync_mapping.c trunk/opensync/mapping/opensync_mapping.h trunk/opensync/mapping/opensync_mapping_table.c trunk/opensync/mapping/opensync_mapping_table.h trunk/opensync/plugin/opensync_plugin_env.c trunk/opensync/plugin/opensync_plugin_env.h trunk/opensync/xmlformat/opensync_xmlfield.c trunk/opensync/xmlformat/opensync_xmlfield.h trunk/tests/support.c trunk/tests/support.h Modified: trunk/opensync/capabilities/opensync_capability.c ============================================================================== --- trunk/opensync/capabilities/opensync_capability.c Tue Mar 10 11:21:54 2009 (r5286) +++ trunk/opensync/capabilities/opensync_capability.c Tue Mar 10 12:18:28 2009 (r5287) @@ -228,9 +228,9 @@ return FALSE; } -int osync_capability_get_key_count(OSyncCapability *capability) +unsigned int osync_capability_get_key_count(OSyncCapability *capability) { - int count; + unsigned int count; xmlNodePtr child = NULL; osync_assert(capability); @@ -243,9 +243,9 @@ return count; } -const char *osync_capability_get_nth_key(OSyncCapability *capability, int nth) +const char *osync_capability_get_nth_key(OSyncCapability *capability, unsigned int nth) { - int count = 0; + unsigned int count = 0; xmlNodePtr child = NULL; osync_assert(capability); Modified: trunk/opensync/capabilities/opensync_capability.h ============================================================================== --- trunk/opensync/capabilities/opensync_capability.h Tue Mar 10 11:21:54 2009 (r5286) +++ trunk/opensync/capabilities/opensync_capability.h Tue Mar 10 12:18:28 2009 (r5287) @@ -90,7 +90,7 @@ * @param capability The pointer to a capability object * @return The count of keys of the capability */ -OSYNC_EXPORT int osync_capability_get_key_count(OSyncCapability *capability); +OSYNC_EXPORT unsigned int osync_capability_get_key_count(OSyncCapability *capability); /** * @brief Get the name of the nth key of a capability @@ -98,7 +98,7 @@ * @param nth The number of the key * @return The name of the nth key of the capability or NULL in case of error */ -OSYNC_EXPORT const char *osync_capability_get_nth_key(OSyncCapability *capability, int nth); +OSYNC_EXPORT const char *osync_capability_get_nth_key(OSyncCapability *capability, unsigned int nth); /** * @brief Add a key to a capability Modified: trunk/opensync/client/opensync_client_proxy.c ============================================================================== --- trunk/opensync/client/opensync_client_proxy.c Tue Mar 10 11:21:54 2009 (r5286) +++ trunk/opensync/client/opensync_client_proxy.c Tue Mar 10 12:18:28 2009 (r5287) @@ -1330,13 +1330,13 @@ proxy->timeout.discover = timeout; } -int osync_client_proxy_num_objtypes(OSyncClientProxy *proxy) +unsigned int osync_client_proxy_num_objtypes(OSyncClientProxy *proxy) { osync_assert(proxy); return g_list_length(proxy->objtypes); } -OSyncObjTypeSink *osync_client_proxy_nth_objtype(OSyncClientProxy *proxy, int nth) +OSyncObjTypeSink *osync_client_proxy_nth_objtype(OSyncClientProxy *proxy, unsigned int nth) { osync_assert(proxy); return g_list_nth_data(proxy->objtypes, nth); Modified: trunk/opensync/client/opensync_client_proxy_internals.h ============================================================================== --- trunk/opensync/client/opensync_client_proxy_internals.h Tue Mar 10 11:21:54 2009 (r5286) +++ trunk/opensync/client/opensync_client_proxy_internals.h Tue Mar 10 12:18:28 2009 (r5287) @@ -59,8 +59,8 @@ void osync_client_proxy_set_discover_timeout(OSyncClientProxy *proxy, unsigned int timeout); unsigned int osync_client_proxy_get_discover_timeout(OSyncClientProxy *proxy); -OSYNC_TEST_EXPORT int osync_client_proxy_num_objtypes(OSyncClientProxy *proxy); -OSYNC_TEST_EXPORT OSyncObjTypeSink *osync_client_proxy_nth_objtype(OSyncClientProxy *proxy, int nth); +OSYNC_TEST_EXPORT unsigned int osync_client_proxy_num_objtypes(OSyncClientProxy *proxy); +OSYNC_TEST_EXPORT OSyncObjTypeSink *osync_client_proxy_nth_objtype(OSyncClientProxy *proxy, unsigned int nth); OSyncObjTypeSink *osync_client_proxy_find_objtype_sink(OSyncClientProxy *proxy, const char *objtype); OSYNC_TEST_EXPORT osync_bool osync_client_proxy_connect(OSyncClientProxy *proxy, connect_cb callback, void *userdata, const char *objtype, osync_bool slowsync, OSyncError **error); Modified: trunk/opensync/engine/opensync_engine.c ============================================================================== --- trunk/opensync/engine/opensync_engine.c Tue Mar 10 11:21:54 2009 (r5286) +++ trunk/opensync/engine/opensync_engine.c Tue Mar 10 12:18:28 2009 (r5287) @@ -1585,7 +1585,7 @@ osync_bool prev_sync_unclean = FALSE, first_sync = FALSE; OSyncGroup *group = NULL; OSyncList *o, *supported_objtypes; - int i; + unsigned int i; osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, engine, error); if (engine->state != OSYNC_ENGINE_STATE_UNINITIALIZED) { Modified: trunk/opensync/engine/opensync_mapping_engine.c ============================================================================== --- trunk/opensync/engine/opensync_mapping_engine.c Tue Mar 10 11:21:54 2009 (r5286) +++ trunk/opensync/engine/opensync_mapping_engine.c Tue Mar 10 12:18:28 2009 (r5287) @@ -161,7 +161,7 @@ OSyncMappingEntryEngine *latest_entry = NULL; OSyncChange *latest_change = NULL; time_t latest = 0; - int i; + unsigned int i; osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, engine, error); osync_trace(TRACE_INTERNAL, "mapping number: %i", osync_mapping_engine_num_changes(engine)); @@ -530,9 +530,9 @@ -int osync_mapping_engine_num_changes(OSyncMappingEngine *engine) +unsigned int osync_mapping_engine_num_changes(OSyncMappingEngine *engine) { - int num = 0; + unsigned int num = 0; OSyncList *e = NULL; osync_assert(engine); for (e = engine->entries; e; e = e->next) { @@ -544,9 +544,9 @@ return num; } -OSyncChange *osync_mapping_engine_nth_change(OSyncMappingEngine *engine, int nth) +OSyncChange *osync_mapping_engine_nth_change(OSyncMappingEngine *engine, unsigned int nth) { - int num = 0; + unsigned int num = 0; OSyncList *e = NULL; osync_assert(engine); for (e = engine->entries; e; e = e->next) { Modified: trunk/opensync/engine/opensync_mapping_engine.h ============================================================================== --- trunk/opensync/engine/opensync_mapping_engine.h Tue Mar 10 11:21:54 2009 (r5286) +++ trunk/opensync/engine/opensync_mapping_engine.h Tue Mar 10 12:18:28 2009 (r5287) @@ -22,7 +22,7 @@ #ifndef OPENSYNC_MAPPING_ENGINE_H_ #define OPENSYNC_MAPPING_ENGINE_H_ -OSYNC_EXPORT int osync_mapping_engine_num_changes(OSyncMappingEngine *engine); +OSYNC_EXPORT unsigned int osync_mapping_engine_num_changes(OSyncMappingEngine *engine); /** @brief Search for the nth entry in the mapping * @@ -30,7 +30,7 @@ * @param nth The value of the position * @returns The pointer to the nth change. NULL if there isn't enough entries in the mapping. */ -OSYNC_EXPORT OSyncChange *osync_mapping_engine_nth_change(OSyncMappingEngine *engine, int nth); +OSYNC_EXPORT OSyncChange *osync_mapping_engine_nth_change(OSyncMappingEngine *engine, unsigned int nth); /** @brief Search in the mapping for the change of the member. * Modified: trunk/opensync/engine/opensync_obj_engine.c ============================================================================== --- trunk/opensync/engine/opensync_obj_engine.c Tue Mar 10 11:21:54 2009 (r5286) +++ trunk/opensync/engine/opensync_obj_engine.c Tue Mar 10 12:18:28 2009 (r5287) @@ -596,7 +596,7 @@ static osync_bool _create_mapping_engines(OSyncObjEngine *engine, OSyncError **error) { - int i = 0; + unsigned int i = 0; osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, engine, error); for (i = 0; i < osync_mapping_table_num_mappings(engine->mapping_table); i++) { Modified: trunk/opensync/format/opensync_format_env.c ============================================================================== --- trunk/opensync/format/opensync_format_env.c Tue Mar 10 11:21:54 2009 (r5286) +++ trunk/opensync/format/opensync_format_env.c Tue Mar 10 12:18:28 2009 (r5287) @@ -835,13 +835,13 @@ return NULL; } -int osync_format_env_num_objformats(OSyncFormatEnv *env) +unsigned int osync_format_env_num_objformats(OSyncFormatEnv *env) { osync_assert(env); return osync_list_length(env->objformats); } -OSyncObjFormat *osync_format_env_nth_objformat(OSyncFormatEnv *env, int nth) +OSyncObjFormat *osync_format_env_nth_objformat(OSyncFormatEnv *env, unsigned int nth) { osync_assert(env); return osync_list_nth_data(env->objformats, nth); @@ -933,13 +933,13 @@ osync_custom_filter_ref(filter); } -int osync_format_env_num_filters(OSyncFormatEnv *env) +unsigned int osync_format_env_num_filters(OSyncFormatEnv *env) { osync_assert(env); return osync_list_length(env->custom_filters); } -OSyncCustomFilter *osync_format_env_nth_filter(OSyncFormatEnv *env, int nth) +OSyncCustomFilter *osync_format_env_nth_filter(OSyncFormatEnv *env, unsigned int nth) { osync_assert(env); return osync_list_nth_data(env->custom_filters, nth); Modified: trunk/opensync/format/opensync_format_env.h ============================================================================== --- trunk/opensync/format/opensync_format_env.h Tue Mar 10 11:21:54 2009 (r5286) +++ trunk/opensync/format/opensync_format_env.h Tue Mar 10 12:18:28 2009 (r5287) @@ -108,7 +108,7 @@ * @returns The number of object formats * */ -OSYNC_EXPORT int osync_format_env_num_objformats(OSyncFormatEnv *env); +OSYNC_EXPORT unsigned int osync_format_env_num_objformats(OSyncFormatEnv *env); /** @brief Gets the nth object format * @@ -117,7 +117,7 @@ * @returns The object format * */ -OSYNC_EXPORT OSyncObjFormat *osync_format_env_nth_objformat(OSyncFormatEnv *env, int nth); +OSYNC_EXPORT OSyncObjFormat *osync_format_env_nth_objformat(OSyncFormatEnv *env, unsigned int nth); /** @brief Registers Format Converter or Detector to Format Environment * Modified: trunk/opensync/format/opensync_format_env_internals.h ============================================================================== --- trunk/opensync/format/opensync_format_env_internals.h Tue Mar 10 11:21:54 2009 (r5286) +++ trunk/opensync/format/opensync_format_env_internals.h Tue Mar 10 12:18:28 2009 (r5287) @@ -98,7 +98,7 @@ * @returns The number of filters * */ -OSYNC_TEST_EXPORT int osync_format_env_num_filters(OSyncFormatEnv *env); +OSYNC_TEST_EXPORT unsigned int osync_format_env_num_filters(OSyncFormatEnv *env); /** @brief Gets the nth filter * @@ -107,7 +107,7 @@ * @returns The filter * */ -OSYNC_TEST_EXPORT OSyncCustomFilter *osync_format_env_nth_filter(OSyncFormatEnv *env, int nth); +OSYNC_TEST_EXPORT OSyncCustomFilter *osync_format_env_nth_filter(OSyncFormatEnv *env, unsigned int nth); /** @brief Initialize all object formats of the format environment Modified: trunk/opensync/group/opensync_group.c ============================================================================== --- trunk/opensync/group/opensync_group.c Tue Mar 10 11:21:54 2009 (r5286) +++ trunk/opensync/group/opensync_group.c Tue Mar 10 12:18:28 2009 (r5287) @@ -458,7 +458,7 @@ osync_bool osync_group_save(OSyncGroup *group, OSyncError **error) { char *filename = NULL; - int i; + unsigned int i; xmlDocPtr doc; char *tmstr = NULL; char *version_str = NULL; @@ -798,13 +798,13 @@ return NULL; } -OSyncMember *osync_group_nth_member(OSyncGroup *group, int nth) +OSyncMember *osync_group_nth_member(OSyncGroup *group, unsigned int nth) { osync_assert(group); return (OSyncMember *)g_list_nth_data(group->members, nth); } -int osync_group_num_members(OSyncGroup *group) +unsigned int osync_group_num_members(OSyncGroup *group) { osync_assert(group); return g_list_length(group->members); @@ -824,10 +824,10 @@ group->configdir = osync_strdup(directory); } -int osync_group_num_objtypes(OSyncGroup *group) +unsigned int osync_group_num_objtypes(OSyncGroup *group) { GList *objs = NULL; - int len = 0; + unsigned int len = 0; osync_assert(group); objs = osync_group_get_supported_objtypes(group); len = g_list_length(objs); @@ -835,7 +835,7 @@ return len; } -const char *osync_group_nth_objtype(OSyncGroup *group, int nth) +const char *osync_group_nth_objtype(OSyncGroup *group, unsigned int nth) { GList *objs = NULL; const char *objtype = NULL; @@ -916,13 +916,13 @@ osync_filter_unref(filter); } -int osync_group_num_filters(OSyncGroup *group) +unsigned int osync_group_num_filters(OSyncGroup *group) { osync_assert(group); return g_list_length(group->filters); } -OSyncFilter *osync_group_nth_filter(OSyncGroup *group, int nth) +OSyncFilter *osync_group_nth_filter(OSyncGroup *group, unsigned int nth) { osync_assert(group); return g_list_nth_data(group->filters, nth); Modified: trunk/opensync/group/opensync_group.h ============================================================================== --- trunk/opensync/group/opensync_group.h Tue Mar 10 11:21:54 2009 (r5286) +++ trunk/opensync/group/opensync_group.h Tue Mar 10 12:18:28 2009 (r5287) @@ -203,7 +203,7 @@ * @returns Pointer to the member * */ -OSYNC_EXPORT OSyncMember *osync_group_nth_member(OSyncGroup *group, int nth); +OSYNC_EXPORT OSyncMember *osync_group_nth_member(OSyncGroup *group, unsigned int nth); /** @brief Counts the members of the group * @@ -213,7 +213,7 @@ * @returns Number of members * */ -OSYNC_EXPORT int osync_group_num_members(OSyncGroup *group); +OSYNC_EXPORT unsigned int osync_group_num_members(OSyncGroup *group); /** @brief Returns the configdir for the group @@ -242,7 +242,7 @@ * @returns Number of object types of the group * */ -OSYNC_EXPORT int osync_group_num_objtypes(OSyncGroup *group); +OSYNC_EXPORT unsigned int osync_group_num_objtypes(OSyncGroup *group); /** @brief Gets the nth object type of the group * @@ -251,7 +251,7 @@ * @returns Name of the nth object type of the group * */ -OSYNC_EXPORT const char *osync_group_nth_objtype(OSyncGroup *group, int nth); +OSYNC_EXPORT const char *osync_group_nth_objtype(OSyncGroup *group, unsigned int nth); /** @brief Change the status of an object type in the group. * Modified: trunk/opensync/group/opensync_group_internals.h ============================================================================== --- trunk/opensync/group/opensync_group_internals.h Tue Mar 10 11:21:54 2009 (r5286) +++ trunk/opensync/group/opensync_group_internals.h Tue Mar 10 12:18:28 2009 (r5287) @@ -95,7 +95,7 @@ * @returns The number of filters * */ -OSYNC_TEST_EXPORT int osync_group_num_filters(OSyncGroup *group); +OSYNC_TEST_EXPORT unsigned int osync_group_num_filters(OSyncGroup *group); /** @brief Gets the nth filter of a group * @@ -107,7 +107,7 @@ * @returns The filter or NULL if not found * */ -OSYNC_TEST_EXPORT OSyncFilter *osync_group_nth_filter(OSyncGroup *group, int nth); +OSYNC_TEST_EXPORT OSyncFilter *osync_group_nth_filter(OSyncGroup *group, unsigned int nth); /** @brief Gets list of all supported object types in this group, including * mixed object types Modified: trunk/opensync/group/opensync_updater.c ============================================================================== --- trunk/opensync/group/opensync_updater.c Tue Mar 10 11:21:54 2009 (r5286) +++ trunk/opensync/group/opensync_updater.c Tue Mar 10 12:18:28 2009 (r5287) @@ -265,7 +265,7 @@ return FALSE; } -static osync_bool osync_updater_process_member(OSyncUpdater *updater, int nthmember, OSyncError **error) +static osync_bool osync_updater_process_member(OSyncUpdater *updater, unsigned int nthmember, OSyncError **error) { OSyncMember *member = NULL; osync_assert(updater); Modified: trunk/opensync/group/opensync_updater_private.h ============================================================================== --- trunk/opensync/group/opensync_updater_private.h Tue Mar 10 11:21:54 2009 (r5286) +++ trunk/opensync/group/opensync_updater_private.h Tue Mar 10 12:18:28 2009 (r5287) @@ -123,7 +123,7 @@ * @param error Pointer to OSyncError which get stacked * @returns TRUE on success, FALSE on error. */ -static osync_bool osync_updater_process_member(OSyncUpdater *updater, int nthmember, OSyncError **error); +static osync_bool osync_updater_process_member(OSyncUpdater *updater, unsigned int nthmember, OSyncError **error); /** @brief Process update on group configuration. * Modified: trunk/opensync/mapping/opensync_mapping.c ============================================================================== --- trunk/opensync/mapping/opensync_mapping.c Tue Mar 10 11:21:54 2009 (r5286) +++ trunk/opensync/mapping/opensync_mapping.c Tue Mar 10 12:18:28 2009 (r5287) @@ -120,13 +120,13 @@ return NULL; } -int osync_mapping_num_entries(OSyncMapping *mapping) +unsigned int osync_mapping_num_entries(OSyncMapping *mapping) { osync_assert(mapping); return osync_list_length(mapping->entries); } -OSyncMappingEntry *osync_mapping_nth_entry(OSyncMapping *mapping, int nth) +OSyncMappingEntry *osync_mapping_nth_entry(OSyncMapping *mapping, unsigned int nth) { osync_assert(mapping); return osync_list_nth_data(mapping->entries, nth); Modified: trunk/opensync/mapping/opensync_mapping.h ============================================================================== --- trunk/opensync/mapping/opensync_mapping.h Tue Mar 10 11:21:54 2009 (r5286) +++ trunk/opensync/mapping/opensync_mapping.h Tue Mar 10 12:18:28 2009 (r5287) @@ -77,7 +77,7 @@ * @param mapping Pointer to a mapping object * @returns the number of entries in the mapping */ -OSYNC_EXPORT int osync_mapping_num_entries(OSyncMapping *mapping); +OSYNC_EXPORT unsigned int osync_mapping_num_entries(OSyncMapping *mapping); /** * @brief Get the nth entry in a mapping @@ -85,7 +85,7 @@ * @param nth the index of the entry to get * @returns the nth entry in the mapping or NULL in case of error */ -OSYNC_EXPORT OSyncMappingEntry *osync_mapping_nth_entry(OSyncMapping *mapping, int nth); +OSYNC_EXPORT OSyncMappingEntry *osync_mapping_nth_entry(OSyncMapping *mapping, unsigned int nth); /** Modified: trunk/opensync/mapping/opensync_mapping_table.c ============================================================================== --- trunk/opensync/mapping/opensync_mapping_table.c Tue Mar 10 11:21:54 2009 (r5286) +++ trunk/opensync/mapping/opensync_mapping_table.c Tue Mar 10 12:18:28 2009 (r5287) @@ -204,13 +204,13 @@ osync_mapping_unref(mapping); } -int osync_mapping_table_num_mappings(OSyncMappingTable *table) +unsigned int osync_mapping_table_num_mappings(OSyncMappingTable *table) { osync_assert(table); return osync_list_length(table->mappings); } -OSyncMapping *osync_mapping_table_nth_mapping(OSyncMappingTable *table, int nth) +OSyncMapping *osync_mapping_table_nth_mapping(OSyncMappingTable *table, unsigned int nth) { osync_assert(table); return osync_list_nth_data(table->mappings, nth); Modified: trunk/opensync/mapping/opensync_mapping_table.h ============================================================================== --- trunk/opensync/mapping/opensync_mapping_table.h Tue Mar 10 11:21:54 2009 (r5286) +++ trunk/opensync/mapping/opensync_mapping_table.h Tue Mar 10 12:18:28 2009 (r5287) @@ -114,7 +114,7 @@ * @param table The mapping table object * @return Number of mappings */ -OSYNC_EXPORT int osync_mapping_table_num_mappings(OSyncMappingTable *table); +OSYNC_EXPORT unsigned int osync_mapping_table_num_mappings(OSyncMappingTable *table); /** * @brief Get nth mapping object from mapping table @@ -123,7 +123,7 @@ * @param nth The position of the mapping object * @return The nth mapping object from mapping table or NULL if nth position isn't available */ -OSYNC_EXPORT OSyncMapping *osync_mapping_table_nth_mapping(OSyncMappingTable *table, int nth); +OSYNC_EXPORT OSyncMapping *osync_mapping_table_nth_mapping(OSyncMappingTable *table, unsigned int nth); /** Modified: trunk/opensync/plugin/opensync_plugin_env.c ============================================================================== --- trunk/opensync/plugin/opensync_plugin_env.c Tue Mar 10 11:21:54 2009 (r5286) +++ trunk/opensync/plugin/opensync_plugin_env.c Tue Mar 10 12:18:28 2009 (r5287) @@ -209,12 +209,12 @@ return NULL; } -int osync_plugin_env_num_plugins(OSyncPluginEnv *env) +unsigned int osync_plugin_env_num_plugins(OSyncPluginEnv *env) { return osync_list_length(env->plugins); } -OSyncPlugin *osync_plugin_env_nth_plugin(OSyncPluginEnv *env, int nth) +OSyncPlugin *osync_plugin_env_nth_plugin(OSyncPluginEnv *env, unsigned int nth) { return (OSyncPlugin *)osync_list_nth_data(env->plugins, nth); } Modified: trunk/opensync/plugin/opensync_plugin_env.h ============================================================================== --- trunk/opensync/plugin/opensync_plugin_env.h Tue Mar 10 11:21:54 2009 (r5286) +++ trunk/opensync/plugin/opensync_plugin_env.h Tue Mar 10 12:18:28 2009 (r5287) @@ -109,7 +109,7 @@ * @returns Number of plugins * */ -OSYNC_EXPORT int osync_plugin_env_num_plugins(OSyncPluginEnv *env); +OSYNC_EXPORT unsigned int osync_plugin_env_num_plugins(OSyncPluginEnv *env); /** @brief Returns pointer to nth plugin * @@ -120,7 +120,7 @@ * @returns Pointer to plugin * */ -OSYNC_EXPORT OSyncPlugin *osync_plugin_env_nth_plugin(OSyncPluginEnv *env, int nth); +OSYNC_EXPORT OSyncPlugin *osync_plugin_env_nth_plugin(OSyncPluginEnv *env, unsigned int nth); /*@}*/ Modified: trunk/opensync/xmlformat/opensync_xmlfield.c ============================================================================== --- trunk/opensync/xmlformat/opensync_xmlfield.c Tue Mar 10 11:21:54 2009 (r5286) +++ trunk/opensync/xmlformat/opensync_xmlfield.c Tue Mar 10 12:18:28 2009 (r5287) @@ -327,9 +327,9 @@ xmlSetProp(xmlfield->node, BAD_CAST attr, BAD_CAST value); } -int osync_xmlfield_get_attr_count(OSyncXMLField *xmlfield) +unsigned int osync_xmlfield_get_attr_count(OSyncXMLField *xmlfield) { - int count; + unsigned int count; xmlAttrPtr attr = NULL; osync_assert(xmlfield); @@ -341,9 +341,9 @@ return count; } -const char *osync_xmlfield_get_nth_attr_name(OSyncXMLField *xmlfield, int nth) +const char *osync_xmlfield_get_nth_attr_name(OSyncXMLField *xmlfield, unsigned int nth) { - int count; + unsigned int count; xmlAttrPtr attr = NULL; osync_assert(xmlfield); @@ -358,9 +358,9 @@ return NULL; } -const char *osync_xmlfield_get_nth_attr_value(OSyncXMLField *xmlfield, int nth) +const char *osync_xmlfield_get_nth_attr_value(OSyncXMLField *xmlfield, unsigned int nth) { - int count; + unsigned int count; xmlAttrPtr attr = NULL; osync_assert(xmlfield); @@ -436,9 +436,9 @@ xmlfield->sorted = FALSE; } -int osync_xmlfield_get_key_count(OSyncXMLField *xmlfield) +unsigned int osync_xmlfield_get_key_count(OSyncXMLField *xmlfield) { - int count; + unsigned int count; xmlNodePtr child = NULL; osync_assert(xmlfield); @@ -451,9 +451,9 @@ return count; } -const char *osync_xmlfield_get_nth_key_name(OSyncXMLField *xmlfield, int nth) +const char *osync_xmlfield_get_nth_key_name(OSyncXMLField *xmlfield, unsigned int nth) { - int count; + unsigned int count; xmlNodePtr child = NULL; osync_assert(xmlfield); @@ -468,9 +468,9 @@ return NULL; } -const char *osync_xmlfield_get_nth_key_value(OSyncXMLField *xmlfield, int nth) +const char *osync_xmlfield_get_nth_key_value(OSyncXMLField *xmlfield, unsigned int nth) { - int count; + unsigned int count; xmlNodePtr child = NULL; osync_assert(xmlfield); @@ -487,9 +487,9 @@ return NULL; } -void osync_xmlfield_set_nth_key_value(OSyncXMLField *xmlfield, int nth, const char *value) +void osync_xmlfield_set_nth_key_value(OSyncXMLField *xmlfield, unsigned int nth, const char *value) { - int count; + unsigned int count; xmlNodePtr cur = NULL; osync_assert(xmlfield); Modified: trunk/opensync/xmlformat/opensync_xmlfield.h ============================================================================== --- trunk/opensync/xmlformat/opensync_xmlfield.h Tue Mar 10 11:21:54 2009 (r5286) +++ trunk/opensync/xmlformat/opensync_xmlfield.h Tue Mar 10 12:18:28 2009 (r5287) @@ -131,7 +131,7 @@ * @param xmlfield Pointer to the xmlfield object * @return The count of attributes in the xmlfield */ -OSYNC_EXPORT int osync_xmlfield_get_attr_count(OSyncXMLField *xmlfield); +OSYNC_EXPORT unsigned int osync_xmlfield_get_attr_count(OSyncXMLField *xmlfield); /** * @brief Get the name of the nth attribute of a xmlfield @@ -139,7 +139,7 @@ * @param nth The index of the attribute * @return The name of the nth attribute of the xmlfield or NULL in case of error */ -OSYNC_EXPORT const char *osync_xmlfield_get_nth_attr_name(OSyncXMLField *xmlfield, int nth); +OSYNC_EXPORT const char *osync_xmlfield_get_nth_attr_name(OSyncXMLField *xmlfield, unsigned int nth); /** * @brief Get the value of the nth attribute of a xmlfield @@ -147,7 +147,7 @@ * @param nth The index of the attribute * @return The value of the nth attribute of the xmlfield or NULL in case of error */ -OSYNC_EXPORT const char *osync_xmlfield_get_nth_attr_value(OSyncXMLField *xmlfield, int nth); +OSYNC_EXPORT const char *osync_xmlfield_get_nth_attr_value(OSyncXMLField *xmlfield, unsigned int nth); /** * @brief Get the value of a key/value pair of a xmlfield @@ -178,7 +178,7 @@ * @param xmlfield Pointer to the xmlfield object * @return The count of keys in the xmlfield */ -OSYNC_EXPORT int osync_xmlfield_get_key_count(OSyncXMLField *xmlfield); +OSYNC_EXPORT unsigned int osync_xmlfield_get_key_count(OSyncXMLField *xmlfield); /** * @brief Get the name of the nth key of a xmlfield @@ -186,7 +186,7 @@ * @param nth The index of the key * @return The name of the nth key of the xmlfield or NULL in case of error */ -OSYNC_EXPORT const char *osync_xmlfield_get_nth_key_name(OSyncXMLField *xmlfield, int nth); +OSYNC_EXPORT const char *osync_xmlfield_get_nth_key_name(OSyncXMLField *xmlfield, unsigned int nth); /** * @brief Get the value of the nth key of a xmlfield @@ -194,7 +194,7 @@ * @param nth The index of the key * @return The value of the nth key of the xmlfield or NULL in case of error */ -OSYNC_EXPORT const char *osync_xmlfield_get_nth_key_value(OSyncXMLField *xmlfield, int nth); +OSYNC_EXPORT const char *osync_xmlfield_get_nth_key_value(OSyncXMLField *xmlfield, unsigned int nth); /** * @brief Set the value of the nth key of a xmlfield @@ -203,7 +203,7 @@ * @param value The value of the key/value pair * @return The value of the nth key of the xmlfield or NULL in case of error */ -OSYNC_EXPORT void osync_xmlfield_set_nth_key_value(OSyncXMLField *xmlfield, int nth, const char *value); +OSYNC_EXPORT void osync_xmlfield_set_nth_key_value(OSyncXMLField *xmlfield, unsigned int nth, const char *value); /** * @brief Sort all key nodes of an xmlfield. This function needs to be called Modified: trunk/tests/support.c ============================================================================== --- trunk/tests/support.c Tue Mar 10 11:21:54 2009 (r5286) +++ trunk/tests/support.c Tue Mar 10 12:18:28 2009 (r5287) @@ -214,7 +214,7 @@ tcase_add_test(tc_new, function); } -OSyncMappingTable *mappingtable_load(const char *path, const char *objtype, int num_mappings) +OSyncMappingTable *mappingtable_load(const char *path, const char *objtype, unsigned int num_mappings) { OSyncError *error = NULL; OSyncMappingTable *table = NULL; @@ -241,16 +241,16 @@ return table; } -void check_mapping(OSyncMappingTable *maptable, int memberid, int mappingid, int numentries, const char *uid) +void check_mapping(OSyncMappingTable *maptable, int memberid, int mappingid, unsigned int numentries, const char *uid) { - int i = 0; + unsigned int i = 0; osync_trace(TRACE_ENTRY, "%s(%p, %i, %i, %i, %s)", __func__, maptable, memberid, mappingid, numentries, uid); for (i = 0; i < osync_mapping_table_num_mappings(maptable); i++) { OSyncMapping *mapping = osync_mapping_table_nth_mapping(maptable, i); OSyncMappingEntry *testentry = osync_mapping_find_entry_by_member_id(mapping, memberid); if ((mappingid != -1 && osync_mapping_get_id(mapping) == mappingid) || (mappingid == -1 && !strcmp(osync_mapping_entry_get_uid(testentry), uid))) { - int n = 0; + unsigned int n = 0; fail_unless(osync_mapping_num_entries(mapping) == numentries); for (n = 0; n < osync_mapping_num_entries(mapping); n++) { OSyncMappingEntry *entry = osync_mapping_nth_entry(mapping, n); @@ -492,7 +492,7 @@ osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, engine, mapping, user_data); num_mapping_conflicts++; - fail_unless(osync_mapping_engine_num_changes(mapping) == GPOINTER_TO_INT(user_data), NULL); + fail_unless(osync_mapping_engine_num_changes(mapping) == GPOINTER_TO_UINT(user_data), NULL); fail_unless(num_engine_end_conflicts == 0, NULL); change = osync_mapping_engine_member_change(mapping, 1); @@ -505,11 +505,11 @@ void conflict_handler_choose_deleted(OSyncEngine *engine, OSyncMappingEngine *mapping, void *user_data) { OSyncError *error = NULL; - int i; + unsigned int i; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, engine, mapping, user_data); num_mapping_conflicts++; - fail_unless(osync_mapping_engine_num_changes(mapping) == GPOINTER_TO_INT(user_data), NULL); + fail_unless(osync_mapping_engine_num_changes(mapping) == GPOINTER_TO_UINT(user_data), NULL); fail_unless(num_engine_end_conflicts == 0, NULL); for (i = 0; i < osync_mapping_engine_num_changes(mapping); i++) { @@ -528,11 +528,11 @@ void conflict_handler_choose_modified(OSyncEngine *engine, OSyncMappingEngine *mapping, void *user_data) { OSyncError *error = NULL; - int i; + unsigned int i; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, engine, mapping, user_data); num_mapping_conflicts++; - fail_unless(osync_mapping_engine_num_changes(mapping) == GPOINTER_TO_INT(user_data), NULL); + fail_unless(osync_mapping_engine_num_changes(mapping) == GPOINTER_TO_UINT(user_data), NULL); fail_unless(num_engine_end_conflicts == 0, NULL); for (i = 0; i < osync_mapping_engine_num_changes(mapping); i++) { @@ -552,7 +552,7 @@ OSyncError *error = NULL; num_mapping_conflicts++; if (user_data) - fail_unless(osync_mapping_engine_num_changes(mapping) == GPOINTER_TO_INT(user_data), NULL); + fail_unless(osync_mapping_engine_num_changes(mapping) == GPOINTER_TO_UINT(user_data), NULL); fail_unless(num_engine_end_conflicts == 0, NULL); osync_engine_mapping_ignore_conflict(engine, mapping, &error); @@ -565,7 +565,7 @@ osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, engine, mapping, user_data); num_mapping_conflicts++; - fail_unless(osync_mapping_engine_num_changes(mapping) == GPOINTER_TO_INT(user_data), NULL); + fail_unless(osync_mapping_engine_num_changes(mapping) == GPOINTER_TO_UINT(user_data), NULL); fail_unless(num_engine_end_conflicts == 0, NULL); fail_unless(osync_engine_mapping_duplicate(engine, mapping, &error), NULL); @@ -578,7 +578,7 @@ OSyncError *error = NULL; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, engine, mapping, user_data); - fail_unless(osync_mapping_engine_num_changes(mapping) == GPOINTER_TO_INT(user_data), NULL); + fail_unless(osync_mapping_engine_num_changes(mapping) == GPOINTER_TO_UINT(user_data), NULL); fail_unless(num_engine_end_conflicts == 0, NULL); fail_unless(osync_engine_abort(engine, &error), NULL); @@ -605,7 +605,7 @@ osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, engine, mapping, user_data); num_mapping_conflicts++; - fail_unless(osync_mapping_engine_num_changes(mapping) == GPOINTER_TO_INT(user_data), NULL); + fail_unless(osync_mapping_engine_num_changes(mapping) == GPOINTER_TO_UINT(user_data), NULL); fail_unless(num_engine_end_conflicts == 0, NULL); gengine = engine; g_thread_create ((GThreadFunc)solve_conflict, mapping, TRUE, NULL); Modified: trunk/tests/support.h ============================================================================== --- trunk/tests/support.h Tue Mar 10 11:21:54 2009 (r5286) +++ trunk/tests/support.h Tue Mar 10 12:18:28 2009 (r5287) @@ -92,12 +92,12 @@ void conflict_handler_random(OSyncEngine *engine, OSyncMapping *mapping, void *user_data); -OSyncMappingTable *mappingtable_load(const char *path, const char *objtype, int num_mappings); +OSyncMappingTable *mappingtable_load(const char *path, const char *objtype, unsigned int num_mappings); void mappingtable_close(OSyncMappingTable *maptable); OSyncHashTable *hashtable_load(const char *path, const char *objtype, unsigned int entries); void check_hash(OSyncHashTable *table, const char *cmpuid); -void check_mapping(OSyncMappingTable *table, int memberid, int mappingid, int numentries, const char *uid); +void check_mapping(OSyncMappingTable *table, int memberid, int mappingid, unsigned int numentries, const char *uid); void create_random_file(const char *path); |
