Give better names to arguments of late_double

And inline some variable declarations

diff --git a/lib/common/utils.c b/lib/common/utils.c
index fbda2a21db7abbae890817490828db2192077794..55d3fcb7d8c9757d29037fb4de5fc4150f961935 100644 (file)
--- a/lib/common/utils.c
+++ b/lib/common/utils.c
@@ -79,20 +79,19 @@ int late_int(void *obj, attrsym_t *attr, int defaultValue, int minimum) {
     else return rv;
 }
 
-double late_double(void *obj, attrsym_t * attr, double def, double low)
-{
-    char *p;
-    char *endp;
-    double rv;
-
+double late_double(void *obj, attrsym_t *attr, double defaultValue,
+                   double minimum) {
     if (!attr || !obj)
-       return def;
-    p = ag_xget(obj, attr);
+        return defaultValue;
+    char *p = ag_xget(obj, attr);
     if (!p || p[0] == '\0')
-       return def;
-    rv = strtod (p, &endp);
-    if (p == endp) return def;  /* invalid double format */
-    if (rv < low) return low;
+        return defaultValue;
+    char *endp;
+    double rv = strtod(p, &endp);
+    if (p == endp)
+        return defaultValue; /* invalid double format */
+    if (rv < minimum)
+        return minimum;
     else return rv;
 }
 

diff --git a/lib/common/utils.h b/lib/common/utils.h
index c3bd6a3a680a3dfca99e6856c3bcdfb0e1d77dfa..2e1c5e25cb180db27086ea9f64d3ddb66529958b 100644 (file)
--- a/lib/common/utils.h
+++ b/lib/common/utils.h
@@ -74,7 +74,8 @@ UTILS_API Agraph_t *findCluster(Dt_t *map, char *name);
 UTILS_API attrsym_t *safe_dcl(graph_t *g, int obj_kind, char *name, char *def);
 
 UTILS_API int late_int(void *obj, Agsym_t *attr, int defaultValue, int minimum);
-UTILS_API double late_double(void *, Agsym_t *, double, double);
+UTILS_API double late_double(void *obj, Agsym_t *attr, double defaultValue,
+                             double minimum);
 UTILS_API char *late_nnstring(void *, Agsym_t *, char *);
 UTILS_API char *late_string(void *, Agsym_t *, char *);
 UTILS_API bool late_bool(void *, Agsym_t *, bool);