colin/iio-sensor-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iio: Fix iioutils_get_param_float() in some locales

Browse Source 
Reimplement iioutils_get_param_float() to parse float data like it would
in the C locale. This fixes the scale being '0' for every axis on some
systems and in some locales.

This is used to get the scale and offset parameters from buffer IIO drivers.

Fixes: 9f49caaf17

Closes: #331
This commit is contained in:
Bastien Nocera
2021-08-14 02:12:40 +02:00
parent 06b72df254
commit a0d058eeb1
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/iio-buffer-utils.c
View File

@@ -155,8 +155,9 @@ iioutils_get_param_float (float *output,
const char *name,
const char *generic_name)
{
g_autoptr(FILE) sysfsfp = NULL;
char *builtname, *filename;
g_autofree char *contents = NULL;
g_autoptr(GError) error = NULL;
int ret = 0;
g_debug ("Trying to read '%s_%s' (name) from dir '%s'", name, param_name, device_dir);
@@ -165,16 +166,16 @@ iioutils_get_param_float (float *output,
filename = g_build_filename (device_dir, builtname, NULL);
g_free (builtname);
sysfsfp = fopen (filename, "r");
if (sysfsfp) {
ret = fscanf (sysfsfp, "%f", output);
g_free (filename);
if (ret == 1)
if (g_file_get_contents (filename, &contents, NULL, &error)) {
*output = g_ascii_strtod (contents, NULL);
if (*output != 0.0)
return 0;
g_warning ("Couldn't convert '%s' to float", g_strchomp (contents));
g_clear_pointer (&contents, g_free);
} else {
g_debug ("Failed to read float from %s: %s", filename, error->message);
g_clear_error (&error);
}
ret = -errno;
g_debug ("Failed to read float from %s: %s", filename, g_strerror (-ret));
g_free (filename);
g_debug ("Trying to read '%s_%s' (generic name) from dir '%s'", generic_name, param_name, device_dir);
@@ -183,20 +184,21 @@ iioutils_get_param_float (float *output,
filename = g_build_filename (device_dir, builtname, NULL);
g_free (builtname);
sysfsfp = fopen (filename, "r");
if (sysfsfp) {
if (fscanf (sysfsfp, "%f", output) != 1) {
if (g_file_get_contents (filename, &contents, NULL, &error)) {
*output = g_ascii_strtod (contents, NULL);
if (*output == 0.0) {
g_debug ("Failed to read float from %s", filename);
ret = -EINVAL;
}
} else {
ret = -errno;
if (ret != -ENOENT)
g_warning ("Failed to read float from %s: %s", filename, g_strerror (-ret));
else
g_debug ("Failed to read float from %s: %s", filename, g_strerror (-ret));
if (g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
ret = -ENOENT;
g_debug ("Failed to read float from %s: %s", filename, error->message);
} else {
ret = -EINVAL;
g_warning ("Failed to read float from %s: %s", filename, error->message);
}
}
g_free (filename);
return ret;