[Opensync-commits] r5097 - trunk/opensync

[<dg...@su...>]

Author: bricks
Date: Sun Jan 11 12:48:50 2009
New Revision: 5097
URL: http://www.opensync.org/changeset/5097

Log:
made osync_return_if_fail macros public and added osync_return_val_if_fail_and_set_error, osync_return_if_fail_and_set_error

Modified:
   trunk/opensync/opensync.h
   trunk/opensync/opensync_internals.h

Modified: trunk/opensync/opensync.h
==============================================================================
--- trunk/opensync/opensync.h	Sun Jan 11 06:42:43 2009	(r5096)
+++ trunk/opensync/opensync.h	Sun Jan 11 12:48:50 2009	(r5097)
@@ -109,6 +109,29 @@
 #define osync_assert_msg(x, msg)
 #endif
 
+#define osync_return_if_fail(condition) do {    \
+    if (!(condition)) {                         \
+      return;                                   \
+    } } while (0)
+
+#define osync_return_val_if_fail(condition, val) do {   \
+    if (!(condition)) {                                 \
+      return (val);                                     \
+    } } while (0)
+
+
+#define osync_return_if_fail_and_set_error(condition, error, format, ...) do {  \
+	if (!(condition)) {													\
+		osync_error_set(error, OSYNC_ERROR_PARAMETER, format, __VA_ARGS__ )		\
+		return;															\
+	} while(0)
+
+#define osync_return_val_if_fail_and_set_error(condition, val, error, format, ...) do {	\
+	if (!(condition)) {																	\
+		osync_error_set(error, OSYNC_ERROR_PARAMETER, format, __VA_ARGS__ )				\
+		return (val);																	\
+	} while(0)
+
 typedef int osync_bool;
 
 /**************************************************************

Modified: trunk/opensync/opensync_internals.h
==============================================================================
--- trunk/opensync/opensync_internals.h	Sun Jan 11 06:42:43 2009	(r5096)
+++ trunk/opensync/opensync_internals.h	Sun Jan 11 12:48:50 2009	(r5097)
@@ -35,17 +35,6 @@
 extern int errno;
 #endif
 
-#define osync_return_if_fail(condition) do {    \
-    if (!(condition)) {                         \
-      return;                                   \
-    } } while (0)
-
-#define osync_return_val_if_fail(condition, val) do {   \
-    if (!(condition)) {                                 \
-      return (val);                                     \
-    } } while (0)
-
-
 #ifdef __GNUC__
 #define OSYNC_UNUSED __attribute__ ((unused))
 #else