From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Fri, 2 Sep 2022 01:53:49 +0000 (-0700)
Subject: smyrna smyrnaPath: use cgraph wrapper for allocation
X-Git-Tag: 6.0.1~13^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5278d5042329417768a7f773a0f9e60c0f1e87bd;p=graphviz

smyrna smyrnaPath: use cgraph wrapper for allocation

The lib/cgraph/alloc.h wrappers are similar to the older lib/common/memory.h
wrappers except (1) they are header-only and (2) they live in a directory
(cgraph) that is at the root of the dependency tree. The long term plan is to
replace all use of lib/common/memory.h with lib/cgraph/alloc.h.
---

diff --git a/cmd/smyrna/main.c b/cmd/smyrna/main.c
index 55a2e2318..be908ba13 100644
--- a/cmd/smyrna/main.c
+++ b/cmd/smyrna/main.c
@@ -24,6 +24,7 @@
 #include "support.h"
 #include "menucallbacks.h"
 #include "gltemplate.h"
+#include <cgraph/alloc.h>
 #include <cgraph/exit.h>
 #include <common/memory.h>
 #include "gvprpipe.h"
@@ -52,7 +53,6 @@ static char *smyrnaGlade;
  */
 char *smyrnaPath(char *suffix)
 {
-    char *buf;
     static size_t baselen;
 #ifdef _WIN32
     char *pathSep = "\\";
@@ -65,7 +65,7 @@ char *smyrnaPath(char *suffix)
 	baselen = strlen(smyrnaDir) + 2;
     }
     size_t slen = strlen(suffix);
-    buf = N_NEW(baselen+slen, char);
+    char *buf = gv_calloc(baselen + slen, sizeof(char));
     sprintf(buf, "%s%s%s", smyrnaDir, pathSep, suffix);
     return buf;
 }