From 069ab785f42e1470b5d97e5b1b18adb6ca7cf3df Mon Sep 17 00:00:00 2001
From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 5 Nov 2022 09:00:34 -0700
Subject: [PATCH] prune: remove 'add_to_generic_list' return value

As of the previous commit, there is only a single path through this function
that always returns the first parameter.
---
 contrib/prune/generic_list.c |  4 +---
 contrib/prune/generic_list.h |  2 +-
 contrib/prune/prune.c        | 18 ++++++++----------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/contrib/prune/generic_list.c b/contrib/prune/generic_list.c
index 5484eb362..f75d3705e 100644
--- a/contrib/prune/generic_list.c
+++ b/contrib/prune/generic_list.c
@@ -34,8 +34,7 @@ void free_generic_list(generic_list_t * list)
     free(list);
 }
 
-generic_list_t *add_to_generic_list(generic_list_t * list, gl_data element)
-{
+void add_to_generic_list(generic_list_t *list, gl_data element) {
     uint64_t new_size;
 
     if (list->size == list->used) {
@@ -50,5 +49,4 @@ generic_list_t *add_to_generic_list(generic_list_t * list, gl_data element)
 	list->size = new_size;
     }
     list->data[list->used++] = element;
-    return list;
 }
diff --git a/contrib/prune/generic_list.h b/contrib/prune/generic_list.h
index 05f658402..9eb5c3690 100644
--- a/contrib/prune/generic_list.h
+++ b/contrib/prune/generic_list.h
@@ -19,6 +19,6 @@
     } generic_list_t;
 
     extern generic_list_t *new_generic_list(uint64_t size);
-    extern generic_list_t *add_to_generic_list(generic_list_t * list,
+    extern void add_to_generic_list(generic_list_t * list,
 					       gl_data element);
     extern void free_generic_list(generic_list_t * list);
diff --git a/contrib/prune/prune.c b/contrib/prune/prune.c
index b5a8e28ca..d155fa41d 100644
--- a/contrib/prune/prune.c
+++ b/contrib/prune/prune.c
@@ -29,8 +29,8 @@ typedef struct strattr_s {
 int remove_child(Agraph_t * graph, Agnode_t * node);
 void help_message(const char *progname);
 
-generic_list_t *addattr(generic_list_t * l, char *a);
-generic_list_t *addnode(generic_list_t * l, char *n);
+void addattr(generic_list_t * l, char *a);
+void addnode(generic_list_t * l, char *n);
 
 int verbose = 0;		/* Flag to indicate verbose message output */
 
@@ -88,12 +88,12 @@ int main(int argc, char **argv)
 	switch (c) {
 	case 'N':
 	    {
-		attr_list = addattr(attr_list, optarg);
+		addattr(attr_list, optarg);
 		break;
 	    }
 	case 'n':
 	    {
-		node_list = addnode(node_list, optarg);
+		addnode(node_list, optarg);
 		break;
 	    }
 	case 'h':
@@ -251,8 +251,7 @@ Agraph_t *gread(FILE * fp)
 }
 
 /* add element to attribute list */
-generic_list_t *addattr(generic_list_t * l, char *a)
-{
+void addattr(generic_list_t * l, char *a) {
     char *p;
 
     strattr_t *sp = gv_alloc(sizeof(strattr_t));
@@ -271,13 +270,12 @@ generic_list_t *addattr(generic_list_t * l, char *a)
     /* pointer to argument value */
     sp->v = gv_strdup(p);
 
-    return add_to_generic_list(l, (gl_data) sp);
+    add_to_generic_list(l, (gl_data) sp);
 }
 
 /* add element to node list */
-generic_list_t *addnode(generic_list_t * l, char *n)
-{
+void addnode(generic_list_t *l, char *n) {
     char *sp = gv_strdup(n);
 
-    return add_to_generic_list(l, (gl_data) sp);
+    add_to_generic_list(l, (gl_data) sp);
 }
-- 
2.50.1