From: <svn...@op...> - 2009-04-13 10:59:33
|
Author: scriptor Date: Mon Apr 13 12:59:25 2009 New Revision: 5596 URL: http://www.opensync.org/changeset/5596 Log: Corrected a debug message. Corrected output in ldap_format_print_format1() a bit. Modified: plugins/ldap-sync/src/ldap_format.c Modified: plugins/ldap-sync/src/ldap_format.c ============================================================================== --- plugins/ldap-sync/src/ldap_format.c Mon Apr 13 12:58:18 2009 (r5595) +++ plugins/ldap-sync/src/ldap_format.c Mon Apr 13 12:59:25 2009 (r5596) @@ -5946,7 +5946,7 @@ osync_trace(TRACE_INTERNAL, "%s:%i: This is the content of the OSyncXMLFormat:\n\"%.*s\"", __FILE__, __LINE__, xmlbuff_size, xmlbuff); - osync_trace(TRACE_EXIT, "%s(): str = %p", __func__, xmlbuff); + osync_trace(TRACE_EXIT, "%s(): xmlbuff = %p", __func__, xmlbuff); return (char *)xmlbuff; #endif @@ -5977,18 +5977,18 @@ } - str = g_string_new((const gchar *)"----- <list> -----\n"); + str = g_string_new((const gchar *)"\n"); if (str == NULL) { osync_error_set(&error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: str = NULL. Returning NULL.\n", __FILE__, __LINE__); goto error; } for (i = 0; i < g_list_length(list); i++) { - g_string_append_printf(str, "\n"); entry = (ldap_entry *)g_list_nth_data(list, i); if (entry == NULL) { osync_trace(TRACE_ERROR, "%s:%i: ERROR: entry = NULL with i = %u. Ignoring this LDAP entry.\n", __FILE__, __LINE__, i); g_string_append_printf(str, "\n"); + continue; } @@ -6039,7 +6039,6 @@ g_string_append_printf(str, "\n"); } // for (i = 0; i < g_list_length(list); i++) - g_string_append_printf(str, "----- </list> -----\n"); if (str && str->len && str->str) { osync_trace(TRACE_INTERNAL, "%s:%i:%s():\nstr->str = \"%s\"\n", __FILE__, __LINE__, __func__, str->str); |