- remove superfluous C statements ";;" in decompress_unzip.c, dpkg_deb.c ifconfig.c

- gzip.c: see if O_NOFOLLOW is defined before using it, else take alternate path
closes bug #221 (partially; The rest will follow later).


git-svn-id: svn://busybox.net/trunk/busybox@11797 69ca8d6d-28ef-0310-b511-8ec308f3f277

4 files changed, 5 insertions, 5 deletions

diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index 1e8bd8ad2..1ceaa60e0 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -75,7 +75,7 @@ extern int dpkg_deb_main(int argc, char **argv)
                  * it should accept a second argument which specifies a
                  * specific field to print */
                 ar_archive->accept = control_tar_llist;
-                tar_archive->accept = llist_add_to(NULL, "./control");;
+                tar_archive->accept = llist_add_to(NULL, "./control");
                 tar_archive->filter = filter_accept_list;
                 tar_archive->action_data = data_extract_to_stdout;
         }
diff --git a/archival/gzip.c b/archival/gzip.c
index 6cf4b395e..a527f0e40 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -1270,7 +1270,7 @@ int gzip_main(int argc, char **argv)
                                         strcat(path, ".gz");
 
                                         /* Open output file */
-#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)
+#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) && defined O_NOFOLLOW
                                         outFileNum =
                                                 open(path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW);
 #else
diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c
index 9e327606e..e8767cef5 100644
--- a/archival/libunarchive/decompress_unzip.c
+++ b/archival/libunarchive/decompress_unzip.c
@@ -442,7 +442,7 @@ static int inflate_codes(huft_t * my_tl, huft_t * my_td, const unsigned int my_b
                 if ((e = (t = tl + ((unsigned) b & ml))->e) > 16)
                         do {
                                 if (e == 99) {
-                                        bb_error_msg_and_die("inflate_codes error 1");;
+                                        bb_error_msg_and_die("inflate_codes error 1");
                                 }
                                 b >>= t->b;
                                 k -= t->b;
@@ -478,7 +478,7 @@ static int inflate_codes(huft_t * my_tl, huft_t * my_td, const unsigned int my_b
                         if ((e = (t = td + ((unsigned) b & md))->e) > 16)
                                 do {
                                         if (e == 99)
-                                                bb_error_msg_and_die("inflate_codes error 2");;
+                                                bb_error_msg_and_die("inflate_codes error 2");
                                         b >>= t->b;
                                         k -= t->b;
                                         e -= 16;
diff --git a/networking/ifconfig.c b/networking/ifconfig.c
index b121eb9f3..eddf052e0 100644
--- a/networking/ifconfig.c
+++ b/networking/ifconfig.c
@@ -353,7 +353,7 @@ int ifconfig_main(int argc, char **argv)
                 for (op = OptArray; op->name; op++) {   /* Find table entry. */
                         if (strcmp(p, op->name) == 0) { /* If name matches... */
                                 if ((mask &= op->flags)) {      /* set the mask and go. */
-                                        goto FOUND_ARG;;
+                                        goto FOUND_ARG;
                                 }
                                 /* If we get here, there was a valid arg with an */
                                 /* invalid '-' prefix. */