BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Consistently don't check sdi->priv in dev_acquisition_start(). 

Most drivers already assume this to be != NULL anyway, and the check
should probably be in the API wrappers anyway.
This commit is contained in:
Uwe Hermann 2016-03-27 23:16:59 +02:00
parent 1c47e0da8f
commit 208c1d3543
26 changed files with 29 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hardware/agilent-dmm/api.c
View File

@ -235,11 +235,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED; return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) { devc = sdi->priv;
sr_err("sdi->priv was NULL.");
return SR_ERR_BUG;
}
devc->cb_data = cb_data; devc->cb_data = cb_data;
std_session_send_df_header(cb_data, LOG_PREFIX); std_session_send_df_header(cb_data, LOG_PREFIX);

9
src/hardware/appa-55ii/api.c
View File

@ -225,8 +225,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
return SR_OK; return SR_OK;
} }
static int dev_acquisition_start(const struct sr_dev_inst *sdi, static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
void *cb_data)
{ {
struct sr_serial_dev_inst *serial; struct sr_serial_dev_inst *serial;
struct dev_context *devc; struct dev_context *devc;
@ -235,11 +234,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED; return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) { devc = sdi->priv;
sr_err("sdi->priv was NULL.");
return SR_ERR_BUG;
}
devc->session_cb_data = cb_data; devc->session_cb_data = cb_data;
/* /*

1
src/hardware/arachnid-labs-re-load-pro/api.c
View File

@ -352,7 +352,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
return SR_ERR_DEV_CLOSED; return SR_ERR_DEV_CLOSED;
devc = sdi->priv; devc = sdi->priv;
serial = sdi->conn; serial = sdi->conn;
/* Send the 'monitor <ms>' command (doesn't have a reply). */ /* Send the 'monitor <ms>' command (doesn't have a reply). */

3
src/hardware/atten-pps3xxx/api.c
View File

@ -460,8 +460,7 @@ static int dev_close(struct sr_dev_inst *sdi)
return std_serial_dev_close(sdi); return std_serial_dev_close(sdi);
} }
static int dev_acquisition_start(const struct sr_dev_inst *sdi, static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
void *cb_data)
{ {
struct dev_context *devc; struct dev_context *devc;
struct sr_serial_dev_inst *serial; struct sr_serial_dev_inst *serial;

6
src/hardware/beaglelogic/api.c
View File

@ -337,13 +337,13 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
#define BUFUNIT_TIMEOUT_MS(devc) (100 + ((devc->bufunitsize * 1000) / \ #define BUFUNIT_TIMEOUT_MS(devc) (100 + ((devc->bufunitsize * 1000) / \
(uint32_t)(devc->cur_samplerate))) (uint32_t)(devc->cur_samplerate)))
static int dev_acquisition_start(const struct sr_dev_inst *sdi, static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
void *cb_data)
{ {
(void)cb_data;
struct dev_context *devc = sdi->priv; struct dev_context *devc = sdi->priv;
struct sr_trigger *trigger; struct sr_trigger *trigger;
(void)cb_data;
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED; return SR_ERR_DEV_CLOSED;

3
src/hardware/brymen-bm86x/api.c
View File

@ -249,8 +249,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
return SR_OK; return SR_OK;
} }
static int dev_acquisition_start(const struct sr_dev_inst *sdi, static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
void *cb_data)
{ {
struct dev_context *devc; struct dev_context *devc;

6
src/hardware/brymen-dmm/api.c
View File

@ -202,11 +202,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED; return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) { devc = sdi->priv;
sr_err("sdi->priv was NULL.");
return SR_ERR_BUG;
}
devc->cb_data = cb_data; devc->cb_data = cb_data;
/* /*

6
src/hardware/cem-dt-885x/api.c
View File

@ -386,11 +386,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED; return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) { devc = sdi->priv;
sr_err("sdi->priv was NULL.");
return SR_ERR_BUG;
}
devc->cb_data = cb_data; devc->cb_data = cb_data;
devc->state = ST_INIT; devc->state = ST_INIT;
devc->num_samples = 0; devc->num_samples = 0;

5
src/hardware/chronovu-la/api.c
View File

@ -515,10 +515,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED; return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) { devc = sdi->priv;
sr_err("sdi->priv was NULL.");
return SR_ERR_BUG;
}
if (!devc->ftdic) { if (!devc->ftdic) {
sr_err("devc->ftdic was NULL."); sr_err("devc->ftdic was NULL.");

6
src/hardware/colead-slm/api.c
View File

@ -179,11 +179,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED; return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) { devc = sdi->priv;
sr_err("sdi->priv was NULL.");
return SR_ERR_BUG;
}
devc->cb_data = cb_data; devc->cb_data = cb_data;
std_session_send_df_header(cb_data, LOG_PREFIX); std_session_send_df_header(cb_data, LOG_PREFIX);

6
src/hardware/fluke-dmm/api.c
View File

@ -259,11 +259,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED; return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) { devc = sdi->priv;
sr_err("sdi->priv was NULL.");
return SR_ERR_BUG;
}
devc->cb_data = cb_data; devc->cb_data = cb_data;
std_session_send_df_header(cb_data, LOG_PREFIX); std_session_send_df_header(cb_data, LOG_PREFIX);

8
src/hardware/gmc-mh-1x-2x/api.c
View File

@ -466,12 +466,10 @@ static int dev_acquisition_start_1x_2x_rs232(const struct sr_dev_inst *sdi,
struct dev_context *devc; struct dev_context *devc;
struct sr_serial_dev_inst *serial; struct sr_serial_dev_inst *serial;
if (!sdi || !cb_data || !(devc = sdi->priv))
return SR_ERR_BUG;
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED; return SR_ERR_DEV_CLOSED;
devc = sdi->priv;
devc->cb_data = cb_data; devc->cb_data = cb_data;
devc->settings_ok = FALSE; devc->settings_ok = FALSE;
devc->buflen = 0; devc->buflen = 0;
@ -496,12 +494,10 @@ static int dev_acquisition_start_2x_bd232(const struct sr_dev_inst *sdi,
struct dev_context *devc; struct dev_context *devc;
struct sr_serial_dev_inst *serial; struct sr_serial_dev_inst *serial;
if (!sdi || !cb_data || !(devc = sdi->priv))
return SR_ERR_BUG;
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED; return SR_ERR_DEV_CLOSED;
devc = sdi->priv;
devc->cb_data = cb_data; devc->cb_data = cb_data;
devc->settings_ok = FALSE; devc->settings_ok = FALSE;
devc->buflen = 0; devc->buflen = 0;

3
src/hardware/hung-chang-dso-2100/api.c
View File

@ -686,8 +686,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
return SR_OK; return SR_OK;
} }
static int dev_acquisition_start(const struct sr_dev_inst *sdi, static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
void *cb_data)
{ {
struct dev_context *devc = sdi->priv; struct dev_context *devc = sdi->priv;
int ret; int ret;

3
src/hardware/ikalogic-scanaplus/api.c
View File

@ -358,8 +358,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED; return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) devc = sdi->priv;
return SR_ERR_BUG;
if (!devc->ftdic) if (!devc->ftdic)
return SR_ERR_BUG; return SR_ERR_BUG;

3
src/hardware/kecheng-kc-330b/api.c
View File

@ -413,8 +413,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
return SR_OK; return SR_OK;
} }
static int dev_acquisition_start(const struct sr_dev_inst *sdi, static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
void *cb_data)
{ {
struct sr_dev_driver *di = sdi->driver; struct sr_dev_driver *di = sdi->driver;
struct drv_context *drvc; struct drv_context *drvc;

5
src/hardware/kern-scale/api.c
View File

@ -191,11 +191,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED; return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) devc = sdi->priv;
return SR_ERR_BUG;
devc->cb_data = cb_data; devc->cb_data = cb_data;
serial = sdi->conn; serial = sdi->conn;
sr_spew("Set O1 mode (continuous values, stable and unstable ones)."); sr_spew("Set O1 mode (continuous values, stable and unstable ones).");

3
src/hardware/maynuo-m97/api.c
View File

@ -453,8 +453,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
return ret; return ret;
} }
static int dev_acquisition_start(const struct sr_dev_inst *sdi, static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
void *cb_data)
{ {
struct dev_context *devc; struct dev_context *devc;
struct sr_modbus_dev_inst *modbus; struct sr_modbus_dev_inst *modbus;

4
src/hardware/norma-dmm/api.c
View File

@ -254,12 +254,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
struct dev_context *devc; struct dev_context *devc;
struct sr_serial_dev_inst *serial; struct sr_serial_dev_inst *serial;
if (!sdi || !cb_data || !(devc = sdi->priv))
return SR_ERR_BUG;
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED; return SR_ERR_DEV_CLOSED;
devc = sdi->priv;
devc->cb_data = cb_data; devc->cb_data = cb_data;
std_session_send_df_header(cb_data, LOG_PREFIX); std_session_send_df_header(cb_data, LOG_PREFIX);

3
src/hardware/openbench-logic-sniffer/api.c
View File

@ -463,8 +463,7 @@ static int set_trigger(const struct sr_dev_inst *sdi, int stage)
return SR_OK; return SR_OK;
} }
static int dev_acquisition_start(const struct sr_dev_inst *sdi, static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
void *cb_data)
{ {
struct dev_context *devc; struct dev_context *devc;
struct sr_serial_dev_inst *serial; struct sr_serial_dev_inst *serial;

3
src/hardware/pipistrello-ols/api.c
View File

@ -535,8 +535,7 @@ static int disable_trigger(const struct sr_dev_inst *sdi, int stage)
return SR_OK; return SR_OK;
} }
static int dev_acquisition_start(const struct sr_dev_inst *sdi, static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
void *cb_data)
{ {
struct dev_context *devc; struct dev_context *devc;
uint32_t samplecount, readcount, delaycount; uint32_t samplecount, readcount, delaycount;

6
src/hardware/serial-dmm/api.c
View File

@ -219,11 +219,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED; return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) { devc = sdi->priv;
sr_err("sdi->priv was NULL.");
return SR_ERR_BUG;
}
devc->cb_data = cb_data; devc->cb_data = cb_data;
/* /*

6
src/hardware/teleinfo/api.c
View File

@ -202,11 +202,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED; return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) { devc = sdi->priv;
sr_err("sdi->priv was NULL.");
return SR_ERR_BUG;
}
devc->session_cb_data = cb_data; devc->session_cb_data = cb_data;
/* /*

3
src/hardware/tondaj-sl-814/api.c
View File

@ -161,8 +161,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
return SR_OK; return SR_OK;
} }
static int dev_acquisition_start(const struct sr_dev_inst *sdi, static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
void *cb_data)
{ {
struct dev_context *devc; struct dev_context *devc;
struct sr_serial_dev_inst *serial; struct sr_serial_dev_inst *serial;

2
src/hardware/uni-t-dmm/api.c
View File

@ -194,9 +194,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
struct dev_context *devc; struct dev_context *devc;
devc = sdi->priv; devc = sdi->priv;
devc->cb_data = cb_data; devc->cb_data = cb_data;
devc->starttime = g_get_monotonic_time(); devc->starttime = g_get_monotonic_time();
std_session_send_df_header(sdi, LOG_PREFIX); std_session_send_df_header(sdi, LOG_PREFIX);

3
src/hardware/uni-t-ut32x/api.c
View File

@ -271,8 +271,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
return SR_OK; return SR_OK;
} }
static int dev_acquisition_start(const struct sr_dev_inst *sdi, static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
void *cb_data)
{ {
struct sr_dev_driver *di = sdi->driver; struct sr_dev_driver *di = sdi->driver;
struct drv_context *drvc; struct drv_context *drvc;

8
src/hardware/zeroplus-logic-cube/api.c
View File

@ -512,8 +512,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
return SR_OK; return SR_OK;
} }
static int dev_acquisition_start(const struct sr_dev_inst *sdi, static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
void *cb_data)
{ {
struct dev_context *devc; struct dev_context *devc;
struct sr_usb_dev_inst *usb; struct sr_usb_dev_inst *usb;
@ -538,10 +537,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED; return SR_ERR_DEV_CLOSED;
if (!(devc = sdi->priv)) { devc = sdi->priv;
sr_err("%s: sdi->priv was NULL", __func__);
return SR_ERR_ARG;
}
if (analyzer_add_triggers(sdi) != SR_OK) { if (analyzer_add_triggers(sdi) != SR_OK) {
sr_err("Failed to configure triggers."); sr_err("Failed to configure triggers.");