From: Mark Hansen <markhansen@google.com>
Date: Mon, 14 Nov 2022 10:46:45 +0000 (+1100)
Subject: Give better names to late_nnstring arguments
X-Git-Tag: 7.0.2~8^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f19869c275366c9015bcb5ee244af6eaf47a6982;p=graphviz

Give better names to late_nnstring arguments
---

diff --git a/lib/common/utils.c b/lib/common/utils.c
index f4f9508d9..c6967cf64 100644
--- 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 12a26c026..4d00d10c8 100644
--- 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);