diff options
Diffstat (limited to 'archival')
35 files changed, 38 insertions, 38 deletions
diff --git a/archival/ar.c b/archival/ar.c index 05cb231aa..7782af89f 100644 --- a/archival/ar.c +++ b/archival/ar.c @@ -57,7 +57,7 @@ static void header_verbose_list_ar(const file_header_t *file_header) #define AR_OPT_CREATE 0x20 #define AR_OPT_INSERT 0x40 -extern int ar_main(int argc, char **argv) +int ar_main(int argc, char **argv) { archive_handle_t *archive_handle; unsigned long opt; diff --git a/archival/cpio.c b/archival/cpio.c index 820f03e9b..26f845bc9 100644 --- a/archival/cpio.c +++ b/archival/cpio.c @@ -38,7 +38,7 @@ #define CPIO_OPT_CREATE_LEADING_DIR 0x20 #define CPIO_OPT_PRESERVE_MTIME 0x40 -extern int cpio_main(int argc, char **argv) +int cpio_main(int argc, char **argv) { archive_handle_t *archive_handle; char *cpio_filename = NULL; diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c index 29e9719cb..fa89e44a0 100644 --- a/archival/dpkg_deb.c +++ b/archival/dpkg_deb.c @@ -28,7 +28,7 @@ #define DPKG_DEB_OPT_EXTRACT 8 #define DPKG_DEB_OPT_EXTRACT_VERBOSE 16 -extern int dpkg_deb_main(int argc, char **argv) +int dpkg_deb_main(int argc, char **argv) { archive_handle_t *ar_archive; archive_handle_t *tar_archive; diff --git a/archival/gunzip.c b/archival/gunzip.c index 76738b017..4fb77044a 100644 --- a/archival/gunzip.c +++ b/archival/gunzip.c @@ -75,7 +75,7 @@ static char *license_msg[] = { #define GUNZIP_OPT_TEST 4 #define GUNZIP_OPT_DECOMPRESS 8 -extern int gunzip_main(int argc, char **argv) +int gunzip_main(int argc, char **argv) { char status = EXIT_SUCCESS; unsigned long opt; diff --git a/archival/libunarchive/archive_xread_all.c b/archival/libunarchive/archive_xread_all.c index ba9ade2d5..ebd64dc14 100644 --- a/archival/libunarchive/archive_xread_all.c +++ b/archival/libunarchive/archive_xread_all.c @@ -20,7 +20,7 @@ #include "unarchive.h" #include "libbb.h" -extern void archive_xread_all(const archive_handle_t *archive_handle, void *buf, const size_t count) +void archive_xread_all(const archive_handle_t *archive_handle, void *buf, const size_t count) { ssize_t size; diff --git a/archival/libunarchive/archive_xread_all_eof.c b/archival/libunarchive/archive_xread_all_eof.c index f1eea2928..d85879797 100644 --- a/archival/libunarchive/archive_xread_all_eof.c +++ b/archival/libunarchive/archive_xread_all_eof.c @@ -20,7 +20,7 @@ #include "unarchive.h" #include "libbb.h" -extern ssize_t archive_xread_all_eof(archive_handle_t *archive_handle, unsigned char *buf, size_t count) +ssize_t archive_xread_all_eof(archive_handle_t *archive_handle, unsigned char *buf, size_t count) { ssize_t size; diff --git a/archival/libunarchive/check_header_gzip.c b/archival/libunarchive/check_header_gzip.c index 9e065c4fd..a8ecf3799 100644 --- a/archival/libunarchive/check_header_gzip.c +++ b/archival/libunarchive/check_header_gzip.c @@ -3,7 +3,7 @@ #include "libbb.h" #include "unarchive.h" /* for external decl of check_header_gzip */ -extern void check_header_gzip(int src_fd) +void check_header_gzip(int src_fd) { union { unsigned char raw[8]; diff --git a/archival/libunarchive/data_align.c b/archival/libunarchive/data_align.c index 1d433957d..e4a364006 100644 --- a/archival/libunarchive/data_align.c +++ b/archival/libunarchive/data_align.c @@ -22,7 +22,7 @@ #include "libbb.h" #include "unarchive.h" -extern void data_align(archive_handle_t *archive_handle, const unsigned short boundary) +void data_align(archive_handle_t *archive_handle, const unsigned short boundary) { const unsigned short skip_amount = (boundary - (archive_handle->offset % boundary)) % boundary; diff --git a/archival/libunarchive/data_extract_all.c b/archival/libunarchive/data_extract_all.c index 42e442336..588b081a5 100644 --- a/archival/libunarchive/data_extract_all.c +++ b/archival/libunarchive/data_extract_all.c @@ -27,7 +27,7 @@ #include "libbb.h" #include "unarchive.h" -extern void data_extract_all(archive_handle_t *archive_handle) +void data_extract_all(archive_handle_t *archive_handle) { file_header_t *file_header = archive_handle->file_header; int dst_fd; diff --git a/archival/libunarchive/data_extract_to_buffer.c b/archival/libunarchive/data_extract_to_buffer.c index db5521bcb..1255fe1da 100644 --- a/archival/libunarchive/data_extract_to_buffer.c +++ b/archival/libunarchive/data_extract_to_buffer.c @@ -17,7 +17,7 @@ #include "libbb.h" #include "unarchive.h" -extern void data_extract_to_buffer(archive_handle_t *archive_handle) +void data_extract_to_buffer(archive_handle_t *archive_handle) { const unsigned int size = archive_handle->file_header->size; diff --git a/archival/libunarchive/data_extract_to_stdout.c b/archival/libunarchive/data_extract_to_stdout.c index df2bca6ef..f1be5dc67 100644 --- a/archival/libunarchive/data_extract_to_stdout.c +++ b/archival/libunarchive/data_extract_to_stdout.c @@ -17,7 +17,7 @@ #include "unarchive.h" #include <unistd.h> -extern void data_extract_to_stdout(archive_handle_t *archive_handle) +void data_extract_to_stdout(archive_handle_t *archive_handle) { bb_copyfd_size(archive_handle->src_fd, STDOUT_FILENO, archive_handle->file_header->size); } diff --git a/archival/libunarchive/data_skip.c b/archival/libunarchive/data_skip.c index b82c9065b..0c6e26e54 100644 --- a/archival/libunarchive/data_skip.c +++ b/archival/libunarchive/data_skip.c @@ -21,7 +21,7 @@ #include "unarchive.h" #include "libbb.h" -extern void data_skip(archive_handle_t *archive_handle) +void data_skip(archive_handle_t *archive_handle) { archive_handle->seek(archive_handle, archive_handle->file_header->size); } diff --git a/archival/libunarchive/decompress_bunzip2.c b/archival/libunarchive/decompress_bunzip2.c index 7f700ca7f..88d88b85f 100644 --- a/archival/libunarchive/decompress_bunzip2.c +++ b/archival/libunarchive/decompress_bunzip2.c @@ -684,7 +684,7 @@ static int start_bunzip(bunzip_data **bdp, int in_fd, unsigned char *inbuf, /* Example usage: decompress src_fd to dst_fd. (Stops at end of bzip data, not end of file.) */ -extern int uncompressStream(int src_fd, int dst_fd) +int uncompressStream(int src_fd, int dst_fd) { char *outbuf; bunzip_data *bd; diff --git a/archival/libunarchive/decompress_uncompress.c b/archival/libunarchive/decompress_uncompress.c index c8d8b4af9..539d4ef90 100644 --- a/archival/libunarchive/decompress_uncompress.c +++ b/archival/libunarchive/decompress_uncompress.c @@ -95,7 +95,7 @@ static unsigned short codetab[HSIZE]; * with those of the compress() routine. See the definitions above. */ -extern int uncompress(int fd_in, int fd_out) +int uncompress(int fd_in, int fd_out) { unsigned char *stackp; long int code; diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c index ea8169592..7776dee69 100644 --- a/archival/libunarchive/decompress_unzip.c +++ b/archival/libunarchive/decompress_unzip.c @@ -892,7 +892,7 @@ static int inflate_get_next_window(void) } /* Initialise bytebuffer, be careful not to overfill the buffer */ -extern void inflate_init(unsigned int bufsize) +void inflate_init(unsigned int bufsize) { /* Set the bytebuffer size, default is same as gunzip_wsize */ bytebuffer_max = bufsize + 8; @@ -900,12 +900,12 @@ extern void inflate_init(unsigned int bufsize) bytebuffer_size = 0; } -extern void inflate_cleanup(void) +void inflate_cleanup(void) { free(bytebuffer); } -extern int inflate_unzip(int in, int out) +int inflate_unzip(int in, int out) { ssize_t nwrote; typedef void (*sig_type) (int); @@ -952,7 +952,7 @@ extern int inflate_unzip(int in, int out) return 0; } -extern int inflate_gunzip(int in, int out) +int inflate_gunzip(int in, int out) { unsigned int stored_crc = 0; unsigned int count; diff --git a/archival/libunarchive/filter_accept_all.c b/archival/libunarchive/filter_accept_all.c index baf9e4b71..bf5d8aaa9 100644 --- a/archival/libunarchive/filter_accept_all.c +++ b/archival/libunarchive/filter_accept_all.c @@ -22,7 +22,7 @@ #include "unarchive.h" /* Accept any non-null name, its not really a filter at all */ -extern char filter_accept_all(archive_handle_t *archive_handle) +char filter_accept_all(archive_handle_t *archive_handle) { if (archive_handle->file_header->name) { return(EXIT_SUCCESS); diff --git a/archival/libunarchive/filter_accept_list.c b/archival/libunarchive/filter_accept_list.c index e1c4827bf..bedd0e178 100644 --- a/archival/libunarchive/filter_accept_list.c +++ b/archival/libunarchive/filter_accept_list.c @@ -24,7 +24,7 @@ /* * Accept names that are in the accept list, ignoring reject list. */ -extern char filter_accept_list(archive_handle_t *archive_handle) +char filter_accept_list(archive_handle_t *archive_handle) { if (find_list_entry(archive_handle->accept, archive_handle->file_header->name)) { return(EXIT_SUCCESS); diff --git a/archival/libunarchive/filter_accept_list_reassign.c b/archival/libunarchive/filter_accept_list_reassign.c index a09f564a3..5b8385c0d 100644 --- a/archival/libunarchive/filter_accept_list_reassign.c +++ b/archival/libunarchive/filter_accept_list_reassign.c @@ -28,7 +28,7 @@ * e.g. if its a .tar.gz modify archive_handle->sub_archive to process a .tar.gz * or if its a .tar.bz2 make archive_handle->sub_archive handle that */ -extern char filter_accept_list_reassign(archive_handle_t *archive_handle) +char filter_accept_list_reassign(archive_handle_t *archive_handle) { /* Check the file entry is in the accept list */ if (find_list_entry(archive_handle->accept, archive_handle->file_header->name)) { diff --git a/archival/libunarchive/filter_accept_reject_list.c b/archival/libunarchive/filter_accept_reject_list.c index 657f7a0bd..1ac414675 100644 --- a/archival/libunarchive/filter_accept_reject_list.c +++ b/archival/libunarchive/filter_accept_reject_list.c @@ -24,7 +24,7 @@ /* * Accept names that are in the accept list and not in the reject list */ -extern char filter_accept_reject_list(archive_handle_t *archive_handle) +char filter_accept_reject_list(archive_handle_t *archive_handle) { const char *key = archive_handle->file_header->name; const llist_t *accept_entry = find_list_entry(archive_handle->accept, key); diff --git a/archival/libunarchive/find_list_entry.c b/archival/libunarchive/find_list_entry.c index 7ed9e332f..d14e51aa7 100644 --- a/archival/libunarchive/find_list_entry.c +++ b/archival/libunarchive/find_list_entry.c @@ -18,7 +18,7 @@ #include <stdlib.h> #include "unarchive.h" -extern const llist_t *find_list_entry(const llist_t *list, const char *filename) +const llist_t *find_list_entry(const llist_t *list, const char *filename) { while (list) { if (fnmatch(list->data, filename, 0) == 0) { diff --git a/archival/libunarchive/get_header_ar.c b/archival/libunarchive/get_header_ar.c index e3a71951f..385f33dbf 100644 --- a/archival/libunarchive/get_header_ar.c +++ b/archival/libunarchive/get_header_ar.c @@ -21,7 +21,7 @@ #include "unarchive.h" #include "libbb.h" -extern char get_header_ar(archive_handle_t *archive_handle) +char get_header_ar(archive_handle_t *archive_handle) { file_header_t *typed = archive_handle->file_header; union { diff --git a/archival/libunarchive/get_header_cpio.c b/archival/libunarchive/get_header_cpio.c index bdd80dfea..2bbcd8e5d 100644 --- a/archival/libunarchive/get_header_cpio.c +++ b/archival/libunarchive/get_header_cpio.c @@ -28,7 +28,7 @@ typedef struct hardlinks_s { struct hardlinks_s *next; } hardlinks_t; -extern char get_header_cpio(archive_handle_t *archive_handle) +char get_header_cpio(archive_handle_t *archive_handle) { static hardlinks_t *saved_hardlinks = NULL; static unsigned short pending_hardlinks = 0; diff --git a/archival/libunarchive/get_header_tar.c b/archival/libunarchive/get_header_tar.c index eeabf3f5b..682179a02 100644 --- a/archival/libunarchive/get_header_tar.c +++ b/archival/libunarchive/get_header_tar.c @@ -22,7 +22,7 @@ static char *longname = NULL; static char *linkname = NULL; #endif -extern char get_header_tar(archive_handle_t *archive_handle) +char get_header_tar(archive_handle_t *archive_handle) { file_header_t *file_header = archive_handle->file_header; union { diff --git a/archival/libunarchive/get_header_tar_bz2.c b/archival/libunarchive/get_header_tar_bz2.c index d49d6b96a..e874beee1 100644 --- a/archival/libunarchive/get_header_tar_bz2.c +++ b/archival/libunarchive/get_header_tar_bz2.c @@ -24,7 +24,7 @@ #include "libbb.h" #include "unarchive.h" -extern char get_header_tar_bz2(archive_handle_t *archive_handle) +char get_header_tar_bz2(archive_handle_t *archive_handle) { /* Cant lseek over pipe's */ archive_handle->seek = seek_by_char; diff --git a/archival/libunarchive/get_header_tar_gz.c b/archival/libunarchive/get_header_tar_gz.c index 9c708a951..62df7b268 100644 --- a/archival/libunarchive/get_header_tar_gz.c +++ b/archival/libunarchive/get_header_tar_gz.c @@ -19,7 +19,7 @@ #include "libbb.h" #include "unarchive.h" -extern char get_header_tar_gz(archive_handle_t *archive_handle) +char get_header_tar_gz(archive_handle_t *archive_handle) { unsigned char magic[2]; diff --git a/archival/libunarchive/header_list.c b/archival/libunarchive/header_list.c index 5849a762e..36a2d330a 100644 --- a/archival/libunarchive/header_list.c +++ b/archival/libunarchive/header_list.c @@ -1,7 +1,7 @@ #include <stdio.h> #include "unarchive.h" -extern void header_list(const file_header_t *file_header) +void header_list(const file_header_t *file_header) { puts(file_header->name); } diff --git a/archival/libunarchive/header_skip.c b/archival/libunarchive/header_skip.c index 963d113a4..5b3d46cb8 100644 --- a/archival/libunarchive/header_skip.c +++ b/archival/libunarchive/header_skip.c @@ -1,6 +1,6 @@ #include <stdio.h> #include "unarchive.h" -extern void header_skip(const file_header_t *file_header ATTRIBUTE_UNUSED) +void header_skip(const file_header_t *file_header ATTRIBUTE_UNUSED) { } diff --git a/archival/libunarchive/header_verbose_list.c b/archival/libunarchive/header_verbose_list.c index f7601b732..7dc902e71 100644 --- a/archival/libunarchive/header_verbose_list.c +++ b/archival/libunarchive/header_verbose_list.c @@ -4,7 +4,7 @@ #include "libbb.h" #include "unarchive.h" -extern void header_verbose_list(const file_header_t *file_header) +void header_verbose_list(const file_header_t *file_header) { struct tm *mtime = localtime(&(file_header->mtime)); diff --git a/archival/libunarchive/open_transformer.c b/archival/libunarchive/open_transformer.c index fb149fc0b..0d362a5ab 100644 --- a/archival/libunarchive/open_transformer.c +++ b/archival/libunarchive/open_transformer.c @@ -20,7 +20,7 @@ #include "libbb.h" /* transformer(), more than meets the eye */ -extern int open_transformer(int src_fd, int (*transformer)(int src_fd, int dst_fd)) +int open_transformer(int src_fd, int (*transformer)(int src_fd, int dst_fd)) { int fd_pipe[2]; int pid; diff --git a/archival/libunarchive/seek_by_char.c b/archival/libunarchive/seek_by_char.c index a50d566f5..02874db51 100644 --- a/archival/libunarchive/seek_by_char.c +++ b/archival/libunarchive/seek_by_char.c @@ -24,7 +24,7 @@ * * TODO: rename to seek_by_read */ -extern void seek_by_char(const archive_handle_t *archive_handle, const unsigned int jump_size) +void seek_by_char(const archive_handle_t *archive_handle, const unsigned int jump_size) { if (jump_size) { bb_copyfd_size(archive_handle->src_fd, -1, jump_size); diff --git a/archival/libunarchive/seek_by_jump.c b/archival/libunarchive/seek_by_jump.c index 578870d9b..fb99b26a7 100644 --- a/archival/libunarchive/seek_by_jump.c +++ b/archival/libunarchive/seek_by_jump.c @@ -22,7 +22,7 @@ #include "libbb.h" #include "unarchive.h" -extern void seek_by_jump(const archive_handle_t *archive_handle, const unsigned int amount) +void seek_by_jump(const archive_handle_t *archive_handle, const unsigned int amount) { if (lseek(archive_handle->src_fd, (off_t) amount, SEEK_CUR) == (off_t) -1) { #ifdef CONFIG_FEATURE_UNARCHIVE_TAPE diff --git a/archival/libunarchive/unpack_ar_archive.c b/archival/libunarchive/unpack_ar_archive.c index fa48c6fca..7bb40af5b 100644 --- a/archival/libunarchive/unpack_ar_archive.c +++ b/archival/libunarchive/unpack_ar_archive.c @@ -19,7 +19,7 @@ #include "unarchive.h" #include "busybox.h" -extern void unpack_ar_archive(archive_handle_t *ar_archive) +void unpack_ar_archive(archive_handle_t *ar_archive) { char magic[7]; diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c index 8316d2242..45a660113 100644 --- a/archival/rpm2cpio.c +++ b/archival/rpm2cpio.c @@ -66,7 +66,7 @@ static void skip_header(int rpm_fd) } /* No getopt required */ -extern int rpm2cpio_main(int argc, char **argv) +int rpm2cpio_main(int argc, char **argv) { struct rpm_lead lead; int rpm_fd; diff --git a/archival/uncompress.c b/archival/uncompress.c index 3bd87093e..8a874d09d 100644 --- a/archival/uncompress.c +++ b/archival/uncompress.c @@ -30,7 +30,7 @@ #define GUNZIP_TO_STDOUT 1 #define GUNZIP_FORCE 2 -extern int uncompress_main(int argc, char **argv) +int uncompress_main(int argc, char **argv) { int status = EXIT_SUCCESS; unsigned long flags; diff --git a/archival/unzip.c b/archival/unzip.c index f95e31206..9cf987664 100644 --- a/archival/unzip.c +++ b/archival/unzip.c @@ -125,7 +125,7 @@ static void unzip_extract(zip_header_t *zip_header, int src_fd, int dst_fd) } } -extern int unzip_main(int argc, char **argv) +int unzip_main(int argc, char **argv) { zip_header_t zip_header; enum {v_silent, v_normal, v_list} verbosity = v_normal; |