Fix a few "value never read" scan-build warnings.

[libsigrok.git] / src / hardware / openbench-logic-sniffer / api.c

diff --git a/src/hardware/openbench-logic-sniffer/api.c b/src/hardware/openbench-logic-sniffer/api.c
index 246b900a6c13e86512f25e3db2211139b25e1095..e61bd10d394e034bc97fcb951b2663b3ed8ce0a4 100644 (file)
--- a/src/hardware/openbench-logic-sniffer/api.c
+++ b/src/hardware/openbench-logic-sniffer/api.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libserialport.h>
+#include <config.h>
 #include "protocol.h"
 
 #define SERIALCOMM "115200/8n1"
@@ -97,7 +97,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        struct sr_config *src;
        struct sr_dev_inst *sdi;
        struct drv_context *drvc;
-       struct dev_context *devc;
        struct sr_serial_dev_inst *serial;
        GSList *l, *devices;
        int ret;
@@ -105,7 +104,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        const char *conn, *serialcomm;
        char buf[8];
 
-       drvc = di->priv;
+       drvc = di->context;
 
        devices = NULL;
 
@@ -182,7 +181,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        if (sp_input_waiting(serial->data) != 0) {
                /* Got metadata. */
                sdi = get_metadata(serial);
-               devc = sdi->priv;
        } else {
                /* Not an OLS -- some other board that uses the sump protocol. */
                sr_info("Device does not support metadata.");
@@ -195,8 +193,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                for (i = 0; i < ARRAY_SIZE(ols_channel_names); i++)
                        sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE,
                                        ols_channel_names[i]);
-               devc = ols_dev_new();
-               sdi->priv = devc;
+               sdi->priv = ols_dev_new();
        }
        /* Configure samplerate and divider. */
        if (ols_set_samplerate(sdi, DEFAULT_SAMPLERATE) != SR_OK)
@@ -215,7 +212,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 static GSList *dev_list(const struct sr_dev_driver *di)
 {
-       return ((struct drv_context *)(di->priv))->instances;
+       return ((struct drv_context *)(di->context))->instances;
 }
 
 static int cleanup(const struct sr_dev_driver *di)
@@ -608,5 +605,5 @@ SR_PRIV struct sr_dev_driver ols_driver_info = {
        .dev_close = std_serial_dev_close,
        .dev_acquisition_start = dev_acquisition_start,
        .dev_acquisition_stop = dev_acquisition_stop,
-       .priv = NULL,
+       .context = NULL,
 };