X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fstrutil.c;h=56ccaa095bb62898fdc5ac56102ad9b1b7880388;hb=82b9f3d116ce0c982291a2dfdd15cd8a1c4cc16e;hp=07ed7b4491ed8b8a6ebd787b6a6ebe25ee7717b9;hpb=7f5bfd613058ce09b267294004717eed2fc2582c;p=libsigrok.git diff --git a/src/strutil.c b/src/strutil.c index 07ed7b44..56ccaa09 100644 --- a/src/strutil.c +++ b/src/strutil.c @@ -18,7 +18,9 @@ */ /* Needed for POSIX.1-2008 locale functions */ +/** @cond PRIVATE */ #define _XOPEN_SOURCE 700 +/** @endcond */ #include #include #include @@ -33,7 +35,6 @@ #include #include #include -#include #include #include "libsigrok-internal.h" @@ -56,8 +57,6 @@ */ /** - * @private - * * Convert a string representation of a numeric value (base 10) to a long integer. The * conversion is strict and will fail if the complete string does not represent * a valid long integer. The function sets errno according to the details of the @@ -68,6 +67,8 @@ * * @retval SR_OK Conversion successful. * @retval SR_ERR Failure. + * + * @private */ SR_PRIV int sr_atol(const char *str, long *ret) { @@ -91,8 +92,6 @@ SR_PRIV int sr_atol(const char *str, long *ret) } /** - * @private - * * Convert a string representation of a numeric value (base 10) to an integer. The * conversion is strict and will fail if the complete string does not represent * a valid integer. The function sets errno according to the details of the @@ -103,6 +102,8 @@ SR_PRIV int sr_atol(const char *str, long *ret) * * @retval SR_OK Conversion successful. * @retval SR_ERR Failure. + * + * @private */ SR_PRIV int sr_atoi(const char *str, int *ret) { @@ -121,8 +122,6 @@ SR_PRIV int sr_atoi(const char *str, int *ret) } /** - * @private - * * Convert a string representation of a numeric value to a double. The * conversion is strict and will fail if the complete string does not represent * a valid double. The function sets errno according to the details of the @@ -133,6 +132,8 @@ SR_PRIV int sr_atoi(const char *str, int *ret) * * @retval SR_OK Conversion successful. * @retval SR_ERR Failure. + * + * @private */ SR_PRIV int sr_atod(const char *str, double *ret) { @@ -156,8 +157,6 @@ SR_PRIV int sr_atod(const char *str, double *ret) } /** - * @private - * * Convert a string representation of a numeric value to a float. The * conversion is strict and will fail if the complete string does not represent * a valid float. The function sets errno according to the details of the @@ -168,6 +167,8 @@ SR_PRIV int sr_atod(const char *str, double *ret) * * @retval SR_OK Conversion successful. * @retval SR_ERR Failure. + * + * @private */ SR_PRIV int sr_atof(const char *str, float *ret) { @@ -186,8 +187,6 @@ SR_PRIV int sr_atof(const char *str, float *ret) } /** - * @private - * * Convert a string representation of a numeric value to a double. The * conversion is strict and will fail if the complete string does not represent * a valid double. The function sets errno according to the details of the @@ -198,6 +197,8 @@ SR_PRIV int sr_atof(const char *str, float *ret) * * @retval SR_OK Conversion successful. * @retval SR_ERR Failure. + * + * @private */ SR_PRIV int sr_atod_ascii(const char *str, double *ret) { @@ -218,8 +219,6 @@ SR_PRIV int sr_atod_ascii(const char *str, double *ret) } /** - * @private - * * Convert a string representation of a numeric value to a float. The * conversion is strict and will fail if the complete string does not represent * a valid float. The function sets errno according to the details of the @@ -230,6 +229,8 @@ SR_PRIV int sr_atod_ascii(const char *str, double *ret) * * @retval SR_OK Conversion successful. * @retval SR_ERR Failure. + * + * @private */ SR_PRIV int sr_atof_ascii(const char *str, float *ret) { @@ -591,6 +592,46 @@ SR_API int sr_vsnprintf_ascii(char *buf, size_t buf_size, #endif } +/** + * Convert a sequence of bytes to its textual representation ("hex dump"). + * + * Callers should free the allocated GString. See @ref sr_hexdump_free(). + * + * @param[in] data Pointer to the byte sequence to print. + * @param[in] len Number of bytes to print. + * + * @return #NULL upon error, newly allocated GString pointer otherwise. + * + * @private + */ +SR_PRIV GString *sr_hexdump_new(const uint8_t *data, const size_t len) +{ + GString *s; + size_t i; + + s = g_string_sized_new(3 * len); + for (i = 0; i < len; i++) { + if (i) + g_string_append_c(s, ' '); + g_string_append_printf(s, "%02x", data[i]); + } + + return s; +} + +/** + * Free a hex dump text that was created by @ref sr_hexdump_new(). + * + * @param[in] s Pointer to the GString to release. + * + * @private + */ +SR_PRIV void sr_hexdump_free(GString *s) +{ + if (s) + g_string_free(s, TRUE); +} + /** * Convert a string representation of a numeric value to a sr_rational. * @@ -614,7 +655,8 @@ SR_API int sr_parse_rational(const char *str, struct sr_rational *ret) int64_t denominator = 1; int32_t fractional_len = 0; int32_t exponent = 0; - bool is_negative = false; + gboolean is_negative = FALSE; + gboolean no_integer, no_fractional; while (isspace(*str)) str++; @@ -622,19 +664,23 @@ SR_API int sr_parse_rational(const char *str, struct sr_rational *ret) errno = 0; integral = g_ascii_strtoll(str, &endptr, 10); - if (str == endptr && (str[0] == '-' || str[0] == '+') && str[1] == '.') + if (str == endptr && (str[0] == '-' || str[0] == '+') && str[1] == '.') { endptr += 1; - else if (str == endptr && str[0] == '.') - /* EMPTY */; - else if (errno) + no_integer = TRUE; + } else if (str == endptr && str[0] == '.') { + no_integer = TRUE; + } else if (errno) { return SR_ERR; + } else { + no_integer = FALSE; + } if (integral < 0 || str[0] == '-') - is_negative = true; + is_negative = TRUE; errno = 0; if (*endptr == '.') { - bool is_exp, is_eos; + gboolean is_exp, is_eos; const char *start = endptr + 1; fractional = g_ascii_strtoll(start, &endptr, 10); is_exp = *endptr == 'E' || *endptr == 'e'; @@ -645,6 +691,9 @@ SR_API int sr_parse_rational(const char *str, struct sr_rational *ret) } if (errno) return SR_ERR; + no_fractional = endptr == start; + if (no_integer && no_fractional) + return SR_ERR; fractional_len = endptr - start; }