replace all instances of return from main with graphviz_exit()

Fixes https://gitlab.com/graphviz/graphviz/-/issues/2178.

diff --git a/cmd/dot/dot.c b/cmd/dot/dot.c
index 6781f1cf5b4e57c9d1556104f9f21a46495ebad9..ab3fc53edfbc49b080c9206e9ab44dc70243e626 100644 (file)
--- a/cmd/dot/dot.c
+++ b/cmd/dot/dot.c
@@ -134,5 +134,5 @@ int main(int argc, char **argv)
     }
     gvFinalize(Gvc);
     r = gvFreeContext(Gvc);
-    return (MAX(rc,r));
+    graphviz_exit(MAX(rc,r));
 }

diff --git a/cmd/edgepaint/edgepaintmain.c b/cmd/edgepaint/edgepaintmain.c
index c6fa23065f9f52832643767488eba346c28488b3..f5f223c61bb03c28e64d7f25038781debbcf80dd 100644 (file)
--- a/cmd/edgepaint/edgepaintmain.c
+++ b/cmd/edgepaint/edgepaintmain.c
@@ -308,5 +308,5 @@ int main(int argc, char *argv[])
                }
        }
 
-       return rv;
+       graphviz_exit(rv);
 }

diff --git a/cmd/gvedit/main.cpp b/cmd/gvedit/main.cpp
index f4a7406fcb650788f24c9deacbfbc81fddc4c51d..285deda8c5c3f74959c0062ab71685aee9b49d4f 100644 (file)
--- a/cmd/gvedit/main.cpp
+++ b/cmd/gvedit/main.cpp
@@ -21,6 +21,7 @@
 #include <getopt.h>
 #include <gvc/gvc.h>
 #include <common/globals.h>
+#include <cgraph/exit.h>
 
 
 #ifdef _WIN32
@@ -42,7 +43,7 @@ static char useString[] = "Usage: gvedit [-v?] <files>\n\
 static void usage(int v)
 {
     printf("%s",useString);
-    exit(v);
+    graphviz_exit(v);
 }
 
 static char **parseArgs(int argc, char *argv[])
@@ -89,5 +90,5 @@ int main(int argc, char *argv[])
     CMainWindow mainWin(&files);
     mainWin.show();
     ret = app.exec();
-    return ret;
+    graphviz_exit(ret);
 }

diff --git a/cmd/gvmap/cluster.c b/cmd/gvmap/cluster.c
index f9573d29a7e5e9c49df3a4f8dabd4bb86f75e607..bfe14c0f68c66e1e37c1fd203479d7a070cd9412 100644 (file)
--- a/cmd/gvmap/cluster.c
+++ b/cmd/gvmap/cluster.c
@@ -153,5 +153,5 @@ int main(int argc, char *argv[])
     prevg = g;
   }
 
-  return 0; 
+  graphviz_exit(0);
 }

diff --git a/cmd/gvmap/gvmap.c b/cmd/gvmap/gvmap.c
index f206ff0d2fa015e922027aa6bb7ff302382852e6..57e656b7a90f943379add347cff7960d7e128bf1 100644 (file)
--- a/cmd/gvmap/gvmap.c
+++ b/cmd/gvmap/gvmap.c
@@ -468,5 +468,5 @@ int main(int argc, char *argv[])
     prevg = g;
   }
 
-  return 0; 
+  graphviz_exit(0);
 }

diff --git a/cmd/gvpr/gvprmain.c b/cmd/gvpr/gvprmain.c
index a3e9a5e04a4c74b1cfa64ef3047f27c6b14f0141..228e8365b9a9d52532ba5c087ae4304c68bcbc71 100644 (file)
--- a/cmd/gvpr/gvprmain.c
+++ b/cmd/gvpr/gvprmain.c
@@ -27,6 +27,7 @@
 
 
 #include <cgraph/cgraph.h>
+#include <cgraph/exit.h>
 #include <gvpr/gvpr.h>
 
 #ifdef DEBUG
@@ -86,7 +87,7 @@ main (int argc, char* argv[])
 
     rv = gvpr (argc, argv, &opts);
 
-    return rv;
+    graphviz_exit(rv);
 }
 
 #else
@@ -100,8 +101,7 @@ main (int argc, char* argv[])
     opts.flags = GV_USE_EXIT;
     opts.bindings = 0;
     
