Changeset 3549

Timestamp:

08/17/08 21:02:51 (4 months ago)

Author:

dgollub

Message:

Added some parameter sanity checks - asserts() and NULLSTR for traces.

Files:

• trunk/opensync/format/opensync_converter.c (modified) (4 diffs)

trunk/opensync/format/opensync_converter.c

@@ -46 +46 @@
 {
         OSyncFormatConverter *converter = NULL;
-        osync_trace(TRACE_ENTRY, "%s(%i, %s %p, %s %p, %p, %p)", __func__, type, osync_objformat_get_name(sourceformat), sourceformat, osync_objformat_get_name(targetformat), targetformat, convert_func, error);
+        osync_trace(TRACE_ENTRY, "%s(%i, %s %p, %s %p, %p, %p)", __func__, type, __NULLSTR(osync_objformat_get_name(sourceformat)), sourceformat, __NULLSTR(osync_objformat_get_name(targetformat)), targetformat, convert_func, error);
         
         converter = osync_try_malloc0(sizeof(OSyncFormatConverter), error);
@@ -233 +233 @@
         osync_bool free_input = FALSE;
         
-        osync_trace(TRACE_ENTRY, "%s(%p, %p, %s, %p)", __func__, converter, data, config, error);
+        osync_trace(TRACE_ENTRY, "%s(%p, %p, %s, %p)", __func__, converter, data, __NULLSTR(config), error);
         osync_trace(TRACE_INTERNAL, "Converter of type %i, from %p(%s) to %p(%s)", converter->type, converter->source_format, osync_objformat_get_name(converter->source_format), converter->target_format, osync_objformat_get_name(converter->target_format));
         
@@ -345 +345 @@
         osync_assert(path);
         osync_assert(edge);
+
         path->converters = g_list_append(path->converters, edge);
         osync_converter_ref(edge);
@@ -387 +388 @@
 {
         osync_assert(path);
+        osync_assert(config);
+
         if (path->config)
                 g_free(path->config);
+
         path->config = g_strdup(config);
 }