Merge branch 'busybox' into merge

2 files changed, 3 insertions, 4 deletions

diff --git a/networking/brctl.c b/networking/brctl.c
index 7b0270b51..0f8dc2f7a 100644
--- a/networking/brctl.c
+++ b/networking/brctl.c
@@ -538,7 +538,7 @@ int brctl_main(int argc UNUSED_PARAM, char **argv)
                 DIR *net;
                 struct dirent *ent;
                 int need_hdr = 1;
-                int exitcode = EXIT_SUCCESS;
+                exitcode_t exitcode = EXIT_SUCCESS;
 
                 if (*argv) {
                         /* "show BR1 BR2 BR3" */
diff --git a/networking/tc.c b/networking/tc.c
index 43187f7ee..3a79fd2d9 100644
--- a/networking/tc.c
+++ b/networking/tc.c
@@ -502,7 +502,7 @@ int tc_main(int argc UNUSED_PARAM, char **argv)
         };
         struct rtnl_handle rth;
         struct tcmsg msg;
-        int ret, obj, cmd, arg;
+        int obj, cmd, arg;
         char *dev = NULL;
 
         INIT_G();
@@ -510,7 +510,6 @@ int tc_main(int argc UNUSED_PARAM, char **argv)
         if (!*++argv)
                 bb_show_usage();
         xrtnl_open(&rth);
-        ret = EXIT_SUCCESS;
 
         obj = index_in_substrings(objects, *argv++);
         if (obj < 0)
@@ -625,5 +624,5 @@ int tc_main(int argc UNUSED_PARAM, char **argv)
         if (ENABLE_FEATURE_CLEAN_UP) {
                 rtnl_close(&rth);
         }
-        return ret;
+        return EXIT_SUCCESS;
 }