X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fstrutil.c;h=382708936244ba9a3f0b2aa0972c66fab12177c2;hb=50ccb36f201bd6b2326822f585c01498fe6fd86a;hp=3b0afadef530f42960dfda42a9c92d2eaa88437e;hpb=6984cfb245811df0f691928a6e4224d4f7ac5786;p=libsigrok.git diff --git a/src/strutil.c b/src/strutil.c index 3b0afade..38270893 100644 --- a/src/strutil.c +++ b/src/strutil.c @@ -347,18 +347,21 @@ SR_API char *sr_samplerate_string(uint64_t samplerate) } /** - * Convert a numeric frequency value to the "natural" string representation - * of its period. + * Convert a numeric period value to the "natural" string representation + * of its period value. * - * E.g. a value of 3000000 would be converted to "3 us", 20000 to "50 ms". + * The period is specified as a rational number's numerator and denominator. * - * @param frequency The frequency in Hz. + * E.g. a pair of (1, 5) would be converted to "200 ms", (10, 100) to "100 ms". * - * @return A newly allocated string representation of the frequency value, + * @param v_p The period numerator. + * @param v_q The period denominator. + * + * @return A newly allocated string representation of the period value, * or NULL upon errors. The caller is responsible to g_free() the * memory. * - * @since 0.1.0 + * @since 0.5.0 */ SR_API char *sr_period_string(uint64_t v_p, uint64_t v_q) { @@ -552,8 +555,13 @@ SR_API uint64_t sr_parse_timestring(const char *timestring) /** @since 0.1.0 */ SR_API gboolean sr_parse_boolstring(const char *boolstr) { - if (!boolstr) - return FALSE; + /* + * Complete absence of an input spec is assumed to mean TRUE, + * as in command line option strings like this: + * ...:samplerate=100k:header:numchannels=4:... + */ + if (!boolstr || !*boolstr) + return TRUE; if (!g_ascii_strncasecmp(boolstr, "true", 4) || !g_ascii_strncasecmp(boolstr, "yes", 3) ||