From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Fri, 25 Feb 2022 04:56:39 +0000 (-0800)
Subject: agnameof: [nfc] separate assignments from conditionals
X-Git-Tag: 3.0.0~2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af05a00a64438d15cac1708407696e9e7671f6c4;p=graphviz

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 64d3cd953..670d771bc 100644
--- 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) {