Specialise RETURN_VALUE macro into RETURN_{INT,STRING,POINTER}.

[libserialport.git] / libserialport_internal.h

diff --git a/libserialport_internal.h b/libserialport_internal.h
index ca1add18b5b4ae0d4820bb89da4dab405c6f7693..78b727b7a2dbbb7a506786092c77e9a8e0e372f9 100644 (file)
--- a/libserialport_internal.h
+++ b/libserialport_internal.h
@@ -176,9 +176,19 @@ extern void (*sp_debug_handler)(const char *format, ...);
 #define RETURN_OK() RETURN_CODE(SP_OK);
 #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); \
+#define RETURN_INT(x) do { \
+       int _x = x; \
+       DEBUG("%s returning %d", __func__, _x); \
+       return _x; \
+} while (0)
+#define RETURN_STRING(x) do { \
+       char *_x = x; \
+       DEBUG("%s returning %s", __func__, _x); \
+       return _x; \
+} while (0)
+#define RETURN_POINTER(x) do { \
+       void *_x = x; \
+       DEBUG("%s returning %p", __func__, _x); \
        return _x; \
 } while (0)
 #define SET_ERROR(val, err, msg) do { DEBUG_ERROR(err, msg); val = err; } while (0)
@@ -187,5 +197,8 @@ extern void (*sp_debug_handler)(const char *format, ...);
 
 #define TRY(x) do { int ret = x; if (ret != SP_OK) RETURN_CODEVAL(ret); } while (0)
 
+SP_PRIV struct sp_port **list_append(struct sp_port **list, const char *portname);
+
 /* OS-specific Helper functions. */
-enum sp_return get_port_details(struct sp_port *port);
+SP_PRIV enum sp_return get_port_details(struct sp_port *port);
+SP_PRIV enum sp_return list_ports(struct sp_port ***list);