global_def: remove 'dclfun' argument

This function is only ever called with `agattr` as this parameter. Removing this
takes care of the sole use of `agattr` with a function pointer, clearing the way
to modify the type signature of `agattr`. Related to #634.

diff --git a/lib/common/input.c b/lib/common/input.c
index e4d3778697f030fc5e5b95a678cda7eae5a7abb6..fc28c5289f47e1df215262777bd18ab0e4342c57 100644 (file)
--- a/lib/common/input.c
+++ b/lib/common/input.c
@@ -175,9 +175,7 @@ static void use_library(GVC_t *gvc, const char *name)
     gvc->common.lib = Lib;
 }
 
-static void global_def(agxbuf* xb, char *dcl, int kind,
-         attrsym_t * ((*dclfun) (Agraph_t *, int kind, char *, char *)) )
-{
+static void global_def(agxbuf* xb, char *dcl, int kind) {
     char *p;
     char *rhs = "true";
 
@@ -188,7 +186,7 @@ static void global_def(agxbuf* xb, char *dcl, int kind,
     }
     else
        agxbput (xb, dcl);
-    sym = dclfun(NULL, kind, agxbuse (xb), rhs);
+    sym = agattr(NULL, kind, agxbuse (xb), rhs);
     sym->fixed = 1;
 }
 
@@ -269,7 +267,7 @@ int dotneato_args_initialize(GVC_t * gvc, int argc, char **argv)
            switch (c = argv[i][1]) {
            case 'G':
                if (*rest)
-                   global_def(&xb, rest, AGRAPH, agattr);
+                   global_def(&xb, rest, AGRAPH);
                else {
                    fprintf(stderr, "Missing argument for -G flag\n");
                    return (dotneato_usage(1));
@@ -277,7 +275,7 @@ int dotneato_args_initialize(GVC_t * gvc, int argc, char **argv)
                break;
            case 'N':
                if (*rest)
-                   global_def(&xb, rest, AGNODE,agattr);
+                   global_def(&xb, rest, AGNODE);
                else {
                    fprintf(stderr, "Missing argument for -N flag\n");
                    return (dotneato_usage(1));
@@ -285,7 +283,7 @@ int dotneato_args_initialize(GVC_t * gvc, int argc, char **argv)
                break;
            case 'E':
                if (*rest)
-                   global_def(&xb, rest, AGEDGE,agattr);
+                   global_def(&xb, rest, AGEDGE);
                else {
                    fprintf(stderr, "Missing argument for -E flag\n");
                    return (dotneato_usage(1));