mirror/libserialport
mirror/libserialport
1
0
Fork 0
mirror of git://sigrok.org/libserialport synced 2023-08-10 21:13:24 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Aurelien Jacobs 2014-06-02 12:07:50 +02:00
parent 41a6f28718
commit 8edf649caf
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
serialport.c
View File

@ -166,10 +166,10 @@ void (*sp_debug_handler)(const char *format, ...) = sp_default_debug_handler;
/* Debug output macros. */ /* Debug output macros. */
#define DEBUG(fmt, ...) do { if (sp_debug_handler) sp_debug_handler(fmt ".\n", ##__VA_ARGS__); } while (0) #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_ERROR(err, fmt, ...) DEBUG("%s returning " #err ": " fmt, __func__, ##__VA_ARGS__)
#define DEBUG_FAIL(msg) do { \ #define DEBUG_FAIL(fmt, ...) do { \
char *errmsg = sp_last_error_message(); \ 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); \ sp_free_error_message(errmsg); \
} while (0); } while (0);
#define RETURN() do { DEBUG("%s returning", __func__); return; } 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) } while (0)
#define RETURN_OK() RETURN_CODE(SP_OK); #define RETURN_OK() RETURN_CODE(SP_OK);
#define RETURN_ERROR(err, msg) do { DEBUG_ERROR(err, msg); return err; } while (0) #define RETURN_ERROR(err, ...) do { DEBUG_ERROR(err, __VA_ARGS__); return err; } while (0)
#define RETURN_FAIL(msg) do { DEBUG_FAIL(msg); return SP_ERR_FAIL; } while (0) #define RETURN_FAIL(...) do { DEBUG_FAIL(__VA_ARGS__); return SP_ERR_FAIL; } while (0)
#define RETURN_VALUE(fmt, x) do { \ #define RETURN_VALUE(fmt, x) do { \
typeof(x) _x = x; \ typeof(x) _x = x; \
DEBUG("%s returning " fmt, __func__, _x); \ DEBUG("%s returning " fmt, __func__, _x); \