Don't define names ending with _t (POSIX reserved).

[libsigrok.git] / hardware / common / scpi_visa.c

diff --git a/hardware/common/scpi_visa.c b/hardware/common/scpi_visa.c
index 0bf6d2a064eab99dc0b100a436e030eeb67b8ece..b342a91f33e0e53974b16c949213b6a7d38c8867 100644 (file)
--- a/hardware/common/scpi_visa.c
+++ b/hardware/common/scpi_visa.c
@@ -31,11 +31,12 @@ struct scpi_visa {
        ViSession vi;
 };
 
-static int scpi_visa_dev_inst_new(void *priv, const char *resource,
-               char **params, const char *serialcomm)
+static int scpi_visa_dev_inst_new(void *priv, struct drv_context *drvc,
+               const char *resource, char **params, const char *serialcomm)
 {
        struct scpi_visa *vscpi = priv;
 
+       (void)drvc;
        (void)resource;
        (void)serialcomm;
 
@@ -67,7 +68,7 @@ static int scpi_visa_open(void *priv)
 }
 
 static int scpi_visa_source_add(void *priv, int events, int timeout,
-                       sr_receive_data_callback_t cb, void *cb_data)
+                       sr_receive_data_callback cb, void *cb_data)
 {
        (void) priv;
 
@@ -86,7 +87,7 @@ static int scpi_visa_send(void *priv, const char *command)
 {
        struct scpi_visa *vscpi = priv;
        gchar *terminated_command;
-       ViUInt32 written;
+       ViUInt32 written = 0;
        int len;
 
        terminated_command = g_strconcat(command, "\n", NULL);