-    
-    return gvpr (argc, argv, &opts);
+    graphviz_exit(gvpr(argc, argv, &opts));
 }
 
 #endif

diff --git a/cmd/lefty/lefty.c b/cmd/lefty/lefty.c
index 56d8d551e4faef86be48450449202c71dd86e713..65390a5f68a2ec3f279c52959ad4f04d65dee58b 100644 (file)
--- a/cmd/lefty/lefty.c
+++ b/cmd/lefty/lefty.c
@@ -199,7 +199,7 @@ eop:
     term ();
 #endif
     printusage ();
-    return 0;
+    graphviz_exit(0);
 }
 
 #else
@@ -232,7 +232,7 @@ int APIENTRY WinMain (
     processstr (leftyoptions);
     argv = CommandLineToArgvW(lpCmdLine, &argc);
     if (argv == NULL)
-      return EXIT_FAILURE;
+      graphviz_exit(EXIT_FAILURE);
     processargs(argc, argv);
     LocalFree(argv);
 

diff --git a/cmd/mingle/minglemain.cpp b/cmd/mingle/minglemain.cpp
index 42e4f1def3328b815e637f361b6e3a619296971c..fcdf8f6525d31d6721b49d683bc39c8ca6028528 100644 (file)
--- a/cmd/mingle/minglemain.cpp
+++ b/cmd/mingle/minglemain.cpp
@@ -11,6 +11,7 @@
 #include "config.h"
 
 #include <cgraph/cgraph.h>
+#include <cgraph/exit.h>
 #include <ingraphs/ingraphs.h>
 #include <common/pointset.h>
 #include <getopt.h>
@@ -57,7 +58,7 @@ static FILE *openFile(const char *name, const char* cmd)
        fp = fopen(name, "w");
        if (!fp) {
                std::cerr << cmd << ": could not open file " << name << " for writing\n";
-               exit(-1);
+               graphviz_exit(-1);
        }
        return (fp);
 }
