[Opensync-commits] r1204 - trunk/libsyncml

[<svn...@op...>]

Author: bellmich
Date: Mon Jul 13 18:16:09 2009
New Revision: 1204
URL: http://libsyncml.opensync.org/changeset/1204

Log:
more robust error setting

Modified:
   trunk/libsyncml/sml_error_internals.h

Modified: trunk/libsyncml/sml_error_internals.h
==============================================================================
--- trunk/libsyncml/sml_error_internals.h	Mon Jul 13 17:41:49 2009	(r1203)
+++ trunk/libsyncml/sml_error_internals.h	Mon Jul 13 18:16:09 2009	(r1204)
@@ -34,10 +34,13 @@
 		gchar *__sml_error_string = NULL; \
 		if (format) \
 			__sml_error_string = g_strdup_printf(format, ##__VA_ARGS__); \
+		const gchar *msg = smlErrorTypeGetMessage(type); \
+		if (!msg) \
+			msg = "There is no error."; \
 		if (__sml_error_string && strlen(__sml_error_string)) \
-			g_set_error(error, SML_ERROR, type, "%s %s", smlErrorTypeGetMessage(type), __sml_error_string); \
+			g_set_error(error, SML_ERROR, type, "%s %s", msg, __sml_error_string); \
 		else \
-			g_set_error(error, SML_ERROR, type, "Error %d: %s", type, smlErrorTypeGetMessage(type)); \
+			g_set_error(error, SML_ERROR, type, "Error %d: %s", type, msg); \
 		g_free(__sml_error_string);\
 	}