Merge branch 'rs/merge-recursive-string-list-init' into maint

diff --git a/common-main.c b/common-main.c
index 3be5ad18e1d07fe9dad4b2d9df37a619bd175a33..44a29e8b13cb5203e2d35c99b8e2b5fec49f6981 100644 (file)
--- a/common-main.c
+++ b/common-main.c
@@ -22,14 +22,8 @@ static void restore_sigpipe_to_default(void)
        signal(SIGPIPE, SIG_DFL);
 }
 
-int main(int argc, char **av)
+int main(int argc, const char **argv)
 {
-       /*
-        * This const trickery is explained in
-        * 84d32bf7678259c08406571cd6ce4b7a6724dcba
-        */
-       const char **argv = (const char **)av;
-
        /*
         * Always open file descriptors 0/1/2 to avoid clobbering files
         * in die().  It also avoids messing up when the pipes are dup'ed