From 67fde59fed36899afd3b5927acf065eb12743fa6 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 11 Jun 2008 00:37:41 +0000 Subject: replace pa_atof() by pa_atod() because floats are lame git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2506 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/modules/module-ladspa-sink.c | 4 ++-- src/pulsecore/core-util.c | 14 +++++--------- src/pulsecore/core-util.h | 2 +- 3 files changed, 8 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/modules/module-ladspa-sink.c b/src/modules/module-ladspa-sink.c index 9a54202c..ebe812c3 100644 --- a/src/modules/module-ladspa-sink.c +++ b/src/modules/module-ladspa-sink.c @@ -511,7 +511,7 @@ int pa__init(pa_module*m) { p = 0; while ((k = pa_split(cdata, ",", &state)) && p < n_control) { - float f; + double f; if (*k == 0) { use_default[p++] = TRUE; @@ -519,7 +519,7 @@ int pa__init(pa_module*m) { continue; } - if (pa_atof(k, &f) < 0) { + if (pa_atod(k, &f) < 0) { pa_log("Failed to parse control value '%s'", k); pa_xfree(k); goto fail; diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c index 7f6a5d2b..c1f7fc3c 100644 --- a/src/pulsecore/core-util.c +++ b/src/pulsecore/core-util.c @@ -1574,13 +1574,13 @@ static void c_locale_destroy(void) { } #endif -int pa_atof(const char *s, float *ret_f) { +int pa_atod(const char *s, double *ret_d) { char *x = NULL; - float f; + double f; int r = 0; pa_assert(s); - pa_assert(ret_f); + pa_assert(ret_d); /* This should be locale independent */ @@ -1595,22 +1595,18 @@ int pa_atof(const char *s, float *ret_f) { if (c_locale) { errno = 0; - f = strtof_l(s, &x, c_locale); + f = strtod_l(s, &x, c_locale); } else #endif { errno = 0; -#ifdef HAVE_STRTOF - f = strtof(s, &x); -#else f = strtod(s, &x); -#endif } if (!x || *x || errno != 0) r = -1; else - *ret_f = f; + *ret_d = f; return r; } diff --git a/src/pulsecore/core-util.h b/src/pulsecore/core-util.h index 3be95abb..b9513dde 100644 --- a/src/pulsecore/core-util.h +++ b/src/pulsecore/core-util.h @@ -127,7 +127,7 @@ char *pa_state_path(const char *fn); int pa_atoi(const char *s, int32_t *ret_i); int pa_atou(const char *s, uint32_t *ret_u); -int pa_atof(const char *s, float *ret_f); +int pa_atod(const char *s, double *ret_d); int pa_snprintf(char *str, size_t size, const char *format, ...); int pa_vsnprintf(char *str, size_t size, const char *format, va_list ap); -- cgit