Give better names to arguments to late_int

Inline some variable definitions

diff --git a/lib/common/utils.c b/lib/common/utils.c
index 52f3cb19c02bd26caea44bd024e454089fc56582..fbda2a21db7abbae890817490828db2192077794 100644 (file)
--- a/lib/common/utils.c
+++ b/lib/common/utils.c
@@ -64,19 +64,18 @@ node_t *dequeue(nodequeue * q)
     return n;
 }
 
-int late_int(void *obj, attrsym_t * attr, int def, int low)
-{
-    char *p;
-    char *endp;
-    int rv;
+int late_int(void *obj, attrsym_t *attr, int defaultValue, int minimum) {
     if (attr == NULL)
-       return def;
-    p = ag_xget(obj, attr);
+        return defaultValue;
+    char *p = ag_xget(obj, attr);
     if (!p || p[0] == '\0')
-       return def;
-    rv = strtol (p, &endp, 10);
-    if (p == endp) return def;  /* invalid int format */
-    if (rv < low) return low;
+        return defaultValue;
+    char *endp;
+    int rv = strtol(p, &endp, 10);
+    if (p == endp)
+        return defaultValue; /* invalid int format */
+    if (rv < minimum)
+        return minimum;
     else return rv;
 }
 

diff --git a/lib/common/utils.h b/lib/common/utils.h
index 3d7c6a6b231e7e6a9a01f6006b16de7b8aac0f04..c3bd6a3a680a3dfca99e6856c3bcdfb0e1d77dfa 100644 (file)
--- a/lib/common/utils.h
+++ b/lib/common/utils.h
@@ -73,7 +73,7 @@ UTILS_API Dt_t *mkClustMap(Agraph_t *g);
 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 *, Agsym_t *, int, int);
+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 char *late_nnstring(void *, Agsym_t *, char *);
 UTILS_API char *late_string(void *, Agsym_t *, char *);