mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

json: add locale independent parse and format functions

Browse source 
Use them in pw-dump.
Add some unit tests.

See #2223
This commit is contained in:
Wim Taymans 2022-03-20 21:04:33 +01:00
parent 947d15a60a
commit 93b5d440bc
3 changed files with 58 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
spa/include/spa/utils/json.h
View file

@ -34,6 +34,7 @@ extern "C" {
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
#include <locale.h>
#include <spa/utils/defs.h>
@ -237,9 +238,16 @@ static inline bool spa_json_is_null(const char *val, int len)
static inline int spa_json_parse_float(const char *val, int len, float *result)
{
char *end;
*result = strtof(val, &end);
static locale_t locale = NULL;
if (SPA_UNLIKELY(locale == NULL))
locale = newlocale(LC_ALL_MASK, "C", NULL);
if (locale != NULL)
*result = strtof_l(val, &end, locale);
else
*result = strtof(val, &end);
return len > 0 && end == val + len;
}
static inline bool spa_json_is_float(const char *val, int len)
{
float dummy;
@ -254,6 +262,16 @@ static inline int spa_json_get_float(struct spa_json *iter, float *res)
return spa_json_parse_float(value, len, res);
}
static inline char *spa_json_format_double(char *str, int size, const double val)
{
int i, l;
l = snprintf(str, size, "%f", val);
for (i = 0; i < l; i++)
if (str[i] == ',')
str[i] = '.';
return str;
}
/* int */
static inline int spa_json_parse_int(const char *val, int len, int *result)
{