X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fbinary_helpers.c;h=86c4c5838fce2bf470524bd3c2a0b8859a741514;hp=8c1b7b7c8306287f6e8dfbbaa52d2fa9012607fa;hb=deb7615262ac4f9cc0750a08351afa7cbf9c34d5;hpb=18698b40d19fa4b15000a2d29c1dee85df0f578f diff --git a/src/binary_helpers.c b/src/binary_helpers.c index 8c1b7b7c..86c4c583 100644 --- a/src/binary_helpers.c +++ b/src/binary_helpers.c @@ -37,17 +37,17 @@ SR_PRIV int bv_get_value(float *out, const struct binary_value_spec *spec, const break switch (spec->type) { - VALUE_TYPE(BVT_UINT8, R8, 1); + VALUE_TYPE(BVT_UINT8, R8, sizeof(uint8_t)); - VALUE_TYPE(BVT_BE_UINT16, RB16, 2); - VALUE_TYPE(BVT_BE_UINT32, RB32, 4); - VALUE_TYPE(BVT_BE_UINT64, RB64, 8); - VALUE_TYPE(BVT_BE_FLOAT, RBFL, 4); + VALUE_TYPE(BVT_BE_UINT16, RB16, sizeof(uint16_t)); + VALUE_TYPE(BVT_BE_UINT32, RB32, sizeof(uint32_t)); + VALUE_TYPE(BVT_BE_UINT64, RB64, sizeof(uint64_t)); + VALUE_TYPE(BVT_BE_FLOAT, RBFL, sizeof(float)); - VALUE_TYPE(BVT_LE_UINT16, RL16, 2); - VALUE_TYPE(BVT_LE_UINT32, RL32, 4); - VALUE_TYPE(BVT_LE_UINT64, RL64, 8); - VALUE_TYPE(BVT_LE_FLOAT, RLFL, 4); + VALUE_TYPE(BVT_LE_UINT16, RL16, sizeof(uint16_t)); + VALUE_TYPE(BVT_LE_UINT32, RL32, sizeof(uint32_t)); + VALUE_TYPE(BVT_LE_UINT64, RL64, sizeof(uint64_t)); + VALUE_TYPE(BVT_LE_FLOAT, RLFL, sizeof(float)); default: return SR_ERR_ARG; @@ -85,10 +85,6 @@ SR_PRIV int bv_send_analog_channel(const struct sr_dev_inst *sdi, struct sr_chan meaning.unit = bac->unit; meaning.mqflags = 0; meaning.channels = g_slist_append(NULL, ch); - if (!meaning.channels) { - err = SR_ERR_MALLOC; - goto err_out; - } spec.spec_digits = bac->digits;