From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 6 Sep 2020 17:33:57 +0000 (-0700)
Subject: simplify some agxbuf calls in gv_get_font
X-Git-Tag: 2.46.0~20^2^2~77^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04c8e85ccd5d1f30ab80a3c4aad4c861966f44d9;p=graphviz

simplify some agxbuf calls in gv_get_font
---

diff --git a/plugin/pango/gvgetfontlist_pango.c b/plugin/pango/gvgetfontlist_pango.c
index ea8b1212d..a30afba8c 100644
--- a/plugin/pango/gvgetfontlist_pango.c
+++ b/plugin/pango/gvgetfontlist_pango.c
@@ -442,8 +442,7 @@ static char *gv_get_font(availfont_t* gv_af_p,
 	   faces that match what are required by the Graphviz PS font.
 	 */
 	if (gv_af_p[i].faces && strstr(ps_alias->name, gv_af_p[i].gv_ps_fontname)) {
-	    agxbput(xb2, gv_af_p[i].fontname);
-	    agxbput(xb2, ", ");
+	    agxbprint(xb2, "%s, ", gv_af_p[i].fontname);
 	    avail_faces = get_avail_faces(gv_af_p[i].faces, xb);
 	    if (ps_alias->weight) {
 		if (strcasestr(avail_faces, ps_alias->weight)) {
@@ -451,11 +450,9 @@ static char *gv_get_font(availfont_t* gv_af_p,
 		    copyUpper(xb2, ps_alias->weight);
 		}
 	    } else if (strcasestr(avail_faces, "REGULAR")) {
-		agxbputc(xb2, ' ');
-		agxbput(xb2, "REGULAR");
+		agxbput(xb2, " REGULAR");
 	    } else if (strstr(avail_faces, "ROMAN")) {
-		agxbputc(xb2, ' ');
-		agxbput(xb2, "ROMAN");
+		agxbput(xb2, " ROMAN");
 	    }
 	    if (ps_alias->stretch) {
 		if (strcasestr(avail_faces, ps_alias->stretch)) {
@@ -470,13 +467,11 @@ static char *gv_get_font(availfont_t* gv_af_p,
 		} else if (!strcasecmp(ps_alias->style, "ITALIC")) {
                     /* try to use ITALIC in place of OBLIQUE & visa versa */
 		    if (strcasestr(avail_faces, "OBLIQUE")) {
-			agxbputc(xb2, ' ');
-			agxbput(xb2, "OBLIQUE");
+			agxbput(xb2, " OBLIQUE");
 		    }
 		} else if (!strcasecmp(ps_alias->style, "OBLIQUE")) {
 		    if (strcasestr(avail_faces, "ITALIC")) {
-			agxbputc(xb2, ' ');
-			agxbput(xb2, "ITALIC");
+			agxbput(xb2, " ITALIC");
 		    }
 		}
 	    }