From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 6 Sep 2020 16:36:17 +0000 (-0700)
Subject: simplify startElementHandler with agxbprint
X-Git-Tag: 2.46.0~20^2^2~77^2~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a16de743f63ce70e25660872f31e6c1772cd02e;p=graphviz

simplify startElementHandler with agxbprint
---

diff --git a/cmd/tools/gxl2gv.c b/cmd/tools/gxl2gv.c
index f7b7de8f4..6bc82c590 100644
--- a/cmd/tools/gxl2gv.c
+++ b/cmd/tools/gxl2gv.c
@@ -536,9 +536,7 @@ startElementHandler(void *userData, const char *name, const char **atts)
 
 	ud->listen = TRUE;
 	if (ud->compositeReadState) {
-	    agxbputc(&ud->composite_buffer, '<');
-	    agxbput(&ud->composite_buffer, (char *) name);
-	    agxbputc(&ud->composite_buffer, '>');
+	    agxbprint(&ud->composite_buffer, "<%s>", name);
 	}
     } else if (strcmp(name, "rel") == 0 || strcmp(name, "relend") == 0) {
 	fprintf(stderr, "%s element is ignored by DOT\n", name);
@@ -551,8 +549,7 @@ startElementHandler(void *userData, const char *name, const char **atts)
 	pos = get_xml_attr("xlink:href", atts);
 	if (pos > 0) {
 	    const char *href = atts[pos];
-	    agxbput(&ud->xml_attr_value, GXL_LOC);
-	    agxbput(&ud->xml_attr_value, (char *) href);
+	    agxbprint(&ud->xml_attr_value, "%s%s", GXL_LOC, href);
 	}
     } else if (strcmp(name, "seq") == 0
 	       || strcmp(name, "set") == 0
@@ -560,9 +557,7 @@ startElementHandler(void *userData, const char *name, const char **atts)
 	       || strcmp(name, "tup") == 0 || strcmp(name, "enum") == 0) {
 
 	ud->compositeReadState = TRUE;
-	agxbputc(&ud->composite_buffer, '<');
-	agxbput(&ud->composite_buffer, (char *) name);
-	agxbputc(&ud->composite_buffer, '>');
+	agxbprint(&ud->composite_buffer, "<%s>", name);
     } else {
 	/* must be some extension */
 	fprintf(stderr,