X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffluke-dmm%2Ffluke.c;h=e708518d90f1dd3f003462bced985c955131703e;hb=6c7d80afcaf043eb8128a3102519032850fec1af;hp=c098ced465a351f384db2fbb8eb1da5b60165325;hpb=0c5f2abc6697504b5d760dfa56cc90bea180198f;p=libsigrok.git diff --git a/src/hardware/fluke-dmm/fluke.c b/src/hardware/fluke-dmm/fluke.c index c098ced4..e708518d 100644 --- a/src/hardware/fluke-dmm/fluke.c +++ b/src/hardware/fluke-dmm/fluke.c @@ -59,10 +59,8 @@ static struct sr_datafeed_analog *handle_qm_18x(const struct sr_dev_inst *sdi, while (*e && *e == ' ') e++; - if (!(analog = g_try_malloc0(sizeof(struct sr_datafeed_analog)))) - return NULL; - if (!(analog->data = g_try_malloc(sizeof(float)))) - return NULL; + analog = g_malloc0(sizeof(struct sr_datafeed_analog)); + analog->data = g_malloc(sizeof(float)); analog->channels = sdi->channels; analog->num_samples = 1; if (is_oor) @@ -170,10 +168,8 @@ static struct sr_datafeed_analog *handle_qm_28x(const struct sr_dev_inst *sdi, return NULL; } - if (!(analog = g_try_malloc0(sizeof(struct sr_datafeed_analog)))) - return NULL; - if (!(analog->data = g_try_malloc(sizeof(float)))) - return NULL; + analog = g_malloc0(sizeof(struct sr_datafeed_analog)); + analog->data = g_malloc(sizeof(float)); analog->channels = sdi->channels; analog->num_samples = 1; *analog->data = fvalue;