From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Thu, 18 Mar 2021 00:10:59 +0000 (-0700)
Subject: remove some unnecessary bracketing
X-Git-Tag: 2.47.1~31^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=032df898f6be26fc5f4bc7ace45d2fe459958bbb;p=graphviz

remove some unnecessary bracketing
---

diff --git a/plugin/pango/gvgetfontlist_pango.c b/plugin/pango/gvgetfontlist_pango.c
index f447eec4d..cf85ad45c 100644
--- a/plugin/pango/gvgetfontlist_pango.c
+++ b/plugin/pango/gvgetfontlist_pango.c
@@ -37,11 +37,11 @@ char* strcasestr (const char *str, const char *pat)
     endp = str + slen - plen;
     p0 = toupper (p0);
     do {
-        while ((str <= endp) && (p0 != toupper(*str))) str++;
+        while (str <= endp && p0 != toupper(*str)) str++;
         if (str > endp) return NULL;
         pp = pat;
         sp = ++str;
-        while ((pc = *pp++) && (toupper(pc) == toupper(*sp))) sp++;
+        while ((pc = *pp++) && toupper(pc) == toupper(*sp)) sp++;
     } while (pc);
     return (char*)(str-1);
 }
@@ -292,7 +292,7 @@ display_available_fonts(availfont_t* gv_af_p)
 
 /* Displays the Graphviz PS font name, system available font name and associated faces */
     for (size_t j = 0; j < GV_FONT_LIST_SIZE; j++) {
-	if ((gv_af_p[j].faces == 0) || (gv_af_p[j].fontname == NULL)) {
+	if (gv_af_p[j].faces == 0 || gv_af_p[j].fontname == NULL) {
 	    fprintf (stderr, "ps font = %s not available\n", gv_ps_fontdefs[j].fontname);
 	    continue;
 	}
@@ -408,7 +408,7 @@ static availfont_t *gv_get_ps_fontlist(PangoFontMap * fontmap)
     display_available_fonts(gv_af_p);
 #endif
 /* Free the Graphviz PS font definitions */
-    return (gv_af_p);
+    return gv_af_p;
 }
 
 static void copyUpper (agxbuf* xb, char* s)
diff --git a/plugin/pango/gvrender_pango.c b/plugin/pango/gvrender_pango.c
index 5f8681ffd..f3a76a0b9 100644
--- a/plugin/pango/gvrender_pango.c
+++ b/plugin/pango/gvrender_pango.c
@@ -259,7 +259,7 @@ static void cairogen_textspan(GVJ_t * job, pointf p, textspan_t * span)
     pointf A[2];
 
     cairo_set_dash (cr, dashed, 0, 0.0);  /* clear any dashing */
-    cairogen_set_color(cr, &(obj->pencolor));
+    cairogen_set_color(cr, &obj->pencolor);
 
     switch (span->just) {
     case 'r':
@@ -278,10 +278,10 @@ static void cairogen_textspan(GVJ_t * job, pointf p, textspan_t * span)
     cairo_move_to (cr, p.x, -p.y);
     cairo_save(cr);
     cairo_scale(cr, POINTS_PER_INCH / FONT_DPI, POINTS_PER_INCH / FONT_DPI);
-    pango_cairo_show_layout(cr, (PangoLayout*)(span->layout));
+    pango_cairo_show_layout(cr, (PangoLayout*)span->layout);
     cairo_restore(cr);
 
-    if ((span->font) && (span->font->flags & HTML_OL)) {
+    if (span->font && (span->font->flags & HTML_OL)) {
 	A[0].x = p.x;
 	A[1].x = p.x + span->size.x;
 	A[1].y = A[0].y = p.y;
@@ -301,7 +301,6 @@ static void cairogen_set_penstyle(GVJ_t *job, cairo_t *cr)
 	cairo_set_dash (cr, dashed, 0, 0.0);
     }
     cairo_set_line_width (cr, obj->penwidth);
-
 }
 
 static void cairo_gradient_fill (cairo_t* cr, obj_state_t* obj, int filled, pointf* A, int n)
@@ -368,14 +367,14 @@ if (ry < RMIN) ry = RMIN;
 
     cairo_set_matrix(cr, &matrix);
 
-    if (filled == GRADIENT || filled == (RGRADIENT)) {
+    if (filled == GRADIENT || filled == RGRADIENT) {
 	cairo_gradient_fill (cr, obj, filled, A, 2);
     }
     else if (filled) {
-	cairogen_set_color(cr, &(obj->fillcolor));
+	cairogen_set_color(cr, &obj->fillcolor);
 	cairo_fill_preserve(cr);
     }
-    cairogen_set_color(cr, &(obj->pencolor));
+    cairogen_set_color(cr, &obj->pencolor);
     cairo_stroke(cr);
 }
 
@@ -392,14 +391,14 @@ cairogen_polygon(GVJ_t * job, pointf * A, int n, int filled)
     for (i = 1; i < n; i++)
     cairo_line_to(cr, A[i].x, -A[i].y);
     cairo_close_path(cr);
-    if (filled == GRADIENT || filled == (RGRADIENT)) {
+    if (filled == GRADIENT || filled == RGRADIENT) {
 	cairo_gradient_fill (cr, obj, filled, A, n);
     }
     else if (filled) {
-	cairogen_set_color(cr, &(obj->fillcolor));
+	cairogen_set_color(cr, &obj->fillcolor);
 	cairo_fill_preserve(cr);
     }
-    cairogen_set_color(cr, &(obj->pencolor));
+    cairogen_set_color(cr, &obj->pencolor);
     cairo_stroke(cr);
 }
 
@@ -421,14 +420,14 @@ cairogen_bezier(GVJ_t * job, pointf * A, int n, int arrow_at_start,
     for (i = 1; i < n; i += 3)
 	cairo_curve_to(cr, A[i].x, -A[i].y, A[i + 1].x, -A[i + 1].y,
 		       A[i + 2].x, -A[i + 2].y);
-    if (filled == GRADIENT || filled == (RGRADIENT)) {
+    if (filled == GRADIENT || filled == RGRADIENT) {
 	cairo_gradient_fill (cr, obj, filled, A, n);
     }
     else if (filled) {
-	cairogen_set_color(cr, &(obj->fillcolor));
+	cairogen_set_color(cr, &obj->fillcolor);
 	cairo_fill_preserve(cr);
     }
-    cairogen_set_color(cr, &(obj->pencolor));
+    cairogen_set_color(cr, &obj->pencolor);
     cairo_stroke(cr);
 }
 
@@ -444,7 +443,7 @@ cairogen_polyline(GVJ_t * job, pointf * A, int n)
     cairo_move_to(cr, A[0].x, -A[0].y);
     for (i = 1; i < n; i++)
 	cairo_line_to(cr, A[i].x, -A[i].y);
-    cairogen_set_color(cr, &(obj->pencolor));
+    cairogen_set_color(cr, &obj->pencolor);
     cairo_stroke(cr);
 }