X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fstrutil.c;h=d817e642d8f1cb9dfb44292c9ea0d8acf11f73af;hb=88a0265ebcb265ba839c02cc5bcd39e359c9f60f;hp=bb5913f392ca434aa15407f436f74746815201d0;hpb=c1aae90038456a61d0f9313d34e6107c3440d3e7;p=libsigrok.git diff --git a/src/strutil.c b/src/strutil.c index bb5913f3..d817e642 100644 --- a/src/strutil.c +++ b/src/strutil.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include #include #include @@ -57,8 +58,6 @@ * * @retval SR_OK Conversion successful. * @retval SR_ERR Failure. - * - * @since 0.3.0 */ SR_PRIV int sr_atol(const char *str, long *ret) { @@ -91,8 +90,6 @@ SR_PRIV int sr_atol(const char *str, long *ret) * * @retval SR_OK Conversion successful. * @retval SR_ERR Failure. - * - * @since 0.3.0 */ SR_PRIV int sr_atoi(const char *str, int *ret) { @@ -123,8 +120,6 @@ SR_PRIV int sr_atoi(const char *str, int *ret) * * @retval SR_OK Conversion successful. * @retval SR_ERR Failure. - * - * @since 0.3.0 */ SR_PRIV int sr_atod(const char *str, double *ret) { @@ -157,8 +152,6 @@ SR_PRIV int sr_atod(const char *str, double *ret) * * @retval SR_OK Conversion successful. * @retval SR_ERR Failure. - * - * @since 0.3.0 */ SR_PRIV int sr_atof(const char *str, float *ret) { @@ -189,8 +182,6 @@ SR_PRIV int sr_atof(const char *str, float *ret) * * @retval SR_OK Conversion successful. * @retval SR_ERR Failure. - * - * @since 0.3.0 */ SR_PRIV int sr_atof_ascii(const char *str, float *ret) { @@ -421,7 +412,7 @@ SR_API int sr_parse_sizestring(const char *sizestring, uint64_t *size) } else *size += frac_part; - if (s && *s && strcasecmp(s, "Hz")) + if (s && *s && g_ascii_strcasecmp(s, "Hz")) return SR_ERR; return SR_OK; @@ -533,9 +524,9 @@ SR_API int sr_parse_voltage(const char *voltstr, uint64_t *p, uint64_t *q) if (s && *s) { while (*s == ' ') s++; - if (!strcasecmp(s, "mv")) + if (!g_ascii_strcasecmp(s, "mv")) *q = 1000L; - else if (!strcasecmp(s, "v")) + else if (!g_ascii_strcasecmp(s, "v")) *q = 1; else /* Must have a base suffix. */