pack: use an agxbuf to simplify some code

Gitlab: #1950

diff --git a/lib/pack/ccomps.c b/lib/pack/ccomps.c
index 4dc9abbb318685fd8e69d7c467e692d037599793..e463b75a2b271c64166a3b8a9fdfc001ba8c4303 100644 (file)
--- a/lib/pack/ccomps.c
+++ b/lib/pack/ccomps.c
@@ -12,6 +12,7 @@
 #include <ctype.h>
 #include <limits.h>
 #include <stdlib.h>
+#include <cgraph/agxbuf.h>
 #include <cgraph/alloc.h>
 #include <cgraph/prisize_t.h>
 #include <cgraph/stack.h>
@@ -82,8 +83,7 @@ static size_t dfs(Agraph_t * g, Agnode_t * n, void *state, stk_t* stk)
     return cnt;
 }
 
-static int isLegal(char *p)
-{
+static int isLegal(const char *p) {
     char c;
 
     while ((c = *p++)) {
@@ -114,24 +114,11 @@ static int markFn (Agnode_t* n, int v)
 
 /* setPrefix:
  */
-static char*
-setPrefix (char* pfx, size_t* lenp, char* buf, size_t buflen)
-{
-    size_t len;
-    char* name;
-
+static void setPrefix(agxbuf *xb, const char *pfx) {
     if (!pfx || !isLegal(pfx)) {
         pfx = "_cc_";
     }
-    len = strlen(pfx);
-    if (len + 25 <= buflen)
-        name = buf;
-    else {
-        name = gv_calloc(len + 25, sizeof(char));
-    }
-    strcpy(name, pfx);
-    *lenp = len;
-    return name;
+    agxbput(xb, pfx);
 }
 
 /* pccomps:
@@ -149,11 +136,9 @@ setPrefix (char* pfx, size_t* lenp, char* buf, size_t buflen)
 Agraph_t **pccomps(Agraph_t * g, int *ncc, char *pfx, bool *pinned)
 {
     size_t c_cnt = 0;
-    char buffer[SMALLBUF];
-    char *name;
+    agxbuf name = {0};
     Agraph_t *out = NULL;
     Agnode_t *n;
-    size_t len;
     size_t bnd = 10;
     bool pin = false;
     stk_t stk;
@@ -163,7 +148,6 @@ Agraph_t **pccomps(Agraph_t * g, int *ncc, char *pfx, bool *pinned)
        *ncc = 0;
        return NULL;
     }
-    name = setPrefix (pfx, &len, buffer, SMALLBUF);
 
     Agraph_t **ccs = gv_calloc(bnd, sizeof(Agraph_t*));
 
@@ -176,8 +160,9 @@ Agraph_t **pccomps(Agraph_t * g, int *ncc, char *pfx, bool *pinned)
        if (MARKED(&stk,n) || !isPinned(n))
            continue;
        if (!out) {
-           sprintf(name + len, "%" PRISIZE_T, c_cnt);
-           out = agsubg(g, name,1);
+           setPrefix(&name, pfx);
+           agxbprint(&name, "%" PRISIZE_T, c_cnt);
+           out = agsubg(g, agxbuse(&name),1);
            agbindrec(out, "Agraphinfo_t", sizeof(Agraphinfo_t), true); //node custom data
            ccs[c_cnt] = out;
            c_cnt++;
@@ -193,8 +178,9 @@ Agraph_t **pccomps(Agraph_t * g, int *ncc, char *pfx, bool *pinned)
     for (n = agfstnode(g); n; n = agnxtnode(g, n)) {
        if (MARKED(&stk,n))
            continue;
-       sprintf(name + len, "%" PRISIZE_T, c_cnt);
-       out = agsubg(g, name,1);
+       setPrefix(&name, pfx);
+       agxbprint(&name, "%" PRISIZE_T, c_cnt);
+       out = agsubg(g, agxbuse(&name), 1);
        agbindrec(out, "Agraphinfo_t", sizeof(Agraphinfo_t), true);     //node custom data
        if (dfs(g, n, out, &stk) == SIZE_MAX) {
            error = 1;
@@ -209,8 +195,7 @@ Agraph_t **pccomps(Agraph_t * g, int *ncc, char *pfx, bool *pinned)
     }
 packerror:
     freeStk (&stk);
-    if (name != buffer)
-       free(name);
+    agxbfree(&name);
     if (error) {
        *ncc = 0;
        for (size_t i=0; i < c_cnt; i++) {
@@ -239,11 +224,9 @@ packerror:
 Agraph_t **ccomps(Agraph_t * g, int *ncc, char *pfx)
 {
     size_t c_cnt = 0;
-    char buffer[SMALLBUF];
-    char *name;
+    agxbuf name = {0};
     Agraph_t *out;
     Agnode_t *n;
-    size_t len;
     size_t bnd = 10;
     stk_t stk;
 
@@ -251,7 +234,6 @@ Agraph_t **ccomps(Agraph_t * g, int *ncc, char *pfx)
        *ncc = 0;
        return NULL;
     }
-    name = setPrefix (pfx, &len, buffer, SMALLBUF);
 
     Agraph_t **ccs = gv_calloc(bnd, sizeof(Agraph_t*));
     initStk(&stk, insertFn, markFn);
@@ -261,14 +243,14 @@ Agraph_t **ccomps(Agraph_t * g, int *ncc, char *pfx)
     for (n = agfstnode(g); n; n = agnxtnode(g, n)) {
        if (MARKED(&stk,n))
            continue;
-       sprintf(name + len, "%" PRISIZE_T, c_cnt);
-       out = agsubg(g, name,1);
+       setPrefix(&name, pfx);
+       agxbprint(&name, "%" PRISIZE_T, c_cnt);
+       out = agsubg(g, agxbuse(&name), 1);
        agbindrec(out, "Agraphinfo_t", sizeof(Agraphinfo_t), true);     //node custom data
        if (dfs(g, n, out, &stk) == SIZE_MAX) {
            freeStk (&stk);
            free (ccs);
-           if (name != buffer)
-               free(name);
+           agxbfree(&name);
            *ncc = 0;
            return NULL;
        }
@@ -281,8 +263,7 @@ Agraph_t **ccomps(Agraph_t * g, int *ncc, char *pfx)
     }
     freeStk (&stk);
     ccs = gv_recalloc(ccs, bnd, c_cnt, sizeof(Agraph_t*));
-    if (name != buffer)
-       free(name);
+    agxbfree(&name);
     *ncc = (int) c_cnt;
     return ccs;
 }
@@ -556,13 +537,11 @@ Agraph_t **cccomps(Agraph_t * g, int *ncc, char *pfx)
 {
     Agraph_t *dg;
     size_t n_cnt, c_cnt, e_cnt;
-    char *name;
+    agxbuf name = {0};
     Agraph_t *out;
     Agraph_t *dout;
     Agnode_t *dn;
-    char buffer[SMALLBUF];
     stk_t stk;
-    size_t len;
     int sz = (int) sizeof(ccgraphinfo_t);
 
     if (agnnodes(g) == 0) {
@@ -576,8 +555,6 @@ Agraph_t **cccomps(Agraph_t * g, int *ncc, char *pfx)
     /* Bind ccgraphinfo to graph and all subgraphs */
     aginit(g, AGNODE, NRECNAME, sizeof(ccgnodeinfo_t), FALSE);
 
-    name = setPrefix (pfx, &len, buffer, SMALLBUF);
-
     dg = deriveGraph(g);
 
     size_t ccs_length = (size_t)agnnodes(dg);
@@ -588,9 +565,11 @@ Agraph_t **cccomps(Agraph_t * g, int *ncc, char *pfx)
     for (dn = agfstnode(dg); dn; dn = agnxtnode(dg, dn)) {
        if (MARKED(&stk,dn))
            continue;
-       sprintf(name + len, "%" PRISIZE_T, c_cnt);
-       dout = agsubg(dg, name, 1);
-       out = agsubg(g, name, 1);
+       setPrefix(&name, pfx);
+       agxbprint(&name, "%" PRISIZE_T, c_cnt);
+       char *name_str = agxbuse(&name);
+       dout = agsubg(dg, name_str, 1);
+       out = agsubg(g, name_str, 1);
        agbindrec(out, GRECNAME, sizeof(ccgraphinfo_t), false);
        GD_cc_subg(out) = 1;
        n_cnt = dfs(dg, dn, dout, &stk);
@@ -600,8 +579,7 @@ Agraph_t **cccomps(Agraph_t * g, int *ncc, char *pfx)
            agclean (g, AGNODE, NRECNAME);
            freeStk (&stk);
            free(ccs);
-           if (name != buffer)
-               free(name);
+           agxbfree(&name);
            *ncc = 0;
            return NULL;
        }
@@ -625,8 +603,7 @@ Agraph_t **cccomps(Agraph_t * g, int *ncc, char *pfx)
     agclean (g, AGNODE, NRECNAME);
     freeStk (&stk);
     ccs = gv_recalloc(ccs, ccs_length, c_cnt, sizeof(Agraph_t*));
-    if (name != buffer)
-       free(name);
+    agxbfree(&name);
     *ncc = (int) c_cnt;
     return ccs;
 }