From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 28 Nov 2021 02:57:12 +0000 (-0800)
Subject: gvjobs_output_langname: return a C99 bool instead of boolean
X-Git-Tag: 3.0.0~146^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=11c33d7276e3515c50f981f2893388e31663639c;p=graphviz

gvjobs_output_langname: return a C99 bool instead of boolean
---

diff --git a/lib/common/input.c b/lib/common/input.c
index fa151c3b9..7c5abe550 100644
--- a/lib/common/input.c
+++ b/lib/common/input.c
@@ -295,8 +295,7 @@ int dotneato_args_initialize(GVC_t * gvc, int argc, char **argv)
 		    fprintf(stderr, "Missing argument for -T flag\n");
 		    return (dotneato_usage(1));
 		}
-		v = gvjobs_output_langname(gvc, val);
-		if (!v) {
+		if (!gvjobs_output_langname(gvc, val)) {
 		    /* TODO: Detect empty results from gvplugin_list() and prompt to configure with '-c' */
 		    char *fmts;
 		    fprintf(stderr, "Format: \"%s\" not recognized.", val);
@@ -449,9 +448,7 @@ int dotneato_args_initialize(GVC_t * gvc, int argc, char **argv)
 
     /* if no -Txxx, then set default format */
     if (!gvc->jobs || !gvc->jobs->output_langname) {
-	v = gvjobs_output_langname(gvc, "dot");
-	if (!v) {
-//	assert(v);  /* "dot" should always be available as an output format */
+	if (!gvjobs_output_langname(gvc, "dot")) {
 		fprintf(stderr,
 			"Unable to find even the default \"-Tdot\" renderer.  Has the config\nfile been generated by running \"dot -c\" with installer's privileges?\n");
 			return(2);
diff --git a/lib/gvc/gvc.c b/lib/gvc/gvc.c
index c7386dea3..14cab191b 100644
--- a/lib/gvc/gvc.c
+++ b/lib/gvc/gvc.c
@@ -17,6 +17,7 @@
 #include <gvc/gvcproc.h>
 #include <gvc/gvconfig.h>
 #include <gvc/gvio.h>
+#include <stdbool.h>
 #include <stdlib.h>
 
 GVC_t *gvContext(void)
@@ -87,9 +88,9 @@ int gvRender(GVC_t *gvc, graph_t *g, const char *format, FILE *out)
     g = g->root;
 
     /* create a job for the required format */
-    rc = gvjobs_output_langname(gvc, format);
+    bool r = gvjobs_output_langname(gvc, format);
     job = gvc->job;
-    if (!rc) {
+    if (!r) {
         agerr (AGERR, "Format: \"%s\" not recognized. Use one of:%s\n",
                 format, gvplugin_list(gvc, API_device, format));
         return -1;
@@ -119,9 +120,9 @@ int gvRenderFilename(GVC_t *gvc, graph_t *g, const char *format, const char *fil
     g = g->root;
 
     /* create a job for the required format */
-    rc = gvjobs_output_langname(gvc, format);
+    bool r = gvjobs_output_langname(gvc, format);
     job = gvc->job;
-    if (!rc) {
+    if (!r) {
 	agerr(AGERR, "Format: \"%s\" not recognized. Use one of:%s\n",
                 format, gvplugin_list(gvc, API_device, format));
 	return -1;
@@ -150,9 +151,9 @@ int gvRenderContext(GVC_t *gvc, graph_t *g, const char *format, void *context)
     g = g->root;
 	
     /* create a job for the required format */
-    rc = gvjobs_output_langname(gvc, format);
+    bool r = gvjobs_output_langname(gvc, format);
     job = gvc->job;
-    if (!rc) {
+    if (!r) {
 		agerr(AGERR, "Format: \"%s\" not recognized. Use one of:%s\n",
 			  format, gvplugin_list(gvc, API_device, format));
 		return -1;
@@ -184,9 +185,9 @@ int gvRenderData(GVC_t *gvc, graph_t *g, const char *format, char **result, unsi
     g = g->root;
 
     /* create a job for the required format */
-    rc = gvjobs_output_langname(gvc, format);
+    bool r = gvjobs_output_langname(gvc, format);
     job = gvc->job;
-    if (!rc) {
+    if (!r) {
 	agerr(AGERR, "Format: \"%s\" not recognized. Use one of:%s\n",
                 format, gvplugin_list(gvc, API_device, format));
 	return -1;
diff --git a/lib/gvc/gvcproc.h b/lib/gvc/gvcproc.h
index a213adb98..a267ad3b2 100644
--- a/lib/gvc/gvcproc.h
+++ b/lib/gvc/gvcproc.h
@@ -39,7 +39,7 @@
 /* job */
 
     void gvjobs_output_filename(GVC_t * gvc, const char *name);
-    boolean gvjobs_output_langname(GVC_t * gvc, const char *name);
+    bool gvjobs_output_langname(GVC_t * gvc, const char *name);
     GVJ_t *gvjobs_first(GVC_t * gvc);
     GVJ_t *gvjobs_next(GVC_t * gvc);
     void gvjobs_delete(GVC_t * gvc);
diff --git a/lib/gvc/gvjobs.c b/lib/gvc/gvjobs.c
index 91f0dc2e0..271c31dc6 100644
--- a/lib/gvc/gvjobs.c
+++ b/lib/gvc/gvjobs.c
@@ -16,6 +16,7 @@
 #include        <gvc/gvcjob.h>
 #include        <gvc/gvcint.h>
 #include        <gvc/gvcproc.h>
+#include        <stdbool.h>
 
 static GVJ_t *output_filename_job;
 static GVJ_t *output_langname_job;
@@ -58,7 +59,7 @@ void gvjobs_output_filename(GVC_t * gvc, const char *name)
 }
 
 /* -T switches */
-boolean gvjobs_output_langname(GVC_t * gvc, const char *name)
+bool gvjobs_output_langname(GVC_t * gvc, const char *name)
 {
     if (!gvc->jobs) {
 	output_langname_job = gvc->job = gvc->jobs = zmalloc(sizeof(GVJ_t));
@@ -77,8 +78,8 @@ boolean gvjobs_output_langname(GVC_t * gvc, const char *name)
 
     /* load it now to check that it exists */
     if (gvplugin_load(gvc, API_device, name))
-	return TRUE;
-    return FALSE;
+	return true;
+    return false;
 }
 
 GVJ_t *gvjobs_first(GVC_t * gvc)
diff --git a/tclpkg/tcldot/tcldot-graphcmd.c b/tclpkg/tcldot/tcldot-graphcmd.c
index 42a6cfb7e..d902b201a 100644
--- a/tclpkg/tcldot/tcldot-graphcmd.c
+++ b/tclpkg/tcldot/tcldot-graphcmd.c
@@ -447,12 +447,7 @@ int graphcmd(ClientData clientData, Tcl_Interp * interp,
 	}
 
 	/* process lang first to create job */
-	if (argc < 4) {
-	    i = gvjobs_output_langname(gvc, "dot");
-	} else {
-	    i = gvjobs_output_langname(gvc, argv[3]);
-	}
-	if (!i) {
+	if (!gvjobs_output_langname(gvc, argc < 4 ? "dot" : argv[3])) {
 	    const char *s = gvplugin_list(gvc, API_render, argv[3]);
 	    Tcl_AppendResult(interp, "bad langname: \"", argv[3], "\". Use one of:", s, NULL);
 	    return TCL_ERROR;