Future commits will want to parse a floating point value from
configuration, but we have no way to parse such a value prior to this
patch.
The core of the routine is implemented in git_parse_float(). Unlike
git_parse_unsigned() and git_parse_signed(), however, the function
implemented here only works on type "float", and not related types like
"double", or "long double".
This is because "double" and "long double" use different functions to
convert from ASCII strings to floating point values (strtod() and
strtold(), respectively). Likewise, there is no pointer type that can
assign to any of these values (except for "void *"), so the only way to
define this trio of functions would be with a macro expansion that is
parameterized over the floating point type and conversion function.
That is all doable, but likely to be overkill given our current needs,
which is only to parse floats.
Signed-off-by: Taylor Blau <me@xxxxxxxxxxxx>
---
config.c | 9 +++++++++
config.h | 6 ++++++
parse.c | 29 +++++++++++++++++++++++++++++
parse.h | 1 +
4 files changed, 45 insertions(+)
diff --git a/config.c b/config.c
index 77a0fd2d80e..ee681fda34b 100644
--- a/config.c
+++ b/config.c
@@ -1243,6 +1243,15 @@ ssize_t git_config_ssize_t(const char *name, const char *value,
return ret;
}
+float git_config_float(const char *name, const char *value,
+ const struct key_value_info *kvi)
+{
+ float ret;
+ if (!git_parse_float(value, &ret))
+ die_bad_number(name, value, kvi);
+ return ret;
+}
+
static const struct fsync_component_name {
const char *name;
enum fsync_component component_bits;
diff --git a/config.h b/config.h
index f4966e37494..b0d1baba95a 100644
--- a/config.h
+++ b/config.h
@@ -261,6 +261,12 @@ unsigned long git_config_ulong(const char *, const char *,
ssize_t git_config_ssize_t(const char *, const char *,
const struct key_value_info *);
+/**
+ * Identical to `git_config_int`, but for floating point values.
+ */
+float git_config_float(const char *, const char *,
+ const struct key_value_info *);
+
/**
* Same as `git_config_bool`, except that integers are returned as-is, and
* an `is_bool` flag is unset.
diff --git a/parse.c b/parse.c
index 42d691a0fbb..a5967e80910 100644
--- a/parse.c
+++ b/parse.c
@@ -125,6 +125,35 @@ int git_parse_ssize_t(const char *value, ssize_t *ret)
return 1;
}
+int git_parse_float(const char *value, float *ret)
+{
+ char *end;
+ float val;
+ uintmax_t factor;
+
+ if (!value || !*value) {
+ errno = EINVAL;
+ return 0;
+ }
+
+ errno = 0;
+ val = strtof(value, &end);
+ if (errno == ERANGE)
+ return 0;
+ if (end == value) {
+ errno = EINVAL;
+ return 0;
+ }
+ factor = get_unit_factor(end);
+ if (!factor) {
+ errno = EINVAL;
+ return 0;
+ }
+ val *= factor;
+ *ret = val;
+ return 1;
+}
+
int git_parse_maybe_bool_text(const char *value)
{
if (!value)
diff --git a/parse.h b/parse.h
index 07d2193d698..7df82c5f5b8 100644
--- a/parse.h
+++ b/parse.h
@@ -6,6 +6,7 @@ int git_parse_ssize_t(const char *, ssize_t *);
int git_parse_ulong(const char *, unsigned long *);
int git_parse_int(const char *value, int *ret);
int git_parse_int64(const char *value, int64_t *ret);
+int git_parse_float(const char *value, float *ret);
/**
* Same as `git_config_bool`, except that it returns -1 on error rather
--
2.45.1.175.gbea44add9db
