Menu
▾
▴
[Opensync-commits] r5352 - in plugins/ldap-sync: . src
|
From: <svn...@op...> - 2009-03-26 19:39:26
|
Author: scriptor Date: Thu Mar 26 20:39:18 2009 New Revision: 5352 URL: http://www.opensync.org/changeset/5352 Log: Typos. Modified: plugins/ldap-sync/ChangeLog 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/md5_crypt.c Modified: plugins/ldap-sync/ChangeLog ============================================================================== --- plugins/ldap-sync/ChangeLog Thu Mar 26 20:38:16 2009 (r5351) +++ plugins/ldap-sync/ChangeLog Thu Mar 26 20:39:18 2009 (r5352) @@ -9,7 +9,7 @@ -- cmake, -- sinks, -- new format of config file, - -- use of stylesheets for conversion, + -- use of style sheets for conversion, -- sourcing out the conversion routines into a separate format plugin -- and dozens of other API changes. - Several issues with the TLS/SSL based encryption of the LDAP session @@ -44,7 +44,7 @@ been resolved. - For the time being the objtype "contact" can be mapped either to the LDAP scheme "evolutionPerson" or to the - LDAP scheme "inetorgPerson". This can be configured. + LDAP scheme "inetOrgPerson". This can be configured. - The other objtypes are mapped to general object classes, like "ou:" and "document:", while some LDAP attribute names are abused for storing "name" and "value" pairs. Modified: plugins/ldap-sync/src/ldap_connect.c ============================================================================== --- plugins/ldap-sync/src/ldap_connect.c Thu Mar 26 20:38:16 2009 (r5351) +++ plugins/ldap-sync/src/ldap_connect.c Thu Mar 26 20:39:18 2009 (r5352) @@ -1151,7 +1151,7 @@ if (res == NULL) { - // xxx jl: TODO: Produce osync error message. + // TODO: Produce osync error message. osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: ldap_plugin_call_ldap_search() must have failed.\n", __FILE__, __LINE__); ldap_plugin_dump_ldap_error_message(sinkenv, "cn=Subschema", "(objectClass=subschema)", "ldap_plugin_call_ldap_search()"); @@ -1218,9 +1218,9 @@ * @param filter Which attributes are to be shown? * @param scope Which parts of the DIT are to be searched: * - * base: only the currrent location in the DIT, nothing else, - * one: one level deeper in the DIT withouth the current location, - * children: all levels below the current location in the DIT withouth the corrent one, + * base: only the current location in the DIT, nothing else, + * one: one level deeper in the DIT without the current location, + * children: all levels below the current location in the DIT without the current one, * sub: the current location in the DIT and all of its children * * @@ -1380,7 +1380,7 @@ * * @param ctx The libopensync context. * @param sinkenv The object type specific environment. - * @param rv As a result of this function this variabl gets filled with + * @param rv As a result of this function this variable gets filled with * ldap_errno: LDAP_SUCCESS on success, -1 on error. * @param dn The distinguished name of the entry in the DIT. * The entries below this one are to be deleted. @@ -1505,7 +1505,7 @@ (!strncmp(id_values[0]->bv_val, "RecurrenceRule", 14)) || (!strncmp(id_values[0]->bv_val, "RecurrenceRuleExtended", 22)) || (!strncmp(id_values[0]->bv_val, "EMail", 5)) - // Telepone: Not necessary to enter a deeper level. + // Telephone: Not necessary to enter a deeper level. ) { #ifdef DEBUG_change_type_deleted @@ -2539,7 +2539,7 @@ * in the hashtable has been calculated. * * @param ctx The libopensync context. - * @param sinkenv Object type specifi environment + * @param sinkenv Object type specific environment * @param uids_hashtable List of uids stored in the hashtable. * @param uids_ldap_server List of uids present on the LDAP server. * @param new_entries A list of LDAP entries that are new on the LDAP server @@ -2605,7 +2605,7 @@ ) { #ifdef DEBUG_fastsync - ldap_plugin_printf("Ok. Hashes are identical."); + ldap_plugin_printf("OK. Hashes are identical."); #endif } else { #ifdef DEBUG_fastsync @@ -3613,14 +3613,14 @@ /* Check entry attributes */ for (i = 0 ; check_entry->mods[i] ; i++) { - /* Search for checked attribute in LDAP attributel-list */ + /* Search for checked attribute in LDAP attribute-list */ for (list = g_list_first(ldap_attrnames) ; list ; list = g_list_next(list)) { ldap_attribute = (char*)list->data; // If the LDAP attribute in check_entry can be found among // the LDAP attributes present on the server, advance to the next one - // in check_entry (i.e. presetn on the peer) + // in check_entry (i.e. present on the peer) if (!strcmp(check_entry->mods[i]->mod_type, ldap_attribute)) goto next_mod_attribute; } @@ -3775,14 +3775,14 @@ if (mod) { if (mod->mod_type) { if (!strcmp(mod->mod_type, sinkenv->keyattr)) { - osync_trace(TRACE_INTERNAL, "%s(): Ok. Keyattribute \"%s\" found.", __func__, sinkenv->keyattr); + osync_trace(TRACE_INTERNAL, "%s(): OK. Keyattribute \"%s\" found.", __func__, sinkenv->keyattr); found_name = TRUE; if (mod->mod_bvalues) { if (mod->mod_bvalues[0]) { if (mod->mod_bvalues[0]->bv_val) { if (!strcmp(mod->mod_bvalues[0]->bv_val, entry->id)) { - osync_trace(TRACE_INTERNAL, "%s(): Ok. Value of keyattribute is identical to the identifier: \"%s\".", __func__, entry->id); + osync_trace(TRACE_INTERNAL, "%s(): OK. Value of keyattribute is identical to the identifier: \"%s\".", __func__, entry->id); found_value = TRUE; } else { osync_trace(TRACE_ERROR, "%s:%i: WARNING: Value of keyattribute \"%s\" conflicts with identifier \"%s\". Trying to enforce correct one.", __FILE__, __LINE__, mod->mod_bvalues[0]->bv_val, entry->id); @@ -3832,7 +3832,7 @@ /** * @brief Queries the LDAP server about the entryCSN attribute of - * one particular LDAP entry, and adds it to an already exising + * one particular LDAP entry, and adds it to an already existing * hash string, thus gradually building the final hash value. * * @param ctx The libopensync context. Modified: plugins/ldap-sync/src/ldap_debug.c ============================================================================== --- plugins/ldap-sync/src/ldap_debug.c Thu Mar 26 20:38:16 2009 (r5351) +++ plugins/ldap-sync/src/ldap_debug.c Thu Mar 26 20:39:18 2009 (r5352) @@ -128,10 +128,10 @@ ldap_plugin_printf("%s:%i: ERROR: ldap_get_option() has failed. result_code could not be filled in.", __FILE__, __LINE__); } else { if (result_code != 0) { - ldap_plugin_printf("%s:%i: ERROR: \"%s\" has returned NULL. Are your searchbase \"%s\" and your filter \"%s\" for this particular objtype \"%s\" ok?", __FILE__, __LINE__, command, base, filter, osync_objtype_sink_get_name(sinkenv->sink)); + ldap_plugin_printf("%s:%i: ERROR: \"%s\" has returned NULL. Are your searchbase \"%s\" and your filter \"%s\" for this particular objtype \"%s\" OK?", __FILE__, __LINE__, command, base, filter, osync_objtype_sink_get_name(sinkenv->sink)); ldap_plugin_printf("ERROR: %s", ldap_err2string(result_code)); } else { - ldap_plugin_printf("%s:%i: WARNING: \"%s\" has returned NULL. Are your searchbase \"%s\" and and your filter \"%s\" for this particular objtype \"%s\" ok? Or is there really not a single entry under the searchbase?", __FILE__, __LINE__, command, base, filter, osync_objtype_sink_get_name(sinkenv->sink)); + ldap_plugin_printf("%s:%i: WARNING: \"%s\" has returned NULL. Are your searchbase \"%s\" and your filter \"%s\" for this particular objtype \"%s\" OK? Or is there really not a single entry under the searchbase?", __FILE__, __LINE__, command, base, filter, osync_objtype_sink_get_name(sinkenv->sink)); } } } @@ -537,9 +537,9 @@ if (entry) { if (file == NULL) { - ldap_plugin_printf("%s:%i:%s(): \nThis error occured with id = %s, chtype = %i", __FILE__, __LINE__, __func__, entry->id, osync_change_get_changetype(change)); + ldap_plugin_printf("%s:%i:%s(): \nThis error occurred with id = %s, chtype = %i", __FILE__, __LINE__, __func__, entry->id, osync_change_get_changetype(change)); } else { - ldap_plugin_printf("%s:%i: \nThis error occured with id = %s, chtype = %i", file, line, entry->id, osync_change_get_changetype(change)); + ldap_plugin_printf("%s:%i: \nThis error occurred with id = %s, chtype = %i", file, line, entry->id, osync_change_get_changetype(change)); } // TODO @@ -547,9 +547,9 @@ } else if (dn && dn[0]) { if (file) { - ldap_plugin_printf("%s:%i: \nThis error occured with dn = %s, chtype = %i", file, line, dn, osync_change_get_changetype(change)); + ldap_plugin_printf("%s:%i: \nThis error occurred with dn = %s, chtype = %i", file, line, dn, osync_change_get_changetype(change)); } else { - ldap_plugin_printf("%s:%i:%s(): \nThis error occured with dn = %s, chtype = %i", __FILE__, __LINE__, __func__, dn, osync_change_get_changetype(change)); + ldap_plugin_printf("%s:%i:%s(): \nThis error occurred with dn = %s, chtype = %i", __FILE__, __LINE__, __func__, dn, osync_change_get_changetype(change)); } } @@ -570,7 +570,7 @@ #ifdef DEBUG_fastsync /** * @brief translate_changetype - * @parram changetype The changetype. + * @param changetype The changetype. * @returns The human readable name of the changetype in form of a string. * */ @@ -679,9 +679,9 @@ * @param string Sequence of characters to print out * @param len How long is this sequence * @param buffer As a result of this function this variable gets filled with - * a GString containing the dump. This GString must be free'd + * a GString containing the dump. This GString must be freed * later by means of g_string_free(). - * @param error The libopenync error pointer. + * @param error The libopensync error pointer. * * @returns FALSE on failure, TRUE on success * @@ -744,7 +744,7 @@ } } - /* padding spaces between end of binary and beginning of ascii */ + /* padding spaces between end of binary and beginning of ASCII */ g_string_append_printf(*buffer, " "); if (j % 16 != 0) { Modified: plugins/ldap-sync/src/ldap_format.c ============================================================================== --- plugins/ldap-sync/src/ldap_format.c Thu Mar 26 20:38:16 2009 (r5351) +++ plugins/ldap-sync/src/ldap_format.c Thu Mar 26 20:39:18 2009 (r5352) @@ -352,15 +352,16 @@ /** - * @brief A sanitizer for building the LDIF. It tries to avoid duplicate attriLDAPs. Helper function for ldap_format_convert_xmlinternal2ldap(). + * @brief A sanitizer for building the LDIF. It tries to avoid duplicate + * LDAP attributes. Helper function for ldap_format_convert_xmlinternal2ldap(). * * @param ldapmods A list of LDAPMod's that have already been collected * for building up an LDAP entry. \see{ldap_plugin.h} * @param name The LDAP attribute name that is to be checked for any - * potential dublicates + * potential duplicates * * @returns 0 if error - * @returns 1 if ok + * @returns 1 if OK * @returns 2 if duplicate found */ @@ -523,7 +524,7 @@ /** * @brief This function creates an ldap_entry struct out of several ldapmods of a GList * - * It also free's the ldapmods list + * It also frees the ldapmods list * * @param ldapmods: A GList out of LDAPMOD's. * @@ -679,7 +680,7 @@ if (list->data) { // We copy the source LDAP entries by creating a destination LDAP entry. // The memory regions used by the source and the destination LDAP entries - // must be independent from each other, so that they can be free'd + // must be independent from each other, so that they can be freed // separately. single_entry = (ldap_entry *)g_malloc0(sizeof(ldap_entry)); if (single_entry == NULL) { @@ -878,7 +879,7 @@ child_name = node->name; if (child_name == NULL) { - osync_trace(TRACE_ERROR, "%s:%i: ERROR: child_name = NULL. Ignoring thisnode.\n", __FILE__, __LINE__); + osync_trace(TRACE_ERROR, "%s:%i: ERROR: child_name = NULL. Ignoring this node.\n", __FILE__, __LINE__); continue; } @@ -906,7 +907,7 @@ // *attr2_name = g_strdup_printf("%s", xmlNodeGetContent(attribute_node)); *attr2_name = g_strdup_printf("%s", buf); } else { - osync_trace(TRACE_ERROR, "%s:%i: WARNING: Max. number of attributes already exhausted. Ignoring this one (name = \"%s\").\n", __FILE__, __LINE__, xmlNodeGetContent(attribute_node)); + osync_trace(TRACE_ERROR, "%s:%i: WARNING: Maximal number of attributes already exhausted. Ignoring this one (name = \"%s\").\n", __FILE__, __LINE__, xmlNodeGetContent(attribute_node)); } // if (*attr1_name == NULL) xmlFree(buf); @@ -926,7 +927,7 @@ } else if (*attr2_value == NULL) { *attr2_value = g_strdup_printf("%s", content1); } else { - osync_trace(TRACE_ERROR, "%s:%i: WARNING: Max. number of attributes already exhausted. Ignoring this one (value = \"%s\").\n", __FILE__, __LINE__, xmlNodeGetContent(attribute_node)); + osync_trace(TRACE_ERROR, "%s:%i: WARNING: Maximal number of attributes already exhausted. Ignoring this one (value = \"%s\").\n", __FILE__, __LINE__, xmlNodeGetContent(attribute_node)); } // if (*attr1_value == NULL) { xmlFree(content1); @@ -973,14 +974,14 @@ * counter to the element name: "TimezoneRule" turns into * "TimezoneRule_3", for example. Prerequisite is a container * that stores the number of elements with a particular name - * that have already occured. + * that have already occurred. * * @sa struct _complex_elements and typedef complex_elements. * @sa ldap_format_convert_xmlinternal2ldap(). * * @param ptr This is a pointer to a pointer to a GList which holds all * the names of complex XML elements that have already - * occured and have identical names. Thus we can get the number + * occurred and have identical names. Thus we can get the number * of identical names. And this number can be appended to * this common name, if we want to make them unique. * @param name This is the name of an XML element that is considered as @@ -1091,8 +1092,8 @@ xmlChar *value = NULL; GList *ldapmods_subentry = NULL; ldap_entry *ldap_subentry = NULL; - gchar *new_dn = NULL; // must be free'd eventually - gchar *new_id = NULL; // must be free'd eventually + gchar *new_dn = NULL; // must be freed eventually + gchar *new_id = NULL; // must be freed eventually gchar *attr1_name = NULL; gchar *attr1_value = NULL; gchar *attr2_name = NULL; @@ -1484,7 +1485,7 @@ ldapmods_subentry = NULL; } - // new_name is free'd in ldap_format_convert_xmlinternal2ldap() + // new_name is freed in ldap_format_convert_xmlinternal2ldap() if (attr1_name) { g_free(attr1_name); @@ -1522,7 +1523,7 @@ ldapmods_subentry = NULL; } - // new_name is free'd in ldap_format_convert_xmlinternal2ldap() + // new_name is freed in ldap_format_convert_xmlinternal2ldap() if (attr1_name) { g_free(attr1_name); @@ -1600,14 +1601,14 @@ /** * @brief This function validates the XML result as produced by the - * conversion routines and the stylesheets of this plugin + * conversion routines and the style sheets of this plugin * against the xmlformat schemata of libopensync. * * @param input The input for the conversion as a human readable string. * @param inpsize Its size. * @param xmlformat The format object for this XML document. * @param str The XML result to be validated as a human readable string. - * @param stylesheet_file The file name of the stylesheet that has been used + * @param stylesheet_file The file name of the style sheet that has been used * to produce the XML result. * @param error The libopensync error pointer * @@ -1648,7 +1649,7 @@ if (xmlformat_schema) { if (osync_xmlformat_schema_validate (xmlformat_schema, xmlformat, error)) { #ifdef DEBUG_do_apply_stylesheet - ldap_plugin_printf("%s:%i: Ok. XML result as produced by means of \"%s\" is valid.\n", __FILE__, __LINE__, stylesheet_file); + ldap_plugin_printf("%s:%i: OK. XML result as produced by means of \"%s\" is valid.\n", __FILE__, __LINE__, stylesheet_file); #endif @@ -1696,13 +1697,13 @@ /** * @brief This function validates the XML result as produced by the - * conversion routines and the stylesheets of this plugin + * conversion routines and the style sheets of this plugin * against the xmlformat schemata of libopensync. * * @param input The input for the conversion as a human readable string. * @param inpsize Its size. * @param xmlcard The XML result to be validated. This is an xmlDoc *. - * @param stylesheet_file The file name of the stylesheet that has been used + * @param stylesheet_file The file name of the style sheet that has been used * to produce the XML result. * @param error The libopensync error pointer * @@ -1811,10 +1812,10 @@ if (!xmlSchemaValidateDoc(dtd, xmlcard)) { #ifdef DEBUG_do_apply_stylesheet - ldap_plugin_printf("%s:%i: Ok. XML result as produced by means of \"%s\" is valid.", __FILE__, __LINE__, stylesheet_file); + ldap_plugin_printf("%s:%i: OK. XML result as produced by means of \"%s\" is valid.", __FILE__, __LINE__, stylesheet_file); #endif - osync_trace(TRACE_INTERNAL, "%s:%i: Ok. Resulting xmlformat as produced by means of \"%s\" is valid.", __FILE__, __LINE__, stylesheet_file); + osync_trace(TRACE_INTERNAL, "%s:%i: OK. Resulting xmlformat as produced by means of \"%s\" is valid.", __FILE__, __LINE__, stylesheet_file); #ifdef DEBUG_do_apply_stylesheet @@ -1918,17 +1919,17 @@ /** - * @brief This function checks whether the stylesheet file to be applied on - * a particular xml file is suitable for the objecttype that is + * @brief This function checks whether the style sheet file to be applied on + * a particular xml file is suitable for the object type that is * expressed in the root element. For example: * For object type "note" we MUST NOT apply "xmlformat_contact2ldap_evolutionperson.xsl" * * @param root_element The XML root element of an XML document. - * @param stylesheet_file The (short) name of the stylesheet that is intended + * @param stylesheet_file The (short) name of the style sheet that is intended * to be applied on a particular XML document. * @param error The libopensync error pointer. * - * @returns TRUE, if the stylesheet file is adequate for the given root_element, + * @returns TRUE, if the style sheet file is adequate for the given root_element, * FALSE otherwise. * */ @@ -1954,7 +1955,7 @@ if (!strcmp((char *)root_element->name, "contact")) { if (strcmp(stylesheet_file, STYLESHEET_XMLFORMAT_CONTACT2LDAP_EVOLUTIONPERSON) && (strcmp(stylesheet_file, STYLESHEET_XMLFORMAT_CONTACT2LDAP_INETORGPERSON))) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: For this root_element \"%s\" is \"%s\" the wrong stylesheet file. %s() is not prepared to convert this.\n", __FILE__, __LINE__, root_element->name, stylesheet_file, __FILE__); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: For this root_element \"%s\" is \"%s\" the wrong style sheet file. %s() is not prepared to convert this.\n", __FILE__, __LINE__, root_element->name, stylesheet_file, __FILE__); goto error; } } @@ -1962,7 +1963,7 @@ if (!strcmp((char *)root_element->name, "event")) { if (strcmp(stylesheet_file, STYLESHEET_XMLFORMAT_EVENT2LDAP_EVENT)) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: For this root_element \"%s\" is \"%s\" the wrong stylesheet file. %s() is not prepared to convert this.\n", __FILE__, __LINE__, root_element->name, stylesheet_file, __func__); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: For this root_element \"%s\" is \"%s\" the wrong style sheet file. %s() is not prepared to convert this.\n", __FILE__, __LINE__, root_element->name, stylesheet_file, __func__); goto error; } } @@ -1970,7 +1971,7 @@ if (!strcmp((char *)root_element->name, "todo")) { if (strcmp(stylesheet_file, STYLESHEET_XMLFORMAT_TODO2LDAP_TODO)) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: For this root_element \"%s\" is \"%s\" the wrong stylesheet file. %s() is not prepared to convert this.\n", __FILE__, __LINE__, root_element->name, stylesheet_file, __func__); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: For this root_element \"%s\" is \"%s\" the wrong style sheet file. %s() is not prepared to convert this.\n", __FILE__, __LINE__, root_element->name, stylesheet_file, __func__); goto error; } } @@ -1978,14 +1979,14 @@ if (!strcmp((char *)root_element->name, "note")) { if (strcmp(stylesheet_file, STYLESHEET_XMLFORMAT_NOTE2LDAP_NOTE)) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: For this root_element \"%s\" is \"%s\" the wrong stylesheet file. %s() is not prepared to convert this.\n", __FILE__, __LINE__, root_element->name, stylesheet_file, __func__); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: For this root_element \"%s\" is \"%s\" the wrong style sheet file. %s() is not prepared to convert this.\n", __FILE__, __LINE__, root_element->name, stylesheet_file, __func__); goto error; } } if (!strcmp((char *)root_element->name, FORMAT_LDAP_EVOLUTIONPERSON)) { if (strcmp(stylesheet_file, STYLESHEET_LDAP_EVOLUTIONPERSON2XMLFORMAT_CONTACT)) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: For this root_element \"%s\" is \"%s\" the wrong stylesheet file. %s() is not prepared to convert this.\n", __FILE__, __LINE__, root_element->name, stylesheet_file, __func__); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: For this root_element \"%s\" is \"%s\" the wrong style sheet file. %s() is not prepared to convert this.\n", __FILE__, __LINE__, root_element->name, stylesheet_file, __func__); goto error; } } @@ -1993,7 +1994,7 @@ if (!strcmp((char *)root_element->name, FORMAT_LDAP_INETORGPERSON)) { if (strcmp(stylesheet_file, STYLESHEET_LDAP_INETORGPERSON2XMLFORMAT_CONTACT)) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: For this root_element \"%s\" is \"%s\" the wrong stylesheet file. %s() is not prepared to convert this.\n", __FILE__, __LINE__, root_element->name, stylesheet_file, __func__); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: For this root_element \"%s\" is \"%s\" the wrong style sheet file. %s() is not prepared to convert this.\n", __FILE__, __LINE__, root_element->name, stylesheet_file, __func__); goto error; } } @@ -2001,7 +2002,7 @@ if (!strcmp((char *)root_element->name, FORMAT_LDAP_EVENT)) { if (strcmp(stylesheet_file, STYLESHEET_LDAP_EVENT2XMLFORMAT_EVENT)) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: For this root_element \"%s\" is \"%s\" the wrong stylesheet file. %s() is not prepared to convert this.\n", __FILE__, __LINE__, root_element->name, stylesheet_file, __func__); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: For this root_element \"%s\" is \"%s\" the wrong style sheet file. %s() is not prepared to convert this.\n", __FILE__, __LINE__, root_element->name, stylesheet_file, __func__); goto error; } } @@ -2009,7 +2010,7 @@ if (!strcmp((char *)root_element->name, FORMAT_LDAP_TODO)) { if (strcmp(stylesheet_file, STYLESHEET_LDAP_TODO2XMLFORMAT_TODO)) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: For this root_element \"%s\" is \"%s\" the wrong stylesheet file. %s() is not prepared to convert this.\n", __FILE__, __LINE__, root_element->name, stylesheet_file, __func__); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: For this root_element \"%s\" is \"%s\" the wrong style sheet file. %s() is not prepared to convert this.\n", __FILE__, __LINE__, root_element->name, stylesheet_file, __func__); goto error; } } @@ -2017,7 +2018,7 @@ if (!strcmp((char *)root_element->name, FORMAT_LDAP_NOTE)) { if (strcmp(stylesheet_file, STYLESHEET_LDAP_NOTE2XMLFORMAT_NOTE)) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: For this root_element \"%s\" is \"%s\" the wrong stylesheet file. %s() is not prepared to convert this.\n", __FILE__, __LINE__, root_element->name, stylesheet_file, __func__); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: For this root_element \"%s\" is \"%s\" the wrong style sheet file. %s() is not prepared to convert this.\n", __FILE__, __LINE__, root_element->name, stylesheet_file, __func__); goto error; } } @@ -2052,7 +2053,7 @@ * @param outpsize The will contain the size of the output * @param config ??? * @param userdata ??? - * @param stylesheet_file The particular XSLT stylesheet to be used. + * @param stylesheet_file The particular XSLT style sheet to be used. * @param error if something bad happens and you cannot convert, set the error! * */ @@ -2160,7 +2161,7 @@ } - // Construct an absolute path to the stylesheet file + // Construct an absolute path to the style sheet file path = LDAP_PLUGIN_OPENSYNC_CONFIGDIR; errno = 0; @@ -2177,7 +2178,7 @@ goto error; } - // Load the stylesheet file + // Load the style sheet file stylesheet_ptr = xsltParseStylesheetFile((xmlChar *)fullpath); if (stylesheet_ptr == NULL) { osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: xsltParseStylesheetFile() has failed.\n", __FILE__, __LINE__); @@ -2186,7 +2187,7 @@ // Check whether the root element can be found in the input xmlDoc, - // and whether the stylesheet file to be applied upon it is an + // and whether the style sheet file to be applied upon it is an // adequate one in terms of the related objtype: xmlNode *root_element = xmlDocGetRootElement(input_doc); if (!ldap_format_check_adequate_stylesheet(root_element, stylesheet_file, error)) { @@ -2232,7 +2233,7 @@ if (xmlbuffer_size >= 6) { if (!strncmp((char *)xmlbuffer, "<?xml ", 6)) { #ifdef DEBUG_do_apply_stylesheet - ldap_plugin_printf("%s:%i: Ok. xmlbuffer starts with <?xml.", __FILE__, __LINE__); + ldap_plugin_printf("%s:%i: OK. xmlbuffer starts with <?xml.", __FILE__, __LINE__); #endif } else { osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: xmlbuffer starts with \"%.6s\"\n", __FILE__, __LINE__, xmlbuffer); @@ -2277,7 +2278,7 @@ osync_trace(TRACE_INTERNAL, "%s:%i: xmlformat = %p", __FILE__, __LINE__, xmlformat); - osync_trace(TRACE_INTERNAL, "%s:%i: This needs to be free'd eventually. But by whom? And where and when exactly?", __FILE__, __LINE__); + osync_trace(TRACE_INTERNAL, "%s:%i: This needs to be freed eventually. But by whom? And where and when exactly?", __FILE__, __LINE__); #ifdef DEBUG_do_apply_stylesheet @@ -2660,7 +2661,7 @@ continue; } - // Ok. We have found a subentry. + // OK. We have found a subentry. node2 = node->xmlChildrenNode; if (!node2) { @@ -2668,7 +2669,7 @@ continue; } - // Ok. Subentry has children. + // OK. Subentry has children. if (node2->name == NULL) { osync_trace(TRACE_ERROR, "%s:%i: WARNING: node2->name = NULL. Ignoring.", __FILE__, __LINE__); @@ -2775,7 +2776,7 @@ // Generate an xmlDoc - a rather dumb one. - // This is the xmlDoc the various stylesheets can and must + // This is the xmlDoc the various style sheets can and must // be applied on, in order to get a format understood by other // plugins doc = xmlNewDoc((xmlChar*)"1.0"); @@ -3051,7 +3052,7 @@ if (name[0] == 0) { - osync_trace(TRACE_ERROR, "%s:%i: ERROR: name[0] = 0. i = %u, j = %u, k = %u. Continueing.\n", __FILE__, __LINE__, i, j, k); + osync_trace(TRACE_ERROR, "%s:%i: ERROR: name[0] = 0. i = %u, j = %u, k = %u. Continuing.\n", __FILE__, __LINE__, i, j, k); continue; } @@ -3059,7 +3060,7 @@ // Hmmm. value = NULL does NOT ALWAYS seem to be a problem. Strange... if (value == NULL) { #ifdef DEBUG_convert_ldap2xmlinternal - osync_trace(TRACE_INTERNAL, "%s:%i: WARNING: value = NULL. name = \"%s\". i = %u, j = %u, k = %u. Continueing.\n", __FILE__, __LINE__, name, i, j, k); + osync_trace(TRACE_INTERNAL, "%s:%i: WARNING: value = NULL. name = \"%s\". i = %u, j = %u, k = %u. Continuing.\n", __FILE__, __LINE__, name, i, j, k); #endif continue; } @@ -3421,7 +3422,7 @@ * a distinguished name and a unique identifier in order to become * a complete LDAP entry that can be fed to the libldap API. * - * @param xmlnode The childnode of the XML document, containing elements + * @param xmlnode The child node of the XML document, containing elements * which are supposed to be converted into LDAP entries. * @param objtype The object type in terms of libopensync: "contact", "event", * "todo" or "note". @@ -3429,7 +3430,7 @@ * represents, for example,"ou=addressbook" (for contacts) or * "ou=calendar" or the tasks/todos for the notes. Note: Here in the * format plugin dn will be empty: "". - * @param complex_element_lists Several lists of special xmlnodes, + * @param complex_element_lists Several lists of special XML nodes, * which require special treatment, until a * more general approach has been implemented. * See also ldap_format_add_counter_suffix(). @@ -3440,7 +3441,7 @@ * ldapmods (= one level below "ou=addressbook", for example). * @param error The libopensync error pointer. * - * @returns TRUE on sucess, FALSE in case of any error + * @returns TRUE on success, FALSE in case of any error * */ 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) @@ -3763,7 +3764,7 @@ * for contacts) or the calendar ("ou=calendar" for events, * for instance) or the tasks/todos or the notes. * Note: Here in the format plugin dn is empty: "". - * @param potential_subentries The resuling list of LDAP subentries. + * @param potential_subentries The resulting list of LDAP subentries. * @param ldap_entries The resulting list of LDAP entries. * @param error The libopensync error pointer. * @@ -4219,7 +4220,7 @@ * @param outpsize Its size. * @param free_input * "You need to set this to TRUE if opensync - * can free the input after the conversion (so you dont + * can free the input after the conversion (so you don't * use any reference from or to the input). An example where * *free_input = FALSE; needs to be done would be an encapsulator * that stores the input reference somewhere in its struct." @@ -4428,7 +4429,7 @@ * * @param free_input * "You need to set this to TRUE if opensync - * can free the input after the conversion (so you dont + * can free the input after the conversion (so you don't * use any reference from or to the input). An example where * *free_input = FALSE; needs to be done would be an encapsulator * that stores the input reference somewhere in its struct." @@ -4487,7 +4488,7 @@ * * @param free_input * "You need to set this to TRUE if opensync - * can free the input after the conversion (so you dont + * can free the input after the conversion (so you don't * use any reference from or to the input). An example where * *free_input = FALSE; needs to be done would be an encapsulator * that stores the input reference somewhere in its struct." @@ -4554,7 +4555,7 @@ * first element of this list. It's a linked list.) * @param free_input Whether or not the input is to be freed, eventually. * "You need to set this to TRUE if opensync - * can free the input after the conversion (so you dont + * can free the input after the conversion (so you don't * use any reference from or to the input). An example where * *free_input = FALSE; needs to be done would be an encapsulator * that stores the input reference somewhere in its struct." @@ -4725,19 +4726,19 @@ /** - * @brief Entry function for converting fromi xmlformat-contact to the + * @brief Entry function for converting from xmlformat-contact to the * ldap-sync plugin internal format. * * @param input The data you need to convert * @param inpsize The size of the input data * @param output This will contain the result of the conversion. It will be - * an OSyncXMLFormat, although being transferred bytewise - * as char *. It needs to be free'd, eventually. + * an OSyncXMLFormat, although being transferred byte wise + * as char *. It needs to be freed, eventually. * But by whom? And where and when, exactly? * @param outpsize The will contain the size of the output * @param free_input * "You need to set this to TRUE if opensync - * can free the input after the conversion (so you dont + * can free the input after the conversion (so you don't * use any reference from or to the input). An example where * *free_input = FALSE; needs to be done would be an encapsulator * that stores the input reference somewhere in its struct." @@ -4796,18 +4797,18 @@ /** - * @brief Entry function for converting fromi xmlformat-contact to the + * @brief Entry function for converting from xmlformat-contact to the * ldap-sync plugin internal format. * * @param input The data you need to convert * @param inpsize The size of the input data * @param output This will contain the result of the conversion. It will be - * an OSyncXMLFormat, that needs to be free'd, eventually. + * an OSyncXMLFormat, that needs to be freed, eventually. * But by whom? And where and when, exactly? * @param outpsize The will contain the size of the output * @param free_input * "You need to set this to TRUE if opensync - * can free the input after the conversion (so you dont + * can free the input after the conversion (so you don't * use any reference from or to the input). An example where * *free_input = FALSE; needs to be done would be an encapsulator * that stores the input reference somewhere in its struct." @@ -4878,7 +4879,7 @@ * * @param free_input * "You need to set this to TRUE if opensync - * can free the input after the conversion (so you dont + * can free the input after the conversion (so you don't * use any reference from or to the input). An example where * *free_input = FALSE; needs to be done would be an encapsulator * that stores the input reference somewhere in its struct." @@ -4932,7 +4933,7 @@ * * @param free_input * "You need to set this to TRUE if opensync - * can free the input after the conversion (so you dont + * can free the input after the conversion (so you don't * use any reference from or to the input). An example where * *free_input = FALSE; needs to be done would be an encapsulator * that stores the input reference somewhere in its struct." @@ -4990,7 +4991,7 @@ * * @param free_input * "You need to set this to TRUE if opensync - * can free the input after the conversion (so you dont + * can free the input after the conversion (so you don't * use any reference from or to the input). An example where * *free_input = FALSE; needs to be done would be an encapsulator * that stores the input reference somewhere in its struct." @@ -5042,7 +5043,7 @@ * * @param free_input * "You need to set this to TRUE if opensync - * can free the input after the conversion (so you dont + * can free the input after the conversion (so you don't * use any reference from or to the input). An example where * *free_input = FALSE; needs to be done would be an encapsulator * that stores the input reference somewhere in its struct." @@ -5104,7 +5105,7 @@ * * @param free_input * "You need to set this to TRUE if opensync - * can free the input after the conversion (so you dont + * can free the input after the conversion (so you don't * use any reference from or to the input). An example where * *free_input = FALSE; needs to be done would be an encapsulator * that stores the input reference somewhere in its struct." @@ -5164,7 +5165,7 @@ * * @param free_input * "You need to set this to TRUE if opensync - * can free the input after the conversion (so you dont + * can free the input after the conversion (so you don't * use any reference from or to the input). An example where * *free_input = FALSE; needs to be done would be an encapsulator * that stores the input reference somewhere in its struct." @@ -5236,21 +5237,21 @@ * * I have disabled this currently, because of * memory errors. The destroy function is called twice, - * even if there is only a single LDAP entry to be free'd. + * even if there is only a single LDAP entry to be freed. * * It seems, that the *input is copied anywhere in the * dungeons of libopensync. Of course, this does not work, * as *input is not just a string that can be copied in a simple way. * It is rather a GList, i.e. a container holding pointers to * a linked list of LDAP entries. Such a list and especially the - * LDAP entries MUST NOT be free'd twice! + * LDAP entries MUST NOT be freed twice! * * Only possible workaround, right now, is disabling the destroy * function completely. Which leads to leaks, of course. * * * @param input This seems to be the GList, that I would have - * free'd in ldap_plugin_get_changes() otherwise. + * freed in ldap_plugin_get_changes() otherwise. * @param inpsize * @param user_data And what is this, anyway??? * @@ -5345,7 +5346,7 @@ * This function can be used to duplicate your format. * Duplication does not mean to make 2 objects out of one, * but to change to uid of the object in such a way that it - * differes from the original uid. + * differs from the original uid. * * Most format will never need this. * @@ -5382,7 +5383,7 @@ * @param user_data ????????? * * @returns a string describing the format data. This string was previously - * a GString and as such it is to be free'd eventually by means of + * a GString and as such it is to be freed eventually by means of * g_string_free(). */ @@ -5425,7 +5426,7 @@ 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. Ignoringthis LDAP entry.\n", __FILE__, __LINE__, i); + 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; } @@ -5646,7 +5647,7 @@ * * @param free_input * "You need to set this to TRUE if opensync - * can free the input after the conversion (so you dont + * can free the input after the conversion (so you don't * use any reference from or to the input). An example where * *free_input = FALSE; needs to be done would be an encapsulator * that stores the input reference somewhere in its struct." @@ -5795,7 +5796,7 @@ * @param env Format specific environment * @param error libopensync error pointer. * - * @returns TRUE on sucess, FALSE on error. + * @returns TRUE on success, FALSE on error. */ osync_bool get_conversion_info(OSyncFormatEnv *env, OSyncError **error) { @@ -5812,7 +5813,7 @@ 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 anc check the resulting config.h for LDAP_PLUGIN_OPENSYNC_CONFIGDIR.\n", __FILE__, __LINE__, path, strerror(errno)); + 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)); goto error; } Modified: plugins/ldap-sync/src/ldap_plugin.c ============================================================================== --- plugins/ldap-sync/src/ldap_plugin.c Thu Mar 26 20:38:16 2009 (r5351) +++ plugins/ldap-sync/src/ldap_plugin.c Thu Mar 26 20:39:18 2009 (r5352) @@ -236,9 +236,9 @@ * that pass a "plugin_environment *" instead of "sink_environment *". * * @param ctx The libopensync context. - * @param sink The sink specific environ The sink specific environment The sink specific environment The sink specific environment The sink specific environment The sink specific environment The sink specific environment The sink specific environment The sink specific environment ment - * @param userdata - * @param sinkenv + * @param sink The pointer for an objtype. + * @param userdata The void pointer that is expected to carry sinkenv. + * @param sinkenv The sink specific environment. * @param error The libopensync error pointer. * * @returns TRUE on success, FALSE in case of any error @@ -272,7 +272,7 @@ if (((sink_environment *)userdata)->magic) { - // Unexepected case: magic is empty: + // Unexpected case: magic is empty: if (((sink_environment *)userdata)->magic[0] == 0) { if (((plugin_environment *)userdata)->magic) { if (((plugin_environment *)userdata)->magic[0] == 0) { @@ -301,11 +301,11 @@ for (s = ((plugin_environment *)userdata)->sink_envs; s; s = s->next) { sink_environment *tmp = s->data; if (tmp == NULL) { - osync_trace(TRACE_INTERNAL, "%s:%i: INFO: tmp = NULL. Continueing.", __FILE__, __LINE__); + osync_trace(TRACE_INTERNAL, "%s:%i: INFO: tmp = NULL. Continuing.", __FILE__, __LINE__); continue; } else { if (tmp->sink == NULL) { - osync_trace(TRACE_INTERNAL, "%s:%i: INFO: tmp->sink = NULL. Continueing. ", __FILE__, __LINE__); + osync_trace(TRACE_INTERNAL, "%s:%i: INFO: tmp->sink = NULL. Continuing. ", __FILE__, __LINE__); continue; } else { if (sink == tmp->sink) { @@ -314,7 +314,7 @@ break; } else { - osync_trace(TRACE_INTERNAL, "%s:%i: INFO: sink != tmp->sink. Continueing.", __FILE__, __LINE__); + osync_trace(TRACE_INTERNAL, "%s:%i: INFO: sink != tmp->sink. Continuing.", __FILE__, __LINE__); } } } @@ -568,7 +568,7 @@ * @param config Via this pointer the configuration file can be accessed. * @param error libopensync error pointer * - * @returns TRUE on successfull parsing, FALSE on any error. + * @returns TRUE on successful parsing, FALSE on any error. */ osync_bool ldap_plugin_parse_config(OSyncPluginInfo *info, sink_environment *sinkenv, const char *objtype, OSyncPluginConfig * config, OSyncError **error) @@ -734,7 +734,7 @@ sinkenv->storebase = g_strdup(val); } - // Perhaps I should "hardcode" this: + // Perhaps I should "hard code" this? Not sure... sinkenv->keyattr = (char *)"uid"; } else // For objtype "event" only @@ -774,7 +774,7 @@ sinkenv->storebase = g_strdup(val); } - // Perhaps I should "hardcode" this: + // Perhaps I should "hard code" this? Not sure... sinkenv->keyattr = (char *)"documentIdentifier"; } // For objtype "todo" only @@ -814,7 +814,7 @@ sinkenv->storebase = g_strdup(val); } - // Perhaps I should "hardcode" this: + // Perhaps I should "hard code" this? Not sure... sinkenv->keyattr = (char *)"documentIdentifier"; } // For objtype "note" only @@ -856,7 +856,7 @@ sinkenv->storebase = g_strdup(val); } - // Perhaps I should "hardcode" this: + // Perhaps I should "hard code" this? Not sure... sinkenv->keyattr = (char *)"documentIdentifier"; } @@ -2021,11 +2021,11 @@ - //If you use opensync hashtables you can detect if you need - //to do a slow-sync and set this on the hashtable directly. - //Otherwise you have to make 2 functions like "get_changes" and - //"get_all" and decide which one to use by using - //osync_member_get_slow_sync + // If you use opensync hashtables you can detect if you need + // to do a slow-sync and set this on the hashtable directly. + // Otherwise you have to make 2 functions like "get_changes" and + // "get_all" and decide which one to use by using + // osync_member_get_slow_sync // ----------------- slow-sync ------------------- @@ -2265,7 +2265,7 @@ } /** - * ldaplist_added must be free'd later. + * ldaplist_added must be freed later. * Maybe in the destroy function ldap_format_destroy_format1() * But even this seems to be to early. */ @@ -2279,7 +2279,7 @@ } /** - * ldaplist_modified must be free'd later. + * ldaplist_modified must be freed later. * Maybe in the destroy function ldap_format_destroy_format1() * But even this seems to be too early. */ @@ -2704,7 +2704,7 @@ * @param sinkenv Object specific environment * @param debug_id The identifier. * @param hash This is the hash as calculated before. It is to be checked - * agains the real hash value, as found on the LDAP server. + * against the real hash value, as found on the LDAP server. * @param error The libopensync error pointer. * @returns TRUE if both hash values are equal, FALSE, otherwise. * @@ -2763,7 +2763,7 @@ if (strlen(theoretical_hash) == strlen(actual_hash) && !strcmp(theoretical_hash, actual_hash)) { #ifdef DEBUG_hash - ldap_plugin_printf("%s:%i: Ok. Hash has been built correctly for id = \"%s\"", __FILE__, __LINE__, debug_id); + ldap_plugin_printf("%s:%i: OK. Hash has been built correctly for id = \"%s\"", __FILE__, __LINE__, debug_id); #endif rv = TRUE; } else { @@ -2843,7 +2843,7 @@ } if (result == NULL) { - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: reult = NULL.\n", __FILE__, __LINE__); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: result = NULL.\n", __FILE__, __LINE__); goto error; } @@ -3139,7 +3139,7 @@ ldap_get_option(sinkenv->ld, LDAP_OPT_RESULT_CODE, &result_code); - // Ok. This error is expected. ldap_add_ext_s() is due. + // OK. This error is expected. ldap_add_ext_s() is due. if (result_code == LDAP_NO_SUCH_OBJECT) { #ifdef DEBUG_change_type_modified @@ -3154,7 +3154,7 @@ // Check for possibly missing LDAP_MOD_BVALUES if (!ldap_plugin_check_for_mod_op(entry, &mod_op_rv, error)) { if (!osync_error_is_set(error)) - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: dap_plugin_check_for_mod_op() has failed."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: ldap_plugin_check_for_mod_op() has failed."); goto error; } @@ -3201,27 +3201,27 @@ } } else { - // Ok. ldap_search has finished successfully. The LDAP entry is + // OK. ldap_search has finished successfully. The LDAP entry is // present both at the server and the peer's side. // Check for possibly missing LDAP_MOD_BVALUES if (!ldap_plugin_check_for_mod_op(entry, &mod_op_rv, error)) { if (!osync_error_is_set(error)) - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: dap_plugin_check_for_mod_op() has failed."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: ldap_plugin_check_for_mod_op() has failed."); goto error; } // Detect any changes in order to keep only those attributes - // in the LDAP entry tha have been modified, rather than all of them. + // in the LDAP entry that have been modified, rather than all of them. ldap_plugin_detect_attribute_changes (ctx, sinkenv, entry, error); // Check for possibly missing LDAP_MOD_BVALUES if (!ldap_plugin_check_for_mod_op(entry, &mod_op_rv, error)) { if (!osync_error_is_set(error)) - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: dap_plugin_check_for_mod_op() has failed."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: ldap_plugin_check_for_mod_op() has failed."); goto error; } @@ -3236,7 +3236,7 @@ // the identifier. if (!ldap_plugin_check_for_keyattribute(sinkenv, entry, error)) { if (!osync_error_is_set(error)) - osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: dap_plugin_check_for_keyattribute() has failed."); + osync_error_set(error, OSYNC_ERROR_GENERIC, "%s:%i: ERROR: ldap_plugin_check_for_keyattribute() has failed."); goto error; } @@ -3799,7 +3799,7 @@ goto error; } - //Dont forget to answer the call on error + // Don't forget to answer the call on error goto check_commit_status; @@ -3829,7 +3829,7 @@ } - //Dont forget to answer the call on error + //Don't forget to answer the call on error goto check_commit_status; @@ -3859,7 +3859,7 @@ ldap_entries = NULL; - //Dont forget to answer the call on error + //Don't forget to answer the call on error goto check_commit_status; @@ -4647,12 +4647,12 @@ sink_environment *sinkenv = s->data; if (sinkenv == NULL) { - osync_trace(TRACE_INTERNAL, "%s:%i: INFO: sinkenv = NULL. Continueing.\n", __FILE__, __LINE__); + osync_trace(TRACE_INTERNAL, "%s:%i: INFO: sinkenv = NULL. Continuing.\n", __FILE__, __LINE__); continue; } if (sinkenv->sink == NULL) { - osync_trace(TRACE_INTERNAL, "%s:%i: INFO: sinkenv->sink = NULL. Continueing.\n", __FILE__, __LINE__); + osync_trace(TRACE_INTERNAL, "%s:%i: INFO: sinkenv->sink = NULL. Continuing.\n", __FILE__, __LINE__); continue; } Modified: plugins/ldap-sync/src/md5_crypt.c ============================================================================== --- plugins/ldap-sync/src/md5_crypt.c Thu Mar 26 20:38:16 2009 (r5351) +++ plugins/ldap-sync/src/md5_crypt.c Thu Mar 26 20:39:18 2009 (r5352) @@ -114,8 +114,8 @@ /** - * @brief Computates the md5 hash for a string of size size - * @param passwd The string of which we want to know the md5 hash + * @brief Computes the md5 hash for a string of size size. + * @param passwd The string of which we want to know the md5 hash. * @param size The length of this string. * @returns The md5 hash of this string. */ @@ -161,7 +161,7 @@ return NULL; } - // Create hexa string from MD5 digest + // Create hexadecimal string from MD5 digest { unsigned char *digest = gcry_md_read (md5, GCRY_MD_MD5); unsigned int i; @@ -182,7 +182,7 @@ /** - * @brief Caculates an md5 hash of a string of xmlChar's. + * @brief Calculates an md5 hash of a string of xmlChar's. * @param mem The string of which we want to know the md5 hash. * @param len Its length. * @returns The md5 hash of this string. |
