From: Soeren Apel Date: Sat, 8 Nov 2025 22:10:45 +0000 (+0100) Subject: dmm/vc96: Style fixes X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=e489dc11e80f3a5a6f74272252c6562670788118;p=libsigrok.git dmm/vc96: Style fixes --- diff --git a/src/dmm/vc96.c b/src/dmm/vc96.c index 0abc4a00..d88994c2 100644 --- a/src/dmm/vc96.c +++ b/src/dmm/vc96.c @@ -42,17 +42,17 @@ static int parse_value(const uint8_t *buf, float *result, int *exponent) { int i, is_ol, cnt, dot_pos, ret; - ret = SR_ERR; // to be overwritten with SR_OK + ret = SR_ERR; /* To be overwritten with SR_OK */ char valstr[6 + 1]; - sr_spew("parse_value buf still with spaces \"%.12s\".", buf); + sr_spew("parse_value: buf still with spaces: \"%.12s\".", buf); /* Strip all spaces from bytes 3-8. */ memset(&valstr, 0, 6 + 1); for (i = 0, cnt = 0; i < 6; i++) { if (buf[3 + i] != ' ') valstr[cnt++] = buf[3 + i]; } - sr_spew("parse_value valstr without spaces \"%.7s\".", valstr); + sr_spew("parse_value: valstr without spaces: \"%.7s\".", valstr); /* Bytes 5-7: Over limit (various forms) */ is_ol = 0; @@ -64,22 +64,23 @@ static int parse_value(const uint8_t *buf, is_ol += (!g_ascii_strcasecmp((const char *)&valstr, "-O.L")) ? 1 : 0; is_ol += (!g_ascii_strcasecmp((const char *)&valstr, "-OL.")) ? 1 : 0; is_ol += (!g_ascii_strcasecmp((const char *)&valstr, "-OL")) ? 1 : 0; + if (is_ol != 0) { *result = INFINITY; - sr_spew("parse_value Over limit."); + sr_spew("parse_value: Over limit."); ret = SR_OK; - }else{ + } else { /* Bytes 3-10: Sign, value (up to 5 digits including decimal point) */ if ((ret = sr_atof_ascii((const char *)&valstr, result)) != SR_OK) - sr_dbg("parse_value Error sr_atof_ascii: %d.", ret); - sr_spew("parse_value value %f.", *result); + sr_dbg("parse_value: sr_atof_ascii error %d.", ret); + sr_spew("parse_value: value %f.", *result); dot_pos = strcspn(valstr, "."); if (dot_pos < cnt) *exponent = -(cnt - dot_pos - 1); else *exponent = 0; - sr_spew("parse_value Exponent %i", *exponent); + sr_spew("parse_value: exponent %i", *exponent); }; return ret; } @@ -106,14 +107,14 @@ static void parse_flags(const char *buf, struct vc96_info *info) /* Bytes 3-8: See parse_value(). */ - sr_spew("parse_flags buf still with spaces \"%.12s\".", buf); + sr_spew("parse_flags: buf still with spaces: \"%.12s\".", buf); /* Strip all spaces from bytes 9-10. */ memset(&unit, 0, 2 + 1); for (i = 0, cnt = 0; i < 2; i++) { if (buf[9 + i] != ' ') unit[cnt++] = buf[9 + i]; } - sr_spew("parse_flags Bytes 9..10 (unit) without spaces \"%.4s\".", unit); + sr_spew("parse_flags: Bytes 9..10 (unit) without spaces: \"%.4s\".", unit); /* Bytes 9-10: Unit */ u = (const char *)&unit; @@ -279,7 +280,7 @@ SR_PRIV int sr_vc96_parse(const uint8_t *buf, float *floatval, parse_flags((const char *)buf, info_local); handle_flags(analog, floatval, &exponent, info_local); - sr_spew("sr_vc96_parse Exponent %i", exponent); + sr_spew("sr_vc96_parse: exponent %i", exponent); analog->encoding->digits = -exponent; analog->spec->spec_digits = -exponent;