@@ -81,7 +82,7 @@ static void
 usage (int eval)
 {
        std::cerr << use_msg;
-       exit(eval);
+       graphviz_exit(eval);
 }
 
 /* checkG:
@@ -503,5 +504,5 @@ int main(int argc, char *argv[])
                rv |= bundle (g, &opts);
        }
 
-       return rv;
+       graphviz_exit(rv);
 }

diff --git a/cmd/smyrna/main.c b/cmd/smyrna/main.c
index 60083869855e802b97ffc482b00a6c8652ef881e..4abe6547614f948134562bd89d6d083c80aff3ce 100644 (file)
--- a/cmd/smyrna/main.c
+++ b/cmd/smyrna/main.c
@@ -190,12 +190,12 @@ int main(int argc, char *argv[])
 
        if (VirtualQuery (&main, &mbi, sizeof(mbi)) == 0) {
            fprintf (stderr,"failed to get handle for executable.\n");
-           return 1;
+           graphviz_exit(1);
        }
        r = GetModuleFileName ((HMODULE)mbi.AllocationBase, line, BSZ);
        if (!r || (r == BSZ)) {
            fprintf (stderr,"failed to get path for executable.\n");
-           return 1;
+           graphviz_exit(1);
        }
 
        /* line contains path to smyrna: "$GVROOT\bin\smyrna.exe" 
@@ -205,12 +205,12 @@ int main(int argc, char *argv[])
        s = strrchr(line,'\\');
        if (!s) {
            fprintf (stderr,"no backslash in path %s.\n", line);
-           return 1;
+           graphviz_exit(1);
        }
        while ((s != line) && (*(--s) != '\\')) ;
        if (s == line) {
            fprintf (stderr,"no backslash in path %s.\n", line);
-           return 1;
+           graphviz_exit(1);
        }
        *s = '\0';
 
@@ -253,5 +253,5 @@ int main(int argc, char *argv[])
     g_free(package_data_dir);
 #endif
     g_free(package_locale_dir);
-    return 0;
+    graphviz_exit(0);
 }

diff --git a/cmd/tools/bcomps.c b/cmd/tools/bcomps.c
index bab9b6c4a120480e030c727f485b48d11d66c152..00b132eabe70457a1ea8f058f4a38ab26062931b 100644 (file)
--- a/cmd/tools/bcomps.c
+++ b/cmd/tools/bcomps.c
@@ -392,5 +392,5 @@ int main(int argc, char *argv[])
        gcnt++;
     }
 
-    return r;
+    graphviz_exit(r);
 }

diff --git a/cmd/tools/ccomps.c b/cmd/tools/ccomps.c
index 014385874e3404a3a32f2186f9d513143e494040..6c71efb79fc78f002cac72300949df1f2a67a900 100644 (file)
--- a/cmd/tools/ccomps.c
+++ b/cmd/tools/ccomps.c
@@ -925,5 +925,5 @@ int main(int argc, char *argv[])
        agclose(g);
     }
 
-    return r;
+    graphviz_exit(r);
 }

diff --git a/cmd/tools/gc.c b/cmd/tools/gc.c
index 2c9e6594e8c55ce106eeb2e4a851f71130bf3fc8..1a291051b270d49b021b55af4afa8320eec2e727 100644 (file)
--- a/cmd/tools/gc.c
+++ b/cmd/tools/gc.c
@@ -377,5 +377,5 @@ int main(int argc, char *argv[])
     if (n_graphs > 1)
        wcp(tot_nodes, tot_edges, tot_cc, tot_cl, "total", 0);
 
-    return rv;
+    graphviz_exit(rv);
 }

diff --git a/cmd/tools/gmlparse.y b/cmd/tools/gmlparse.y
index 93a4dce41cfd50bfa7885cd531a61d9e74150c01..7491461fb37bb32896959522e1b3602f561083ec 100644 (file)
--- a/cmd/tools/gmlparse.y
+++ b/cmd/tools/gmlparse.y
@@ -24,6 +24,7 @@
 #include <gml2gv.h>
 #include <agxbuf.h>
 #include <assert.h>
+#include <cgraph/exit.h>
 
 #define NEW(t)       malloc(sizeof(t))
 #define N_NEW(n,t)   calloc((n),sizeof(t))
@@ -733,7 +734,7 @@ static Agraph_t *mkGraph(gmlgraph *graph, Agraph_t *parent, char *name,
     for (np = dtfirst(graph->nodelist); np; np = dtnext(graph->nodelist, np)) {
        if (!np->id) {
           fprintf (stderr, "node without an id attribute"); 
-          exit (1);
+          graphviz_exit (1);
         }
        n = agnode (g, np->id, 1);
        addAttrs ((Agobj_t*)n, np->attrlist, xb, unk);
@@ -742,11 +743,11 @@ static Agraph_t *mkGraph(gmlgraph *graph, Agraph_t *parent, char *name,
     for (ep = dtfirst(graph->edgelist); ep; ep = dtnext(graph->edgelist, ep)) {
        if (!ep->source) {
           fprintf (stderr, "edge without an source attribute"); 
-          exit (1);
+          graphviz_exit (1);
         }
        if (!ep->target) {
           fprintf (stderr, "node without an target attribute"); 
-          exit (1);
+          graphviz_exit (1);
         }
        n = agnode (g, ep->source, 1);
        h = agnode (g, ep->target, 1);

diff --git a/cmd/tools/mm2gv.c b/cmd/tools/mm2gv.c
index dab5fafddda5234f798450444f9405e32079e88c..56c76f1bf547156b87107a241d4389a0ce1c9e4b 100644 (file)
--- a/cmd/tools/mm2gv.c
+++ b/cmd/tools/mm2gv.c
@@ -338,6 +338,6 @@ int main(int argc, char *argv[])
 
     agwrite(g, pv.outf);
 
-    return 0;
+    graphviz_exit(0);
 }
 

diff --git a/cmd/tools/nop.c b/cmd/tools/nop.c
index 6c902c931f9714f26fca7d9c7d280ea9c15ca88f..881e9527ebcb12572a46110ca9341009233d73b0 100644 (file)
--- a/cmd/tools/nop.c
+++ b/cmd/tools/nop.c
@@ -85,5 +85,5 @@ int main(int argc, char **argv)
        agclose(g);
     }
 
-    return (ig.errors != 0 || agerrors() != 0) ? EXIT_FAILURE : EXIT_SUCCESS;
+    graphviz_exit(ig.errors != 0 || agerrors() != 0 ? EXIT_FAILURE : EXIT_SUCCESS);
 }

diff --git a/cmd/tools/sccmap.c b/cmd/tools/sccmap.c
index 707235c3dcfcbdc6cd8db3989f790e991d53886d..519a08c93eac2cf174910d54f90f5e1fbc025d89 100644 (file)
--- a/cmd/tools/sccmap.c
+++ b/cmd/tools/sccmap.c
@@ -381,5 +381,5 @@ int main(int argc, char **argv)
        agclose(g);
     }
 
-    return 0;
+    graphviz_exit(0);
 }

diff --git a/cmd/tools/tred.c b/cmd/tools/tred.c
index 2e4e51495953650f0697c8033a26bec7a94e8a2b..0332b15b9f29fd36236cd464cfe30e3be30095d4 100644 (file)
--- a/cmd/tools/tred.c
+++ b/cmd/tools/tred.c
@@ -331,6 +331,6 @@ int main(int argc, char **argv)
        agclose(g);
     }
 
-    return 0;
+    graphviz_exit(0);
 }
 

diff --git a/cmd/tools/unflatten.c b/cmd/tools/unflatten.c
index 6c57283a47fd2c0b69d22b8d3513d8010f36b8e7..d0548c97b0eac9e6139e0ed7866272f8831e1cdf 100644 (file)
--- a/cmd/tools/unflatten.c
+++ b/cmd/tools/unflatten.c
@@ -230,5 +230,5 @@ int main(int argc, char **argv)
        transform(g);
        agwrite(g, outFile);
     }
-    return 0;
+    graphviz_exit(0);
 }

diff --git a/contrib/diffimg/diffimg.c b/contrib/diffimg/diffimg.c
index 5d2d30f7c9bd086486ba2f26d6060ea32e5af871..3af05d2df3a59d14f29da56a4741c964f5579a86 100644 (file)
--- a/contrib/diffimg/diffimg.c
+++ b/contrib/diffimg/diffimg.c
@@ -194,6 +194,6 @@ int main(int argc, char **argv)
     gdImageDestroy(B);
     gdImageDestroy(C);
 
-    return (rc ? EXIT_FAILURE : EXIT_SUCCESS);
+    graphviz_exit(rc ? EXIT_FAILURE : EXIT_SUCCESS);
 }
 

diff --git a/lib/common/xml.c b/lib/common/xml.c
index d4103fc09f3d7b6d52f0ba5ebd4d54dd9e1565ac..f1ca101f3fe616c0a4bbf5a2d270f62482f0f51d 100644 (file)
--- a/lib/common/xml.c
+++ b/lib/common/xml.c
@@ -233,7 +233,7 @@ int main(int argc, char **argv) {
 
     default:
       fprintf(stderr, "unexpected error\n");
-      return EXIT_FAILURE;
+      graphviz_exit(EXIT_FAILURE);
     }
   }
 
@@ -241,9 +241,9 @@ int main(int argc, char **argv) {
   for (int i = optind; i < argc; ++i) {
     int r = xml_escape(argv[i], flags, put, stdout);
     if (r < 0)
-      return EXIT_FAILURE;
+      graphviz_exit(EXIT_FAILURE);
   }
 
-  return EXIT_SUCCESS;
+  graphviz_exit(EXIT_SUCCESS);
 }
 #endif

diff --git a/lib/gvc/gvdevice.c b/lib/gvc/gvdevice.c
index ba922b63627ed919205ca5bad4e6b31035f0f11b..e2bcff3dd9d4f075714394f8c5e8092443515d58 100644 (file)
--- a/lib/gvc/gvdevice.c
+++ b/lib/gvc/gvdevice.c
@@ -531,7 +531,7 @@ int main (int argc, char *argv[])
         fprintf (stdout, "%g = %s %d\n", test[i], buf, len);
     }
 
-    return 0;
+    graphviz_exit(0);
 }
 #endif
 

diff --git a/lib/label/nrtmain.c b/lib/label/nrtmain.c
index 6ec8d87387f16cea53926ce27388106ceee94d0b..fa0a8d8a62224fd6817032e86849a43152f4ed79 100644 (file)
--- a/lib/label/nrtmain.c
+++ b/lib/label/nrtmain.c
@@ -316,5 +316,5 @@ int main(int argc, char *argv[])
 
     init(argc, argv, &opts);
     doxlabel(&opts);
-    return 0;
+    graphviz_exit(0);
 }