Menu
▾
▴
[Opensync-commits] r5961 - in plugins/ldap-sync: misc src tests
|
From: <svn...@op...> - 2009-11-12 20:17:00
|
Author: scriptor Date: Thu Nov 12 21:16:42 2009 New Revision: 5961 URL: http://www.opensync.org/changeset/5961 Log: I have added numerous casts to (void *) to silence recently added warnings. I have also fixed quite a few real bugs on that occasion. Modified: plugins/ldap-sync/misc/ldap_format_convert.c plugins/ldap-sync/src/ldap_connect.c plugins/ldap-sync/src/ldap_debug.c plugins/ldap-sync/src/ldap_format.c plugins/ldap-sync/src/ldap_plugin.c plugins/ldap-sync/src/ldap_sasl.c plugins/ldap-sync/tests/check_do_convert_from_to.c Modified: plugins/ldap-sync/misc/ldap_format_convert.c ============================================================================== --- plugins/ldap-sync/misc/ldap_format_convert.c Wed Nov 11 01:16:57 2009 (r5960) +++ plugins/ldap-sync/misc/ldap_format_convert.c Thu Nov 12 21:16:42 2009 (r5961) @@ -96,7 +96,7 @@ OSyncFormatEnv *env = (OSyncFormatEnv *)env_orig; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %i, %p)", __func__, env_orig, sfname, type, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %i, %p)", __func__, (void *)env_orig, (void *)sfname, type, (void *)error); if (env == NULL || env_orig == NULL) { @@ -664,7 +664,7 @@ OSyncXMLFormat *xmlformat = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p)", __func__, buffer, size, objtype, new_sourceformat_name, data, sourceformat, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p)", __func__, (void *)buffer, size, (void *)objtype, (void *)new_sourceformat_name, (void *)data, (void *)sourceformat, (void *)error); osync_trace(TRACE_INTERNAL, "%s:%i: Applying workaround.\n", __FILE__, __LINE__); @@ -705,7 +705,7 @@ if (!xmlformat) { osync_trace(TRACE_ERROR, "%s:%i: ERROR: osync_xmlformat_parse() has failed.\nFaulty input was:\n%.*s\n", __FILE__, __LINE__, size, buffer); if (!osync_error_is_set(error)) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: osync_xmlformat_parse() must have failed."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: osync_xmlformat_parse() must have failed.", __FILE__, __LINE__); } goto error; @@ -716,7 +716,7 @@ if (!osync_xmlformat_sort(xmlformat, error)) { if (!osync_error_is_set(error)) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: osync_xmlformat_sort() has failed."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: osync_xmlformat_sort() has failed.", __FILE__, __LINE__); } goto error; @@ -781,21 +781,21 @@ OSyncFormatEnv *format_env = (OSyncFormatEnv *) format_env_orig; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %i, %p, %p)", __func__, format_env_orig, data, sourceformat, detection_type, format_config, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %i, %p, %p)", __func__, (void *)format_env_orig, (void *)data, (void *)sourceformat, detection_type, (void *)format_config, (void *)error); if (data == NULL) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL.", __FILE__, __LINE__); goto error; } if (format_env == NULL) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: format_env = NULL."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: format_env = NULL.", __FILE__, __LINE__); goto error; } if (sourceformat == NULL) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: sourceformat = NULL."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: sourceformat = NULL.", __FILE__, __LINE__); goto error; } @@ -931,7 +931,7 @@ int i = 0; - osync_trace(TRACE_ENTRY, "%s(%i, %p)", __func__, argc, argv); + osync_trace(TRACE_ENTRY, "%s(%i, %p)", __func__, argc, (void *)argv); // Parse arguments Modified: plugins/ldap-sync/src/ldap_connect.c ============================================================================== --- plugins/ldap-sync/src/ldap_connect.c Wed Nov 11 01:16:57 2009 (r5960) +++ plugins/ldap-sync/src/ldap_connect.c Thu Nov 12 21:16:42 2009 (r5961) @@ -104,7 +104,7 @@ */ osync_bool ldap_plugin_do_connect (OSyncContext *ctx, sink_environment *sinkenv, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, ctx, sinkenv, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)error); if (ctx == NULL) { @@ -224,7 +224,7 @@ osync_bool result = FALSE; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, ctx, sinkenv, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)error); if (ctx == NULL) { @@ -390,7 +390,7 @@ OSyncError *error = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, info, ctx, userdata); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, (void *)sink, (void *)info, (void *)ctx, (void *)userdata); if (userdata == NULL) { @@ -425,7 +425,7 @@ } - osync_trace(TRACE_INTERNAL, "%s:%i: sinkenv = %p", __FILE__, __LINE__, sinkenv); + osync_trace(TRACE_INTERNAL, "%s:%i: sinkenv = %p", __FILE__, __LINE__, (void *)sinkenv); @@ -565,7 +565,7 @@ */ osync_bool ldap_plugin_do_disconnect (OSyncContext *ctx, sink_environment *sinkenv, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, ctx, sinkenv, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)error); if (ctx == NULL) { @@ -635,7 +635,7 @@ OSyncError *error = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, info, ctx, userdata); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, (void *)sink, (void *)info, (void *)ctx, (void *)userdata); if (userdata == NULL) { @@ -704,7 +704,7 @@ { int *ldap_protocol_version = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, ctx, info, sinkenv, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, (void *)ctx, (void *)info, (void *)sinkenv, (void *)error); if (ctx == NULL) { @@ -787,7 +787,7 @@ int ldap_errno = 0; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, ctx, sinkenv, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)error); if (ctx == NULL) { @@ -872,7 +872,7 @@ int ldap_errno = 0; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, ctx, sinkenv, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)error); if (ctx == NULL) { @@ -1171,10 +1171,10 @@ { LDAPMessage *res = NULL, *res2 = NULL; int i = 0; - struct berval ** ber = NULL; + struct berval **ber = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, ctx, sinkenv, ldap_schema, result, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)ldap_schema, (void *)result, (void *)error); if (ctx == NULL) { @@ -1337,7 +1337,7 @@ struct berval **ber = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, ctx, sinkenv, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)error); if (ctx == NULL) { @@ -1514,7 +1514,7 @@ osync_bool ldap_plugin_call_ldap_search(OSyncContext *ctx, const LDAP *ldap_handle, const char *searchbase, const char *filter, const int scope, const int kind_of_attributes, const sink_environment *sinkenv, osync_bool ignore_no_such_object, LDAPMessage **results, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %d, %d, %p, %p)", __func__, ctx, ldap_handle, searchbase, filter, scope, kind_of_attributes, sinkenv, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %d, %d, %p, %p)", __func__, (void *)ctx, (void *)ldap_handle, (void *)searchbase, (void *)filter, scope, kind_of_attributes, (void *)sinkenv, (void *)error); const char *scope_str = NULL; @@ -1704,7 +1704,7 @@ LDAPMessage *all_results = NULL, *result = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, ctx, sinkenv, rv, dn, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)rv, (void *)dn, (void *)error); if (rv == NULL) { @@ -1918,7 +1918,7 @@ - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, ctx, sinkenv, msg, keyattr, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)msg, (void *)keyattr, (void *)error); @@ -2098,7 +2098,7 @@ ldap_entry *entry = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p)", __func__, ctx, sinkenv, entrylist, base, filter, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)entrylist, (void *)base, (void *)filter, (void *)error); if (base == NULL) { @@ -2302,7 +2302,7 @@ done: - osync_trace(TRACE_EXIT, "%s: *entrylist = %p", __func__, *entrylist); + osync_trace(TRACE_EXIT, "%s: *entrylist = %p", __func__, (void *) *entrylist); return TRUE; @@ -2342,7 +2342,7 @@ gchar *filter = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, ctx, sinkenv, entrylist); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)entrylist); if (ctx == NULL) { @@ -2393,7 +2393,7 @@ } - osync_trace(TRACE_EXIT, "%s: entrylist = %p", __func__, entrylist); + osync_trace(TRACE_EXIT, "%s: entrylist = %p", __func__, (void *)entrylist); return TRUE; @@ -2475,7 +2475,7 @@ OSyncHashTable *hashtable = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, ctx, sinkenv, all_uids, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)all_uids, (void *)error); if (all_uids == NULL) { @@ -2540,7 +2540,7 @@ char *filter = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, ctx, sinkenv, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)error); if (sinkenv == NULL) { @@ -2736,7 +2736,7 @@ char *actual_hash = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p)", __func__, ctx, sinkenv, base, filter, all_entries, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)base, (void *)filter, (void *)all_entries, (void *)error); @@ -2863,7 +2863,7 @@ char *base = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, ctx, sinkenv, uid, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)uid, (void *)error); if (uid == NULL) { @@ -3012,7 +3012,7 @@ GList *uid = NULL, *present = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, ctx, sinkenv, uids_hashtable, uids_ldap_server, differing_entries); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)uids_hashtable, (void *)uids_ldap_server, (void *)differing_entries); if (sinkenv == NULL) { @@ -3149,7 +3149,7 @@ GList *uid = NULL, *present = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, ctx, uids_hashtable, uids_ldap_server, missing_entries, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)uids_hashtable, (void *)uids_ldap_server, (void *)missing_entries, (void *)error); if (uids_hashtable == NULL) { goto out; @@ -3255,7 +3255,7 @@ GList *consumed_uids = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, ctx, sinkenv, ldapdata_modified, deleted_uids, unmodified_uids); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)ldapdata_modified, (void *)deleted_uids, (void *)unmodified_uids); if (ctx == NULL) { @@ -3515,7 +3515,7 @@ - osync_trace(TRACE_EXIT, "%s: ldapdata_added = %p", __func__, ldapdata_added); + osync_trace(TRACE_EXIT, "%s: ldapdata_added = %p", __func__, (void *)ldapdata_added); return TRUE; @@ -3555,7 +3555,7 @@ osync_bool found = FALSE; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, ctx, oldvals, newvals, modification, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)oldvals, (void *)newvals, (void *)modification, (void *)error); @@ -3660,7 +3660,7 @@ LDAPMod *ldap_plugin_create_ldap_mod (OSyncContext *ctx, int operation, char *ldap_attribute, struct berval **values, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, ctx, operation, ldap_attribute, values, error); + osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p)", __func__, (void *)ctx, operation, (void *)ldap_attribute, (void *)values, (void *)error); if (ldap_attribute == NULL) { @@ -3752,7 +3752,7 @@ - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, entry, modifications, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)entry, (void *)modifications, (void *)error); if (entry == NULL) { @@ -3878,7 +3878,7 @@ GList *modifications = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, ctx, sinkenv, check_entry, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)check_entry, (void *)error); if (check_entry == NULL) { @@ -4210,7 +4210,7 @@ osync_bool found_attribute = FALSE; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, entry, ldap_attribute, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)entry, (void *)ldap_attribute, (void *)error); if (entry == NULL) { @@ -4371,7 +4371,7 @@ gchar **required = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, sinkenv, entry, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)sinkenv, (void *)entry, (void *)error); if (sinkenv == NULL) { @@ -4556,7 +4556,7 @@ LDAPMessage *messages = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, ctx, hash, sinkenv, entry, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)hash, (void *)sinkenv, (void *)entry, (void *)error); if (hash == NULL) { Modified: plugins/ldap-sync/src/ldap_debug.c ============================================================================== --- plugins/ldap-sync/src/ldap_debug.c Wed Nov 11 01:16:57 2009 (r5960) +++ plugins/ldap-sync/src/ldap_debug.c Thu Nov 12 21:16:42 2009 (r5961) @@ -229,7 +229,7 @@ glist_container *container = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, unknown, list, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)unknown, (void *)list, (void *)error); if (unknown == NULL) { @@ -270,7 +270,7 @@ *list = container->list; - osync_trace(TRACE_EXIT, "%s(): *list = %p", __func__, *list); + osync_trace(TRACE_EXIT, "%s(): *list = %p", __func__, (void *) *list); return TRUE; error: @@ -649,7 +649,7 @@ */ osync_bool ldap_plugin_check_for_mod_op(ldap_entry *entry, int *mod_op_rv, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, entry, mod_op_rv, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)entry, (void *)mod_op_rv, (void *)error); int i = 0; @@ -728,7 +728,7 @@ int k; - osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p)", __func__, string, len, buffer, error); + osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p)", __func__, (void *)string, len, (void *)buffer, (void *)error); @@ -815,7 +815,7 @@ } - osync_trace(TRACE_EXIT, "%s(): *buffer = %p", __func__, *buffer); + osync_trace(TRACE_EXIT, "%s(): *buffer = %p", __func__, (void *) *buffer); return TRUE; Modified: plugins/ldap-sync/src/ldap_format.c ============================================================================== --- plugins/ldap-sync/src/ldap_format.c Wed Nov 11 01:16:57 2009 (r5960) +++ plugins/ldap-sync/src/ldap_format.c Thu Nov 12 21:16:42 2009 (r5961) @@ -116,7 +116,7 @@ GList *list = NULL; - osync_trace(TRACE_ENTRY, "%s(%p)", __func__, ldapmods); + osync_trace(TRACE_ENTRY, "%s(%p)", __func__, (void *)ldapmods); if (ldapmods == NULL) { @@ -179,7 +179,7 @@ int i = 0; - osync_trace(TRACE_ENTRY, "%s(%p)", __func__, entry); + osync_trace(TRACE_ENTRY, "%s(%p)", __func__, (void *)entry); if (entry == NULL) { @@ -248,7 +248,7 @@ unsigned int i; - osync_trace(TRACE_ENTRY, "%s(%p)", __func__, entrylist); + osync_trace(TRACE_ENTRY, "%s(%p)", __func__, (void *)entrylist); if (entrylist == NULL) { @@ -372,7 +372,7 @@ unsigned int i = 0; - osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, ldapmods, name); + osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, (void *)ldapmods, (void *)name); if (ldapmods == NULL) { @@ -434,7 +434,7 @@ static GList *ldap_format_append_ldapmod(GList *list, gchar *ldapattr, gchar *value) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, list, ldapattr, value); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)list, (void *)ldapattr, (void *)value); @@ -517,7 +517,7 @@ out: - osync_trace(TRACE_EXIT, "%s(): list = %p", __func__, list); + osync_trace(TRACE_EXIT, "%s(): list = %p", __func__, (void *)list); return list; } @@ -543,7 +543,7 @@ unsigned int i = 0; - osync_trace(TRACE_ENTRY, "%s(%p)", __func__, ldapmods); + osync_trace(TRACE_ENTRY, "%s(%p)", __func__, (void *)ldapmods); @@ -588,7 +588,7 @@ out: - osync_trace(TRACE_EXIT, "%s(): entry = %p", __func__, entry); + osync_trace(TRACE_EXIT, "%s(): entry = %p", __func__, (void *)entry); return entry; } @@ -617,7 +617,7 @@ unsigned int i = 0; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, dn, ldapmods, potential_subentries, ldap_entries, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)dn, (void *)ldapmods, (void *)potential_subentries, (void *)ldap_entries, (void *)error); @@ -845,7 +845,7 @@ xmlNode *attribute_node = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p)", __func__, xmlnode, attr1_name, attr1_value, attr2_name, attr2_value, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p)", __func__, (void *)xmlnode, (void *)attr1_name, (void *)attr1_value, (void *)attr2_name, (void *)attr2_value, (void *)error); if (xmlnode == NULL) { @@ -1001,7 +1001,7 @@ gchar *new_name = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, ptr, name, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)ptr, (void *)name, (void *)error); if (ptr == NULL) { @@ -1107,7 +1107,7 @@ - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, xmlnode, dn, element_lists, ldap_entries, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)xmlnode, (void *)dn, (void *)element_lists, (void *)ldap_entries, (void *)error); @@ -1522,7 +1522,7 @@ #endif - osync_trace(TRACE_EXIT, "%s(): ldap_entries = %p", __func__, ldap_entries); + osync_trace(TRACE_EXIT, "%s(): ldap_entries = %p", __func__, (void *)ldap_entries); return TRUE; @@ -1600,7 +1600,7 @@ static OSyncConvCmpResult ldap_format_compare_format1(const char *leftdata, unsigned int leftsize, const char *rightdata, unsigned int rightsize, void *user_data, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %u, %p, %p) TODO ", __func__, leftdata, leftsize, rightdata, rightsize, user_data, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %u, %p, %p) TODO ", __func__, (void *)leftdata, leftsize, (void *)rightdata, rightsize, (void *)user_data, (void *)error); osync_trace(TRACE_EXIT, "%s", __func__); @@ -1630,7 +1630,7 @@ char *objtype = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p, %p)", __func__, input, inpsize, xmlformat, str, stylesheet_file, error); + osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)xmlformat, (void *)str, (void *)stylesheet_file, (void *)error); if (!strcmp(stylesheet_file, STYLESHEET_LDAP_EVOLUTIONPERSON2XMLFORMAT_CONTACT)) { @@ -1732,7 +1732,7 @@ xmlSchemaPtr xsd = NULL; xmlSchemaParserCtxtPtr xsd_file = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p)", __func__, input, inpsize, xmlcard, stylesheet_file, error); + osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)xmlcard, (void *)stylesheet_file, (void *)error); if (input == NULL) { @@ -1962,7 +1962,7 @@ static osync_bool ldap_format_check_adequate_stylesheet(xmlNode *root_element, const char *stylesheet_file, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, root_element, stylesheet_file, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)root_element, (void *)stylesheet_file, (void *)error); if (!root_element) { @@ -2194,7 +2194,7 @@ xsltStylesheetPtr stylesheet_ptr = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, config, userdata, stylesheet_file, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)config, (void *)userdata, (void *)stylesheet_file, (void *)error); if (config) { if (config[0]) { @@ -2410,7 +2410,7 @@ OSyncXMLFormat *xmlformat = osync_xmlformat_parse((char *)xmlbuffer, xmlbuffer_size + 1, error); - osync_trace(TRACE_INTERNAL, "%s:%i: xmlformat = %p", __FILE__, __LINE__, xmlformat); + osync_trace(TRACE_INTERNAL, "%s:%i: xmlformat = %p", __FILE__, __LINE__, (void *)xmlformat); osync_trace(TRACE_INTERNAL, "%s:%i: This needs to be freed eventually. But by whom? And where and when exactly?", __FILE__, __LINE__); @@ -2594,7 +2594,7 @@ */ static osync_bool ldap_format_apply_stylesheet_workaround(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, const char *config, void *userdata, const char *stylesheet, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, config, userdata, stylesheet, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)config, userdata, (void *)stylesheet, (void *)error); if (stylesheet == NULL) { @@ -2689,7 +2689,7 @@ xmlNode *secondchild = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p, %p, %p)", __func__, root_node, name, value, attr1_name, attr1_value, attr2_name, attr2_value, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p, %p, %p)", __func__, (void *)root_node, (void *)name, (void *)value, (void *)attr1_name, (void *)attr1_value, (void *)attr2_name, (void *)attr2_value, (void *)error); @@ -2776,7 +2776,7 @@ xmlNode *possible_parent = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p, %p, %p, %p)", __func__, root_node, token, name, value, attr1_name, attr1_value, attr2_name, attr2_value, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p, %p, %p, %p)", __func__, (void *)root_node, (void *)token, (void *)name, (void *)value, (void *)attr1_name, (void *)attr1_value, (void *)attr2_name, (void *)attr2_value, (void *)error); if (root_node == NULL) { @@ -2925,7 +2925,7 @@ osync_bool ldap_plugin_parse_attribute_list(const int entry_list_index, const LDAPMod *mod, xmlChar **name, xmlChar **value, xmlChar **attr1_name, xmlChar **attr1_value, xmlChar **attr2_name, xmlChar **attr2_value, osync_bool *call_continue, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%i, %p, %p, %p, %p, %p, %p, %p, %i, %p)", __func__, entry_list_index, mod, name, value, attr1_name, attr1_value, attr2_name, attr2_value, call_continue, error); + osync_trace(TRACE_ENTRY, "%s(%i, %p, %p, %p, %p, %p, %p, %p, %p, %p)", __func__, entry_list_index, (void *)mod, (void *)name, (void *)value, (void *)attr1_name, (void *)attr1_value, (void *)attr2_name, (void *)attr2_value, (void *)call_continue, (void *)error); if (mod == NULL) { @@ -3152,7 +3152,7 @@ unsigned int i = 0, j = 0, k = 0; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, ldap_entries, objtype, ldap_format_name, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, (void *)ldap_entries, (void *)objtype, (void *)ldap_format_name, (void *)error); if (ldap_entries == NULL) { @@ -3329,7 +3329,7 @@ // would have been defined. if (!ldap_plugin_parse_attribute_list(i, mod, &name, &value, &attr1_name, &attr1_value, &attr2_name, &attr2_value, &call_continue, error)) { if (!osync_error_is_set(error)) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: %s:%i: ldap_plugin_parse_attribute_list() has failed.", __FILE__, __LINE__); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: ldap_plugin_parse_attribute_list() has failed.", __FILE__, __LINE__); } goto error; @@ -3693,7 +3693,7 @@ #endif - osync_trace(TRACE_EXIT, "%s(): doc = %p", __func__, doc); + osync_trace(TRACE_EXIT, "%s(): doc = %p", __func__, (void *)doc); return doc; @@ -3732,7 +3732,7 @@ static osync_bool ldap_format_check_root_element(const xmlDoc *xmldata, const char *objtype, const char *ldap_format_name, const gchar *dn, xmlNode **root, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p)", __func__, xmldata, objtype, ldap_format_name, dn, root, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p)", __func__, (void *)xmldata, (void *)objtype, (void *)ldap_format_name, (void *)dn, (void *)root, (void *)error); if (xmldata == NULL) { @@ -3856,7 +3856,7 @@ - osync_trace(TRACE_EXIT, "%s(): *root = %p, (*root)->name = \"%s\"", __func__, *root, (*root)->name); + osync_trace(TRACE_EXIT, "%s(): *root = %p, (*root)->name = \"%s\"", __func__, (void *) *root, (*root)->name); return TRUE; error: @@ -3904,7 +3904,7 @@ */ static osync_bool ldap_format_parse_xmlinternal_child_nodes(xmlNode *xmlnode, const char *objtype, const char *dn, complex_elements *complex_element_lists, GList **potential_subentries, GList **ldapmods, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p, %p)", __func__, xmlnode, objtype, dn, complex_element_lists, potential_subentries, ldapmods, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p, %p)", __func__, (void *)xmlnode, (void *)objtype, (void *)dn, (void *)complex_element_lists, (void *)potential_subentries, (void *)ldapmods, (void *)error); if (ldapmods == NULL) { @@ -4242,7 +4242,7 @@ #endif - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p, %p)", __func__, xmldata, objtype, ldap_format_name, dn, potential_subentries, ldap_entries, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p, %p)", __func__, (void *)xmldata, (void *)objtype, (void *)ldap_format_name, (void *)dn, (void *)potential_subentries, (void *)ldap_entries, (void *)error); @@ -4365,7 +4365,7 @@ } - osync_trace(TRACE_INTERNAL, "%s:%i: ldapmods = %p, potential_subentries = %p, ldap_entries = %p", __FILE__, __LINE__, ldapmods, potential_subentries, ldap_entries); + osync_trace(TRACE_INTERNAL, "%s:%i: ldapmods = %p, potential_subentries = %p, ldap_entries = %p", __FILE__, __LINE__, (void *)ldapmods, (void *)potential_subentries, (void *)ldap_entries); @@ -4427,7 +4427,7 @@ } - osync_trace(TRACE_EXIT, "%s(): xmlcard = %p", __func__, xmlcard); + osync_trace(TRACE_EXIT, "%s(): xmlcard = %p", __func__, (void *)xmlcard); return xmlcard; } @@ -4438,8 +4438,8 @@ * of LDAP entries. * * This function initiates the second step out of two steps - * necessary for conversion from the XML format used by libopensync - * into a list LDAP entries suitable for libopenldap. It is called + * necessary for converting from the XML format used by libopensync + * into a list of LDAP entries suitable for libldap. It is being called * after the stylesheet has been applied. * * @param xmlformat The xmlformat object as it results from applying @@ -4465,7 +4465,7 @@ char *dn = (char *)""; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, xmlformat, objtype, ldap_format_name, ldap_entries, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)xmlformat, (void *)objtype, (void *)ldap_format_name, (void *)ldap_entries, (void *)error); if (xmlformat == NULL) { @@ -4562,7 +4562,7 @@ pre_output = NULL; } - osync_trace(TRACE_EXIT, "%s(): *ldap_entries = %p", __func__, *ldap_entries); + osync_trace(TRACE_EXIT, "%s(): *ldap_entries = %p", __func__, (void *) *ldap_entries); return TRUE; @@ -4717,7 +4717,7 @@ GList *list = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, ldap_format_name, xmlformat_name, stylesheet_name, objtype, config, userdata, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)free_input, (void *)ldap_format_name, (void *)xmlformat_name, (void *)stylesheet_name, (void *)objtype, (void *)config, (void *)userdata, (void *)error); @@ -4977,7 +4977,7 @@ */ static osync_bool ldap_format_conv_ldap_evolutionperson_to_xmlformat_contact(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, void *userdata, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)free_input, (void *)config, (void *)userdata, (void *)error); #ifdef DEBUG_do_apply_stylesheet @@ -5036,7 +5036,7 @@ */ static osync_bool ldap_format_conv_ldap_inetorgperson_to_xmlformat_contact(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, void *userdata, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)free_input, (void *)config, (void *)userdata, (void *)error); #ifdef DEBUG_do_apply_stylesheet @@ -5124,7 +5124,7 @@ glist_container *container = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, xmlformat_name, ldap_format_name, stylesheet_name, objtype, config, userdata, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)free_input, (void *)xmlformat_name, (void *)ldap_format_name, (void *)stylesheet_name, (void *)objtype, (void *)config, (void *)userdata, (void *)error); if (input == NULL) { @@ -5286,7 +5286,7 @@ static osync_bool ldap_format_conv_xmlformat_contact_to_ldap_evolution_person(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, void *userdata, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)free_input, (void *)config, (void *)userdata, (void *)error); if (config) { if (config[0]) { @@ -5356,7 +5356,7 @@ static osync_bool ldap_format_conv_xmlformat_contact_to_ldap_inetorg_person(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, void *userdata, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)free_input, (void *)config, (void *)userdata, (void *)error); if (config) { if (config[0]) { @@ -5428,8 +5428,7 @@ static osync_bool ldap_format_conv_ldap_event_to_xmlformat_event(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, void *userdata, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error); - + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)free_input, (void *)config, (void *)userdata, (void *)error); @@ -5481,7 +5480,7 @@ static osync_bool ldap_format_conv_xmlformat_event_to_ldap_event(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, void *userdata, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)free_input, (void *)config, (void *)userdata, (void *)error); #ifdef DEBUG_do_apply_stylesheet @@ -5540,7 +5539,7 @@ static osync_bool ldap_format_conv_ldap_todo_to_xmlformat_todo(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, void *userdata, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)free_input, (void *)config, (void *)userdata, (void *)error); #ifdef DEBUG_do_apply_stylesheet @@ -5592,7 +5591,7 @@ static osync_bool ldap_format_conv_xmlformat_todo_to_ldap_todo(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, void *userdata, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)free_input, (void *)config, (void *)userdata, (void *)error); #ifdef DEBUG_do_apply_stylesheet @@ -5653,7 +5652,7 @@ static osync_bool ldap_format_conv_ldap_note_to_xmlformat_note(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, void *userdata, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)free_input, (void *)config, (void *)userdata, (void *)error); #ifdef DEBUG_do_apply_stylesheet @@ -5712,7 +5711,7 @@ static osync_bool ldap_format_conv_xmlformat_note_to_ldap_note(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, void *userdata, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error); + osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %p, %p, %p)", __func__, (void *)input, inpsize, (void *)output, (void *)outpsize, (void *)free_input, (void *)config, (void *)userdata, (void *)error); #ifdef DEBUG_do_apply_stylesheet @@ -5793,14 +5792,14 @@ static osync_bool ldap_format_destroy_format1(char *input , unsigned int inpsize, void *user_data, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %d, %p, %p) TODO ", __func__, input, inpsize, user_data, error); + osync_trace(TRACE_ENTRY, "%s(%p, %d, %p, %p) TODO ", __func__, (void *)input, inpsize, (void *)user_data, (void *)error); - osync_trace(TRACE_INTERNAL, "%s:%i:%s():\n\n\ndestroy function has been called for input = %p\n\n\n", __FILE__, __LINE__, __func__, input); + osync_trace(TRACE_INTERNAL, "%s:%i:%s():\n\n\ndestroy function has been called for input = %p\n\n\n", __FILE__, __LINE__, __func__, (void *)input); // First off, try and find out what type of data has been casted to char * - osync_trace(TRACE_INTERNAL, "%s:%i: What is input? inpsize = %i", __FILE__, __LINE__, inpsize); + osync_trace(TRACE_INTERNAL, "%s:%i: What is input? inpsize = %u", __FILE__, __LINE__, inpsize); GString *str = NULL; @@ -5880,7 +5879,7 @@ static osync_bool ldap_format_duplicate_format1(const char *uid, const char *input, unsigned int insize, char **newuid, char **output, unsigned int *outsize, osync_bool *dirty, void *user_data, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %u, %p, %p, %p, %p, %p, %p) TODO ", __func__, uid, input, insize, newuid, output, outsize, dirty, user_data, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %u, %p, %p, %p, %p, %p, %p) TODO ", __func__, (void *)uid, (void *)input, insize, (void *)newuid, (void *)output, (void *)outsize, (void *)dirty, (void *)user_data, (void *)error); ldap_plugin_printf("\n\n\n\n%s:%i: %s() has been called.\n\n\n\n", __FILE__, __LINE__, __func__); @@ -5924,7 +5923,7 @@ unsigned int xmlbuff_size = 0; - osync_trace(TRACE_ENTRY, "%s(%p, %d, %p, %p) ", __func__, data, size, user_data, error); + osync_trace(TRACE_ENTRY, "%s(%p, %d, %p, %p) ", __func__, (void *)data, size, (void *)user_data, (void *)error); @@ -6027,7 +6026,7 @@ // unreachable - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: Don't know what that is. Bailing out."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: Don't know what that is. Bailing out.", __FILE__, __LINE__); goto error; } @@ -6111,7 +6110,7 @@ osync_trace(TRACE_INTERNAL, "%s:%i:%s():\nstr->str = \"%s\"\n", __FILE__, __LINE__, __func__, str->str); } - osync_trace(TRACE_EXIT, "%s(): str = %p, str->str = %p", __func__, str, str->str); + osync_trace(TRACE_EXIT, "%s(): str = %p, str->str = %p", __func__, (void *)str, str->str); return (char *)str->str; @@ -6143,7 +6142,7 @@ osync_bool rv = TRUE; - osync_trace(TRACE_ENTRY, "%s(%p, %d, %p, %p)", __func__, data, size, user_data, error); + osync_trace(TRACE_ENTRY, "%s(%p, %d, %p, %p)", __func__, (void *)data, size, (void *)user_data, (void *)error); osync_trace(TRACE_EXIT, "%s: %s", __func__, rv ? "TRUE" : "FALSE"); return rv; @@ -6172,12 +6171,12 @@ GError *gerror = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, size, error); + osync_trace(TRACE_ENTRY, "%s(%p, %i, %p)", __func__, (void *)data, size, (void *)error); if (data == NULL) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL.", __FILE__, __LINE__); goto error; } @@ -6276,42 +6275,42 @@ osync_bool ldap_format_do_detect_plain_as_ldap_format(const char *data, const int size, const char *format_name, const char *opening_tag, const char *closing_tag, const void *userdata, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p, %p, %p)", __func__, data, size, format_name, opening_tag, closing_tag, userdata, error); + osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p, %p, %p)", __func__, (void *)data, size, (void *)format_name, (void *)opening_tag, (void *)closing_tag, (void *)userdata, (void *)error); if (data == NULL) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL.", __FILE__, __LINE__); goto error; } if (format_name == NULL) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: format_name = NULL."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: format_name = NULL.", __FILE__, __LINE__); goto error; } if (format_name[0] == 0) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: format_name[0] = 0."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: format_name[0] = 0.", __FILE__, __LINE__); goto error; } if (opening_tag == NULL) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: opening_tag = NULL."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: opening_tag = NULL.", __FILE__, __LINE__); goto error; } if (opening_tag[0] == 0) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: opening_tag[0] = 0."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: opening_tag[0] = 0.", __FILE__, __LINE__); goto error; } if (closing_tag == NULL) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: closing_tag = NULL."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: closing_tag = NULL.", __FILE__, __LINE__); goto error; } if (closing_tag[0] == 0) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: closing_tag[0] = 0."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: closing_tag[0] = 0.", __FILE__, __LINE__); goto error; } @@ -6537,7 +6536,7 @@ if (data == NULL) { - osync_error_set(&error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL."); + osync_error_set(&error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL.", __FILE__, __LINE__); goto error; } @@ -6602,11 +6601,11 @@ OSyncError *error = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %i, %p)", __func__, data, size, userdata); + osync_trace(TRACE_ENTRY, "%s(%p, %i, %p)", __func__, (void *)data, size, userdata); if (data == NULL) { - osync_error_set(&error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL."); + osync_error_set(&error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL.", __FILE__, __LINE__); goto error; } @@ -6669,11 +6668,11 @@ OSyncError *error = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %i, %p)", __func__, data, size, userdata); + osync_trace(TRACE_ENTRY, "%s(%p, %i, %p)", __func__, (void *)data, size, userdata); if (data == NULL) { - osync_error_set(&error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL."); + osync_error_set(&error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL.", __FILE__, __LINE__); goto error; } @@ -6736,11 +6735,11 @@ - osync_trace(TRACE_ENTRY, "%s(%p, %i, %p)", __func__, data, size, userdata); + osync_trace(TRACE_ENTRY, "%s(%p, %i, %p)", __func__, (void *)data, size, userdata); if (data == NULL) { - osync_error_set(&error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL."); + osync_error_set(&error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL.", __FILE__, __LINE__); goto error; } @@ -6811,7 +6810,7 @@ osync_trace(TRACE_ENTRY, "%s(%p, %i, %p)", __func__, data, size, userdata); if (data == NULL) { - osync_error_set(&error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL."); + osync_error_set(&error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: data = NULL.", __FILE__, __LINE__); goto error; } @@ -6868,7 +6867,7 @@ */ osync_bool get_format_info(OSyncFormatEnv *env, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, env, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, (void *)env, (void *)error); @@ -7030,8 +7029,7 @@ - - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p, %p, %p)", __func__, env, format_name, other_format_name, objtype, converter1, converter2, detector_function, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)env, (void *)format_name, (void *)other_format_name, (void *)objtype, (void *)error); if (env == NULL) { @@ -7070,7 +7068,7 @@ if (detector_function) { - osync_trace(TRACE_INTERNAL, "%s:%i: Setting detector_function for format \"%s\" against \"plain\". detector_function = %p.", __FILE__, __LINE__, format_name, detector_function); + osync_trace(TRACE_INTERNAL, "%s:%i: Setting detector_function for format \"%s\" against \"plain\".", __FILE__, __LINE__, format_name); plain = osync_format_env_find_objformat(env, "plain"); if (!plain) { @@ -7145,7 +7143,7 @@ osync_converter_unref(conv); - osync_trace(TRACE_INTERNAL, "%s:%i:%s(): Registering conversion from \"%s\" to \"%s\" for objtype \"%s\" with the converter function being located at address %p\n", __FILE__, __LINE__, __func__, format_name, other_format_name, objtype, converter1); + osync_trace(TRACE_INTERNAL, "%s:%i:%s(): Registering conversion from \"%s\" to \"%s\" for objtype \"%s\".", __FILE__, __LINE__, __func__, format_name, other_format_name, objtype); conv = osync_converter_new(OSYNC_CONVERTER_CONV, format2, format1, converter2, error); @@ -7169,7 +7167,7 @@ osync_converter_unref(conv); - osync_trace(TRACE_INTERNAL, "%s:%i:%s(): Registering conversion from \"%s\" to \"%s\" for objtype \"%s\" with the converter function being located at address %p\n", __FILE__, __LINE__, __func__, other_format_name, format_name, objtype, converter2); + osync_trace(TRACE_INTERNAL, "%s:%i:%s(): Registering conversion from \"%s\" to \"%s\" for objtype \"%s\".", __FILE__, __LINE__, __func__, other_format_name, format_name, objtype); @@ -7198,17 +7196,13 @@ */ osync_bool get_conversion_info(OSyncFormatEnv *env, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, env, error); - - - osync_trace(TRACE_INTERNAL, "%s:%i:%s(): \"%s\":\n", __FILE__, __LINE__, __func__, OBJECTTYPE_CONTACT); - osync_trace(TRACE_INTERNAL, "ldap_format_conv_ldap_evolutionperson_to_xmlformat_contact() is located at address %p\n", ldap_format_conv_ldap_evolutionperson_to_xmlformat_contact); - osync_trace(TRACE_INTERNAL, "ldap_format_conv_xmlformat_contact_to_ldap_evolution_person() is located at address %p\n", ldap_format_conv_xmlformat_contact_to_ldap_evolution_person); + osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, (void *)env, (void *)error); const char *path = LDAP_PLUGIN_OPENSYNC_CONFIGDIR; struct stat stat_buffer; + errno = 0; if (stat(path, &stat_buffer)) { osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: Path \"%s\" could not be found: %s. The constant LDAP_PLUGIN_OPENSYNC_CONFIGDIR is not correctly set. Please rerun cmake and check the resulting config.h for LDAP_PLUGIN_OPENSYNC_CONFIGDIR.\n", __FILE__, __LINE__, path, strerror(errno)); @@ -7238,14 +7232,6 @@ - - - osync_trace(TRACE_INTERNAL, "%s:%i:%s(): \"%s\":\n", __FILE__, __LINE__, __func__, OBJECTTYPE_CONTACT); - osync_trace(TRACE_INTERNAL, "ldap_format_conv_ldap_inetorgperson_to_xmlformat_contact() is located at address %p\n", ldap_format_conv_ldap_inetorgperson_to_xmlformat_contact); - osync_trace(TRACE_INTERNAL, "ldap_format_conv_xmlformat_contact_to_ldap_inetorg_person() is located at address %p\n", ldap_format_conv_xmlformat_contact_to_ldap_inetorg_person); - - - if ( !ldap_format_do_get_conversion_info( env, @@ -7267,20 +7253,6 @@ - - - - - - - - - osync_trace(TRACE_INTERNAL, "%s:%i:%s(): \"%s\":\n", __FILE__, __LINE__, __func__, OBJECTTYPE_EVENT); - osync_trace(TRACE_INTERNAL, "ldap_format_conv_ldap_event_to_xmlformat_event() is located at address %p\n", ldap_format_conv_ldap_event_to_xmlformat_event); - osync_trace(TRACE_INTERNAL, "ldap_format_conv_xmlformat_event_to_ldap_event() is located at address %p\n", ldap_format_conv_xmlformat_event_to_ldap_event); - - - if ( !ldap_format_do_get_conversion_info( env, @@ -7302,12 +7274,6 @@ - osync_trace(TRACE_INTERNAL, "%s:%i:%s(): \"%s\":\n", __FILE__, __LINE__, __func__, OBJECTTYPE_TODO); - osync_trace(TRACE_INTERNAL, "ldap_format_conv_ldap_todo_to_xmlformat_todo() is located at address %p\n", ldap_format_conv_ldap_todo_to_xmlformat_todo); - osync_trace(TRACE_INTERNAL, "ldap_format_conv_xmlformat_todo_to_ldap_todo() is located at address %p\n", ldap_format_conv_xmlformat_todo_to_ldap_todo); - - - if ( !ldap_format_do_get_conversion_info( env, @@ -7329,14 +7295,6 @@ - - osync_trace(TRACE_INTERNAL, "%s:%i:%s(): \"%s\":\n", __FILE__, __LINE__, __func__, OBJECTTYPE_NOTE); - osync_trace(TRACE_INTERNAL, "ldap_format_conv_ldap_note_to_xmlformat_note() is located at address %p\n", ldap_format_conv_ldap_note_to_xmlformat_note); - osync_trace(TRACE_INTERNAL, "ldap_format_conv_xmlformat_note_to_ldap_note() is located at address %p\n", ldap_format_conv_xmlformat_note_to_ldap_note); - - - - if ( !ldap_format_do_get_conversion_info( env, Modified: plugins/ldap-sync/src/ldap_plugin.c ============================================================================== --- plugins/ldap-sync/src/ldap_plugin.c Wed Nov 11 01:16:57 2009 (r5960) +++ plugins/ldap-sync/src/ldap_plugin.c Thu Nov 12 21:16:42 2009 (r5961) @@ -290,7 +290,8 @@ */ osync_bool ldap_plugin_get_sinkenv(OSyncContext *ctx, OSyncObjTypeSink *sink, void *userdata, sink_environment **sinkenv, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, ctx, sink, userdata, sinkenv, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)sink, (void *)userdata, (void *)sinkenv, (void *)error); + if (ctx == NULL) { osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: ctx = NULL.", __FILE__, __LINE__); @@ -376,7 +377,7 @@ } osync_trace(TRACE_ERROR, "%s:%i: ERROR: userdata->magic = \"%.10s\" = \"%.10s\"", __FILE__, __LINE__, ((sink_environment *)userdata)->magic, ((plugin_environment *)userdata)->magic); - osync_trace(TRACE_ERROR, "%s:%i: ERROR: strlen(userdata->magic) = %u", __FILE__, __LINE__, strlen(((sink_environment *)userdata)->magic)); + osync_trace(TRACE_ERROR, "%s:%i: ERROR: strlen(userdata->magic) = %u", __FILE__, __LINE__, (unsigned int) strlen(((sink_environment *)userdata)->magic)); } @@ -430,7 +431,8 @@ { char *timestamp = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, ctx, sinkenv, error); + + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)error); if (ctx == NULL) { @@ -625,7 +627,7 @@ OSyncPluginConnection *conn = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, info, sinkenv, config, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, (void *)info, (void *)sinkenv, (void *)config, (void *)error); @@ -1029,8 +1031,8 @@ if (objtype) osync_trace(TRACE_INTERNAL, "Objtype: \"%s\"", objtype); - osync_trace(TRACE_INTERNAL, "sinkenv->sink = %p", sinkenv->sink); - osync_trace(TRACE_INTERNAL, "sinkenv->objformat = %p", sinkenv->objformat); + osync_trace(TRACE_INTERNAL, "sinkenv->sink = %p", (void *)sinkenv->sink); + osync_trace(TRACE_INTERNAL, "sinkenv->objformat = %p", (void *)sinkenv->objformat); if (sinkenv->servername) osync_trace(TRACE_INTERNAL, "sinkenv->servername = \"%s\"", sinkenv->servername); @@ -1174,7 +1176,7 @@ GList *ldap_plugin_append_ldapmod(GList *list, gchar *ldapattr, gchar *value) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, list, ldapattr, value); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, (void *)list, (void *)ldapattr, (void *)value); @@ -1250,7 +1252,7 @@ out: - osync_trace(TRACE_EXIT, "%s(): list = %p", __func__, list); + osync_trace(TRACE_EXIT, "%s(): list = %p", __func__, (void *)list); return list; } @@ -1280,7 +1282,7 @@ osync_bool rv = TRUE; - osync_trace(TRACE_ENTRY, "%s(%p, %d, %p, %p)", __func__, data, size, user_data, error); + osync_trace(TRACE_ENTRY, "%s(%p, %d, %p, %p)", __func__, (void *)data, size, (void *)user_data, (void *)error); osync_trace(TRACE_EXIT, "%s: %s", __func__, rv ? "TRUE" : "FALSE"); @@ -1320,7 +1322,8 @@ glist_container *to_be_reported = NULL; OSyncHashTable *hashtable = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %i, %i, %p, %p)", __func__, ctx, sinkenv, slow_sync_requested, changetype_from_caller, list_to_be_reported, error); + + osync_trace(TRACE_ENTRY, "%s(%p, %p, %i, %i, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, slow_sync_requested, changetype_from_caller, (void *)list_to_be_reported, (void *)error); if (ctx == NULL) { osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: ctx = NULL.", __FILE__, __LINE__); @@ -1507,7 +1510,7 @@ ptr[sizeof(glist_container)] = 0; osync_assert(to_be_reported); - osync_trace(TRACE_INTERNAL, "%s:%i: sizeof(*to_be_reported) = %u", __FILE__, __LINE__, sizeof(*to_be_reported)); + osync_trace(TRACE_INTERNAL, "%s:%i: sizeof(*to_be_reported) = %lu", __FILE__, __LINE__, sizeof(*to_be_reported)); if (sizeof(*to_be_reported) == 0) { osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: sizeof(*to_be_reported) is 0.\n", __FILE__, __LINE__); osync_change_unref(change); @@ -1619,7 +1622,7 @@ - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, ctx, info, sinkenv, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, (void *)ctx, (void *)info, (void *)sinkenv, (void *)error); @@ -1752,7 +1755,7 @@ - osync_trace(TRACE_ENTRY, "%s(%p, %p, %d, %p, %p)", __func__, ctx, sinkenv, slow_sync_requested, ldaplist_added, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %d, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, slow_sync_requested, (void *)ldaplist_added, (void *)error); if (ctx == NULL) { @@ -1976,7 +1979,7 @@ - osync_trace(TRACE_ENTRY, "%s(%p, %p, %d, %p, %p)", __func__, ctx, sinkenv, slow_sync_requested, ldaplist_deleted, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %d, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, slow_sync_requested, (void *)ldaplist_deleted, (void *)error); for (i = 0; i < g_list_length(ldaplist_deleted) ; i++) { @@ -2073,7 +2076,7 @@ OSyncHashTable *hashtable = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %d, %p, %p)", __func__, ctx, sinkenv, slow_sync_requested, unmodified_uids, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %d, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, slow_sync_requested, (void *)unmodified_uids, (void *)error); @@ -2175,7 +2178,8 @@ { OSyncHashTable *hashtable = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %d, %p, %p, %p, %p, %p)", __func__, ctx, sinkenv, slow_sync_requested, ldaplist_added, ldaplist_modified, deleted_uids, unmodified_uids, error); + + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)slow_sync_requested, (void *)ldaplist_added, (void *)ldaplist_modified, (void *)deleted_uids, (void *)unmodified_uids, (void *)error); if (ctx == NULL) { osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: ctx = NULL. \n", __FILE__, __LINE__); @@ -2251,7 +2255,7 @@ } - osync_trace(TRACE_INTERNAL, "%s:%i: ldaplist_added = %p", __FILE__, __LINE__, ldaplist_added); + osync_trace(TRACE_INTERNAL, "%s:%i: ldaplist_added = %p", __FILE__, __LINE__, (void *)ldaplist_added); } else @@ -2272,10 +2276,10 @@ goto error; } - osync_trace(TRACE_INTERNAL, "%s:%i: ldaplist_added = %p", __FILE__, __LINE__, ldaplist_added); - osync_trace(TRACE_INTERNAL, "%s:%i: ldaplist_modified = %p", __FILE__, __LINE__, ldaplist_modified); - osync_trace(TRACE_INTERNAL, "%s:%i: deleted_uids = %p", __FILE__, __LINE__, deleted_uids); - osync_trace(TRACE_INTERNAL, "%s:%i: unmodified_uids = %p", __FILE__, __LINE__, unmodified_uids); + osync_trace(TRACE_INTERNAL, "%s:%i: ldaplist_added = %p", __FILE__, __LINE__, (void *)ldaplist_added); + osync_trace(TRACE_INTERNAL, "%s:%i: ldaplist_modified = %p", __FILE__, __LINE__, (void *)ldaplist_modified); + osync_trace(TRACE_INTERNAL, "%s:%i: deleted_uids = %p", __FILE__, __LINE__, (void *)deleted_uids); + osync_trace(TRACE_INTERNAL, "%s:%i: unmodified_uids = %p", __FILE__, __LINE__, (void *)unmodified_uids); } @@ -2349,7 +2353,7 @@ - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %d, %p)", __func__, sink, info, ctx, slow_sync_requested, userdata); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %d, %p)", __func__, (void *)sink, (void *)info, (void *)ctx, slow_sync_requested, (void *)userdata); #ifdef DEBUG_ldapdata_from_server ldap_plugin_printf("%s:%i: ----------- Inside ldap_plugin_get_changes() --------------", __FILE__, __LINE__); @@ -2414,8 +2418,8 @@ osync_trace(TRACE_INTERNAL, "%s:%i:%s():", __FILE__, __LINE__, __func__); - osync_trace(TRACE_INTERNAL, "sink = %p", sink); - osync_trace(TRACE_INTERNAL, "sinkenv->sink = %p", sinkenv->sink); + osync_trace(TRACE_INTERNAL, "sink = %p", (void *)sink); + osync_trace(TRACE_INTERNAL, "sinkenv->sink = %p", (void *)(sinkenv->sink)); if (sinkenv->sink) { osync_trace(TRACE_INTERNAL, "%s: Is this sink (%s) enabled? %d", __func__, osync_objtype_sink_get_name(sinkenv->sink), osync_objtype_sink_is_enabled(sinkenv->sink)); } @@ -2445,10 +2449,10 @@ - osync_trace(TRACE_INTERNAL, "%s:%i: ldaplist_added = %p", __FILE__, __LINE__, ldaplist_added); - osync_trace(TRACE_INTERNAL, "%s:%i: ldaplist_modified = %p", __FILE__, __LINE__, ldaplist_modified); - osync_trace(TRACE_INTERNAL, "%s:%i: deleted_uids = %p", __FILE__, __LINE__, deleted_uids); - osync_trace(TRACE_INTERNAL, "%s:%i: unmodified_uids = %p", __FILE__, __LINE__, unmodified_uids); + osync_trace(TRACE_INTERNAL, "%s:%i: ldaplist_added = %p", __FILE__, __LINE__, (void *)ldaplist_added); + osync_trace(TRACE_INTERNAL, "%s:%i: ldaplist_modified = %p", __FILE__, __LINE__, (void *)ldaplist_modified); + osync_trace(TRACE_INTERNAL, "%s:%i: deleted_uids = %p", __FILE__, __LINE__, (void *)deleted_uids); + osync_trace(TRACE_INTERNAL, "%s:%i: unmodified_uids = %p", __FILE__, __LINE__, (void *)unmodified_uids); @@ -2598,7 +2602,7 @@ - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, ctx, change, sinkenv, ldap_entries, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)change, (void *)sinkenv, (void *)ldap_entries, (void *)error); if (!change) { @@ -2775,7 +2779,7 @@ uid = NULL; } - osync_trace(TRACE_EXIT, "%s(): *ldap_entries = %p", __func__, *ldap_entries); + osync_trace(TRACE_EXIT, "%s(): *ldap_entries = %p", __func__, (void *) *ldap_entries); return TRUE; @@ -2820,7 +2824,7 @@ - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, ctx, sinkenv, result, change, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)result, (void *)change, (void *)error); if (ctx == NULL) { @@ -2918,7 +2922,7 @@ osync_bool rv = TRUE; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, ctx, sinkenv, debug_id, hash, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)debug_id, (void *)hash, (void *)error); if (debug_id == NULL) { @@ -3026,7 +3030,7 @@ unsigned int i = 0; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p)", __func__, ctx, sinkenv, change, ldap_entries, result, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p)", __func__, (void *)ctx, (void *)sinkenv, (void *)change, (void *)ldap_entries, (void *)result, (void *)error); if (sinkenv == NULL) { @@ -3109,7 +3113,7 @@ // from what has been stored as value for the key attribute. if (!ldap_plugin_check_for_keyattribute(sinkenv, entry, TRUE, error)) { if (!osync_error_is_set(error)) - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: ldap_plugin_check_for_keyattribute() has failed."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: ldap_plugin_check_for_keyattribute() has failed.", __FILE__... [truncated message content] |
