scpi_vxi: Unbreak MacOS build (vxi.h inclusion order).

[libsigrok.git] / src / hardware / hp-3478a / api.c

diff --git a/src/hardware/hp-3478a/api.c b/src/hardware/hp-3478a/api.c
index 69c1d711ca65f7691b00a4ab4473caca4092b76f..f9419a6e09ced36fb7625a24990b2a50ae4387e4 100644 (file)
--- a/src/hardware/hp-3478a/api.c
+++ b/src/hardware/hp-3478a/api.c
@@ -176,7 +176,7 @@ static int config_get(uint32_t key, GVariant **data,
 
        (void)cg;
 
-       devc = sdi->priv;
+       devc = sdi ? sdi->priv : NULL;
 
        switch (key) {
        case SR_CONF_LIMIT_SAMPLES:
@@ -231,7 +231,7 @@ static int config_set(uint32_t key, GVariant *data,
 
        (void)cg;
 
-       devc = sdi->priv;
+       devc = sdi ? sdi->priv : NULL;
 
        switch (key) {
        case SR_CONF_LIMIT_SAMPLES:
@@ -240,6 +240,7 @@ static int config_set(uint32_t key, GVariant *data,
        case SR_CONF_MEASURED_QUANTITY:
                tuple_child = g_variant_get_child_value(data, 0);
                mq = g_variant_get_uint32(tuple_child);
+               g_variant_unref(tuple_child);
                tuple_child = g_variant_get_child_value(data, 1);
                mq_flags = g_variant_get_uint64(tuple_child);
                g_variant_unref(tuple_child);
@@ -277,7 +278,7 @@ static int config_list(uint32_t key, GVariant **data,
        GVariant *gvar, *arr[2];
        GVariantBuilder gvb;
 
-       devc = sdi->priv;
+       devc = sdi ? sdi->priv : NULL;
 
        switch (key) {
        case SR_CONF_SCAN_OPTIONS: