agnameof: [nfc] separate assignments from conditionals

Squashes a number of MSVC “C4706: assignment within conditional expression”
warnings.

diff --git a/lib/cgraph/id.c b/lib/cgraph/id.c
index 64d3cd9531fa53849a153ba9df8fbfe972f86c57..670d771bc8ea06725445d113202bf3581178c94c 100644 (file)
--- a/lib/cgraph/id.c
+++ b/lib/cgraph/id.c
@@ -148,12 +148,13 @@ char *agnameof(void *obj)
 
     /* perform internal lookup first */
     g = agraphof(obj);
-    if ((rv = aginternalmapprint(g, AGTYPE(obj), AGID(obj))))
+    rv = aginternalmapprint(g, AGTYPE(obj), AGID(obj));
+    if (rv != NULL)
        return rv;
 
     if (AGDISC(g, id)->print) {
-       if ((rv =
-            AGDISC(g, id)->print(AGCLOS(g, id), AGTYPE(obj), AGID(obj))))
+       rv = AGDISC(g, id)->print(AGCLOS(g, id), AGTYPE(obj), AGID(obj));
+       if (rv != NULL)
            return rv;
     }
     if (AGTYPE(obj) != AGEDGE) {