diff options
| -rw-r--r-- | archival/libunarchive/data_extract_to_stdout.c | 1 | ||||
| -rw-r--r-- | archival/libunarchive/filter_accept_list_reassign.c | 10 | ||||
| -rw-r--r-- | archival/libunarchive/get_header_tar_bz2.c | 7 | ||||
| -rw-r--r-- | coreutils/cal.c | 5 | ||||
| -rw-r--r-- | shell/cmdedit.c | 1 |
5 files changed, 3 insertions, 21 deletions
diff --git a/archival/libunarchive/data_extract_to_stdout.c b/archival/libunarchive/data_extract_to_stdout.c index 2e266c046..d87a4a595 100644 --- a/archival/libunarchive/data_extract_to_stdout.c +++ b/archival/libunarchive/data_extract_to_stdout.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include "unarchive.h" | 6 | #include "unarchive.h" |
| 7 | //#include <unistd.h> | ||
| 8 | 7 | ||
| 9 | void data_extract_to_stdout(archive_handle_t *archive_handle) | 8 | void data_extract_to_stdout(archive_handle_t *archive_handle) |
| 10 | { | 9 | { |
diff --git a/archival/libunarchive/filter_accept_list_reassign.c b/archival/libunarchive/filter_accept_list_reassign.c index 04b678007..0fb536fad 100644 --- a/archival/libunarchive/filter_accept_list_reassign.c +++ b/archival/libunarchive/filter_accept_list_reassign.c | |||
| @@ -5,17 +5,13 @@ | |||
| 5 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 5 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <stdlib.h> | ||
| 9 | #include <string.h> | ||
| 10 | #include <unistd.h> | ||
| 11 | |||
| 12 | #include "libbb.h" | 8 | #include "libbb.h" |
| 13 | #include "unarchive.h" | 9 | #include "unarchive.h" |
| 14 | 10 | ||
| 15 | /* | 11 | /* |
| 16 | * Reassign the subarchive metadata parser based on the filename extension | 12 | * Reassign the subarchive metadata parser based on the filename extension |
| 17 | * e.g. if its a .tar.gz modify archive_handle->sub_archive to process a .tar.gz | 13 | * e.g. if its a .tar.gz modify archive_handle->sub_archive to process a .tar.gz |
| 18 | * or if its a .tar.bz2 make archive_handle->sub_archive handle that | 14 | * or if its a .tar.bz2 make archive_handle->sub_archive handle that |
| 19 | */ | 15 | */ |
| 20 | char filter_accept_list_reassign(archive_handle_t *archive_handle) | 16 | char filter_accept_list_reassign(archive_handle_t *archive_handle) |
| 21 | { | 17 | { |
diff --git a/archival/libunarchive/get_header_tar_bz2.c b/archival/libunarchive/get_header_tar_bz2.c index e7a80fc41..d8715c0bb 100644 --- a/archival/libunarchive/get_header_tar_bz2.c +++ b/archival/libunarchive/get_header_tar_bz2.c | |||
| @@ -3,13 +3,6 @@ | |||
| 3 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 3 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include <sys/types.h> | ||
| 7 | #include <sys/wait.h> | ||
| 8 | #include <signal.h> | ||
| 9 | #include <stdio.h> | ||
| 10 | #include <stdlib.h> | ||
| 11 | #include <string.h> | ||
| 12 | #include <unistd.h> | ||
| 13 | #include "libbb.h" | 6 | #include "libbb.h" |
| 14 | #include "unarchive.h" | 7 | #include "unarchive.h" |
| 15 | 8 | ||
diff --git a/coreutils/cal.c b/coreutils/cal.c index 681a88d90..82ebf143a 100644 --- a/coreutils/cal.c +++ b/coreutils/cal.c | |||
| @@ -87,11 +87,6 @@ int cal_main(int argc, char **argv) | |||
| 87 | char day_headings[28]; /* 28 for julian, 21 for nonjulian */ | 87 | char day_headings[28]; /* 28 for julian, 21 for nonjulian */ |
| 88 | char buf[40]; | 88 | char buf[40]; |
| 89 | 89 | ||
| 90 | // Done in busybox.c, ok to remove? | ||
| 91 | //#ifdef CONFIG_LOCALE_SUPPORT | ||
| 92 | // setlocale(LC_TIME, ""); | ||
| 93 | //#endif | ||
| 94 | |||
| 95 | flags = getopt32(argc, argv, "jy"); | 90 | flags = getopt32(argc, argv, "jy"); |
| 96 | 91 | ||
| 97 | julian = flags & 1; | 92 | julian = flags & 1; |
diff --git a/shell/cmdedit.c b/shell/cmdedit.c index 68772fe05..93758c9fb 100644 --- a/shell/cmdedit.c +++ b/shell/cmdedit.c | |||
| @@ -77,7 +77,6 @@ static int n_history; | |||
| 77 | static int cur_history; | 77 | static int cur_history; |
| 78 | #endif | 78 | #endif |
| 79 | 79 | ||
| 80 | //#include <termios.h> | ||
| 81 | #define setTermSettings(fd,argp) tcsetattr(fd, TCSANOW, argp) | 80 | #define setTermSettings(fd,argp) tcsetattr(fd, TCSANOW, argp) |
| 82 | #define getTermSettings(fd,argp) tcgetattr(fd, argp); | 81 | #define getTermSettings(fd,argp) tcgetattr(fd, argp); |
| 83 | 82 | ||