mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pw-dump: use the spa_ato* helpers for string to number conversions

Browse source
This commit is contained in:
Peter Hutterer 2021-06-02 14:41:12 +10:00 • committed by Wim Taymans
parent 3796bc814e
commit a1e821c259
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/tools/pw-dump.c
View file

@ -276,20 +276,16 @@ static void put_double(struct data *d, const char *key, double val)
static void put_value(struct data *d, const char *key, const char *val) static void put_value(struct data *d, const char *key, const char *val)
{ {
char *end; int64_t li;
long int li;
double dv; double dv;
if (val == NULL) if (val == NULL)
put_literal(d, key, "null"); put_literal(d, key, "null");
else if (spa_streq(val, "true") || else if (spa_streq(val, "true") || spa_streq(val, "false"))
spa_streq(val, "false"))
put_literal(d, key, val); put_literal(d, key, val);
else if ((li = strtol(val, &end, 10)) != LONG_MIN && else if (spa_atoi64(val, &li, 10))
errno != -ERANGE && *end == '\0')
put_int(d, key, li); put_int(d, key, li);
else if ((dv = strtod(val, &end)) != HUGE_VAL && else if (spa_atod(val, &dv))
errno != -ERANGE && *end == '\0')
put_double(d, key, dv); put_double(d, key, dv);
else else
put_string(d, key, val); put_string(d, key, val);
@ -1461,10 +1457,11 @@ int main(int argc, char *argv[])
return -1; return -1;
} }
} }
if (optind < argc)
data.id = atoi(argv[optind++]);
else
data.id = SPA_ID_INVALID; data.id = SPA_ID_INVALID;
if (optind < argc) {
spa_atou32(argv[optind++], &data.id, 0);
}
data.loop = pw_main_loop_new(NULL); data.loop = pw_main_loop_new(NULL);
if (data.loop == NULL) { if (data.loop == NULL) {