*: remove some uses of argc

function                                             old     new   delta
whoami_main                                           34      37      +3
logname_main                                          60      63      +3
hostid_main                                           35      38      +3
ttysize_main                                         136     135      -1
nmeter_main                                          673     672      -1
logger_main                                          387     386      -1
uuencode_main                                        330     328      -2
ifupdown_main                                       2125    2123      -2
mesg_main                                            158     155      -3
free_main                                            333     330      -3
cal_main                                             902     899      -3
acpid_main                                           443     440      -3
ar_main                                              196     189      -7
find_main                                            476     467      -9
ifconfig_main                                       1235    1221     -14
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/12 up/down: 9/-49)            Total: -40 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

2 files changed, 7 insertions, 4 deletions

diff --git a/archival/ar.c b/archival/ar.c
index a1bcb1f9c..1b43502ca 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -38,7 +38,7 @@ static void FAST_FUNC header_verbose_list_ar(const file_header_t *file_header)
 #define AR_OPT_INSERT           0x40
 
 int ar_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int ar_main(int argc, char **argv)
+int ar_main(int argc UNUSED_PARAM, char **argv)
 {
         static const char msg_unsupported_err[] ALIGN1 =
                 "archive %s is not supported";
@@ -51,6 +51,7 @@ int ar_main(int argc, char **argv)
         /* Prepend '-' to the first argument if required */
         opt_complementary = "--:p:t:x:-1:p--tx:t--px:x--pt";
         opt = getopt32(argv, "ptxovcr");
+        argv += optind;
 
         if (opt & AR_CTX_PRINT) {
                 archive_handle->action_data = data_extract_to_stdout;
@@ -76,9 +77,9 @@ int ar_main(int argc, char **argv)
 
         archive_handle->src_fd = xopen(argv[optind++], O_RDONLY);
 
-        while (optind < argc) {
+        while (*argv) {
                 archive_handle->filter = filter_accept_list;
-                llist_add_to(&(archive_handle->accept), argv[optind++]);
+                llist_add_to(&archive_handle->accept, *argv++);
         }
 
         unpack_ar_archive(archive_handle);
diff --git a/archival/rpm.c b/archival/rpm.c
index 27c6b78a1..cdaf50fa9 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -116,7 +116,9 @@ int rpm_main(int argc, char **argv)
         }
         argv += optind;
         //argc -= optind;
-        if (!argv[0]) bb_show_usage();
+        if (!argv[0]) {
+                bb_show_usage();
+        }
 
         while (*argv) {
                 rpm_fd = xopen(*argv++, O_RDONLY);