From: <dg...@su...> - 2009-01-14 22:30:49
|
Author: dgollub Date: Wed Jan 14 23:30:03 2009 New Revision: 5150 URL: http://www.opensync.org/changeset/5150 Log: Fix typo in header file, fixes doxygen parameter-mismatch warning. Don't run detection if detected_format reference is not set, since there is no way to return the detection result. Modified: trunk/opensync/format/opensync_format_env.c trunk/opensync/format/opensync_format_env.h Modified: trunk/opensync/format/opensync_format_env.c ============================================================================== --- trunk/opensync/format/opensync_format_env.c Wed Jan 14 23:29:06 2009 (r5149) +++ trunk/opensync/format/opensync_format_env.c Wed Jan 14 23:30:03 2009 (r5150) @@ -972,6 +972,11 @@ { OSyncData *new_data = NULL; OSyncList *d = NULL; + + /* If detected_format is NULL, there is no reason to run the detection + * without any chance to report the result + */ + osync_return_val_if_fail(detected_format, TRUE); osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, env, input, error); Modified: trunk/opensync/format/opensync_format_env.h ============================================================================== --- trunk/opensync/format/opensync_format_env.h Wed Jan 14 23:29:06 2009 (r5149) +++ trunk/opensync/format/opensync_format_env.h Wed Jan 14 23:30:03 2009 (r5150) @@ -191,7 +191,7 @@ * @returns TRUE when format detection successfully completed, FALSE on any error. * */ -OSYNC_EXPORT osync_bool osync_format_env_detect_objformat_full(OSyncFormatEnv *env, OSyncData *input, OSyncObjFormat **deteted_format, OSyncError **error); +OSYNC_EXPORT osync_bool osync_format_env_detect_objformat_full(OSyncFormatEnv *env, OSyncData *input, OSyncObjFormat **detected_format, OSyncError **error); /** @brief Convert a data object using a specific conversion path * |