Add sr_scpi_send_variadic() function.

diff --git a/hardware/common/scpi.c b/hardware/common/scpi.c
index 10218ba9820379ebcead81f896e59a019b508270..4992b7362a8b76ebf29b83f10caac18fc3b55214 100644 (file)
--- a/hardware/common/scpi.c
+++ b/hardware/common/scpi.c
@@ -22,7 +22,6 @@
 
 #include <glib.h>
 #include <string.h>
-#include <stdarg.h>
 
 /* Message logging helpers with subsystem-specific prefix string. */
 #define LOG_PREFIX "scpi: "
@@ -127,22 +126,40 @@ SR_PRIV int sr_scpi_source_remove(struct sr_scpi_dev_inst *scpi)
 SR_PRIV int sr_scpi_send(struct sr_scpi_dev_inst *scpi,
                         const char *format, ...)
 {
-       va_list args1, args2;
+       va_list args;
+       int ret;
+
+       va_start(args, format);
+       ret = sr_scpi_send_variadic(scpi, format, args);
+       va_end(args);
+
+       return ret;
+}
+
+/**
+ * Send a SCPI command with a variadic argument list.
+ *
+ * @param scpi Previously initialized SCPI device structure.
+ * @param format Format string.
+ * @param args Argument list.
+ *
+ * @return SR_OK on success, SR_ERR on failure.
+ */
+SR_PRIV int sr_scpi_send_variadic(struct sr_scpi_dev_inst *scpi,
+                        const char *format, va_list args)
+{
+       va_list args_copy;
        char *buf;
        int len, ret;
 
-       /* Copy arguments since we need to make two variadic calls. */
-       va_start(args1, format);
-       va_copy(args2, args1);
-
        /* Get length of buffer required. */
-       len = vsnprintf(NULL, 0, format, args1);
-       va_end(args1);
+       va_copy(args_copy, args);
+       len = vsnprintf(NULL, 0, format, args_copy);
+       va_end(args_copy);
 
        /* Allocate buffer and write out command. */
        buf = g_malloc(len + 1);
-       vsprintf(buf, format, args2);
-       va_end(args2);
+       vsprintf(buf, format, args);
 
        /* Send command. */
        ret = scpi->send(scpi->priv, buf);

diff --git a/libsigrok-internal.h b/libsigrok-internal.h
index 0e8cdecbcc2b2e706028ae4428f0a083b6276ede..adc48c496549d51ea5694239dd5e9923fed53184 100644 (file)
--- a/libsigrok-internal.h
+++ b/libsigrok-internal.h
@@ -302,6 +302,8 @@ SR_PRIV int sr_scpi_source_add(struct sr_scpi_dev_inst *scpi, int events,
 SR_PRIV int sr_scpi_source_remove(struct sr_scpi_dev_inst *scpi);
 SR_PRIV int sr_scpi_send(struct sr_scpi_dev_inst *scpi,
                const char *format, ...);
+SR_PRIV int sr_scpi_send_variadic(struct sr_scpi_dev_inst *scpi,
+               const char *format, va_list args);
 SR_PRIV int sr_scpi_receive(struct sr_scpi_dev_inst *scpi,
                        char **scpi_response);
 SR_PRIV int sr_scpi_read(struct sr_scpi_dev_inst *scpi, char *buf, int maxlen);