Give better names to late_nnstring arguments

diff --git a/lib/common/utils.c b/lib/common/utils.c
index f4f9508d96c017fe91e55b6b9cc185cdb4cc419d..c6967cf64bd4a466735672a850fa477a6c09ec77 100644 (file)
--- a/lib/common/utils.c
+++ b/lib/common/utils.c
@@ -119,11 +119,10 @@ char *late_string(void *obj, attrsym_t *attr, char *defaultValue) {
     return agxget(obj, attr);
 }
 
-char *late_nnstring(void *obj, attrsym_t * attr, char *def)
-{
-    char *rv = late_string(obj, attr, def);
+char *late_nnstring(void *obj, attrsym_t *attr, char *defaultValue) {
+    char *rv = late_string(obj, attr, defaultValue);
     if (!rv || (rv[0] == '\0'))
-       rv = def;
+        return defaultValue;
     return rv;
 }
 

diff --git a/lib/common/utils.h b/lib/common/utils.h
index 12a26c02604f97c3630ff2a0594637b04edbe037..4d00d10c8e909daa82fb2b0fd914a8878dbfc4e5 100644 (file)
--- a/lib/common/utils.h
+++ b/lib/common/utils.h
@@ -76,7 +76,7 @@ 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 *obj, Agsym_t *attr, double defaultValue,
                              double minimum);
-UTILS_API char *late_nnstring(void *, Agsym_t *, char *);
+UTILS_API char *late_nnstring(void *obj, Agsym_t *attr, char *defaultValue);
 UTILS_API char *late_string(void *obj, Agsym_t *attr, char *defaultValue);
 UTILS_API bool late_bool(void *, Agsym_t *, bool);
 UTILS_API double get_inputscale(graph_t *g);