Remove the write_all_states() return type (#1995)

The return value is never used, so let's change it to void.

diff --git a/libarchive/archive_check_magic.c b/libarchive/archive_check_magic.c
index 24dc6c50540ee58faf30a93b274dd03287242a87..d12f0c496e279ba298a69e5cfc995bd2783eed52 100644 (file)
--- a/libarchive/archive_check_magic.c
+++ b/libarchive/archive_check_magic.c
@@ -98,13 +98,12 @@ archive_handle_type_name(unsigned m)
        }
 }
 
-
-static char *
+static void
 write_all_states(char *buff, unsigned int states)
 {
        unsigned int lowbit;
 
-       buff[0] = '\0';
+       *buff = '\0';
 
        /* A trick for computing the lowest set bit. */
        while ((lowbit = states & (1 + ~states)) != 0) {
@@ -113,7 +112,6 @@ write_all_states(char *buff, unsigned int states)
                if (states != 0)
                        strcat(buff, "/");
        }
-       return buff;
 }
 
 /*
@@ -159,16 +157,19 @@ __archive_check_magic(struct archive *a, unsigned int magic,
 
        if ((a->state & state) == 0) {
                /* If we're already FATAL, don't overwrite the error. */
-               if (a->state != ARCHIVE_STATE_FATAL)
+               if (a->state != ARCHIVE_STATE_FATAL) {
+                       write_all_states(states1, a->state);
+                       write_all_states(states2, state);
                        archive_set_error(a, -1,
                            "INTERNAL ERROR: Function '%s' invoked with"
                            " archive structure in state '%s',"
                            " should be in state '%s'",
                            function,
-                           write_all_states(states1, a->state),
-                           write_all_states(states2, state));
+                           states1,
+                           states2);
+               }
                a->state = ARCHIVE_STATE_FATAL;
                return (ARCHIVE_FATAL);
        }
-       return ARCHIVE_OK;
+       return (ARCHIVE_OK);
 }