From: Aurelien Jacobs <redacted>
Date: Mon, 2 Jun 2014 10:07:50 +0000 (+0200)
Subject: Add format string support to RETURN_ERROR() and RETURN_FAIL().
X-Git-Tag: libserialport-0.1.1~133
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=8edf649cafb84f8ca00b49412fd93829174438cb;p=libserialport.git

Add format string support to RETURN_ERROR() and RETURN_FAIL().
---

diff --git a/serialport.c b/serialport.c
index 5a88b40..89fbcec 100644
--- a/serialport.c
+++ b/serialport.c
@@ -166,10 +166,10 @@ void (*sp_debug_handler)(const char *format, ...) = sp_default_debug_handler;
 
 /* Debug output macros. */
 #define DEBUG(fmt, ...) do { if (sp_debug_handler) sp_debug_handler(fmt ".\n", ##__VA_ARGS__); } while (0)
-#define DEBUG_ERROR(err, msg) DEBUG("%s returning " #err ": " msg, __func__)
-#define DEBUG_FAIL(msg) do { \
+#define DEBUG_ERROR(err, fmt, ...) DEBUG("%s returning " #err ": " fmt, __func__, ##__VA_ARGS__)
+#define DEBUG_FAIL(fmt, ...) do {               \
 	char *errmsg = sp_last_error_message(); \
-	DEBUG("%s returning SP_ERR_FAIL: " msg ": %s", __func__, errmsg); \
+	DEBUG("%s returning SP_ERR_FAIL: "fmt": %s", __func__,##__VA_ARGS__,errmsg); \
 	sp_free_error_message(errmsg); \
 } while (0);
 #define RETURN() do { DEBUG("%s returning", __func__); return; } while(0)
@@ -184,8 +184,8 @@ void (*sp_debug_handler)(const char *format, ...) = sp_default_debug_handler;
 	} \
 } while (0)
 #define RETURN_OK() RETURN_CODE(SP_OK);
-#define RETURN_ERROR(err, msg) do { DEBUG_ERROR(err, msg); return err; } while (0)
-#define RETURN_FAIL(msg) do { DEBUG_FAIL(msg); return SP_ERR_FAIL; } while (0)
+#define RETURN_ERROR(err, ...) do { DEBUG_ERROR(err, __VA_ARGS__); return err; } while (0)
+#define RETURN_FAIL(...) do { DEBUG_FAIL(__VA_ARGS__); return SP_ERR_FAIL; } while (0)
 #define RETURN_VALUE(fmt, x) do { \
 	typeof(x) _x = x; \
 	DEBUG("%s returning " fmt, __func__, _x); \