diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-03-11 13:43:10 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-03-11 13:43:10 +0000 |
commit | baca1759129945fcd03d96ccc840892401b5a1af (patch) | |
tree | 5a3f14e441d313d974c851148046926980840510 /archival | |
parent | ecea8f201e77aff3e9a4fe5b3a435f463a842687 (diff) | |
download | busybox-w32-baca1759129945fcd03d96ccc840892401b5a1af.tar.gz busybox-w32-baca1759129945fcd03d96ccc840892401b5a1af.tar.bz2 busybox-w32-baca1759129945fcd03d96ccc840892401b5a1af.zip |
kill superfluous returns at the end of void functions
Diffstat (limited to 'archival')
-rw-r--r-- | archival/dpkg.c | 8 | ||||
-rw-r--r-- | archival/libunarchive/data_align.c | 5 | ||||
-rw-r--r-- | archival/tar.c | 1 |
3 files changed, 0 insertions, 14 deletions
diff --git a/archival/dpkg.c b/archival/dpkg.c index c86c583ab..9f7818ccf 100644 --- a/archival/dpkg.c +++ b/archival/dpkg.c | |||
@@ -706,7 +706,6 @@ static void set_status(const unsigned status_node_num, const char *new_value, co | |||
706 | new_status = xasprintf("%s %s %s", name_hashtable[want], name_hashtable[flag], name_hashtable[status]); | 706 | new_status = xasprintf("%s %s %s", name_hashtable[want], name_hashtable[flag], name_hashtable[status]); |
707 | status_hashtable[status_node_num]->status = search_name_hashtable(new_status); | 707 | status_hashtable[status_node_num]->status = search_name_hashtable(new_status); |
708 | free(new_status); | 708 | free(new_status); |
709 | return; | ||
710 | } | 709 | } |
711 | 710 | ||
712 | static const char *describe_status(int status_num) { | 711 | static const char *describe_status(int status_num) { |
@@ -763,7 +762,6 @@ static void index_status_file(const char *filename) | |||
763 | free(control_buffer); | 762 | free(control_buffer); |
764 | } | 763 | } |
765 | fclose(status_file); | 764 | fclose(status_file); |
766 | return; | ||
767 | } | 765 | } |
768 | 766 | ||
769 | static void write_buffer_no_status(FILE *new_status_file, const char *control_buffer) | 767 | static void write_buffer_no_status(FILE *new_status_file, const char *control_buffer) |
@@ -780,7 +778,6 @@ static void write_buffer_no_status(FILE *new_status_file, const char *control_bu | |||
780 | fprintf(new_status_file, "%s: %s\n", name, value); | 778 | fprintf(new_status_file, "%s: %s\n", name, value); |
781 | } | 779 | } |
782 | } | 780 | } |
783 | return; | ||
784 | } | 781 | } |
785 | 782 | ||
786 | /* This could do with a cleanup */ | 783 | /* This could do with a cleanup */ |
@@ -1425,8 +1422,6 @@ static void init_archive_deb_control(archive_handle_t *ar_handle) | |||
1425 | 1422 | ||
1426 | /* Assign the tar handle as a subarchive of the ar handle */ | 1423 | /* Assign the tar handle as a subarchive of the ar handle */ |
1427 | ar_handle->sub_archive = tar_handle; | 1424 | ar_handle->sub_archive = tar_handle; |
1428 | |||
1429 | return; | ||
1430 | } | 1425 | } |
1431 | 1426 | ||
1432 | static void init_archive_deb_data(archive_handle_t *ar_handle) | 1427 | static void init_archive_deb_data(archive_handle_t *ar_handle) |
@@ -1447,8 +1442,6 @@ static void init_archive_deb_data(archive_handle_t *ar_handle) | |||
1447 | 1442 | ||
1448 | /* Assign the tar handle as a subarchive of the ar handle */ | 1443 | /* Assign the tar handle as a subarchive of the ar handle */ |
1449 | ar_handle->sub_archive = tar_handle; | 1444 | ar_handle->sub_archive = tar_handle; |
1450 | |||
1451 | return; | ||
1452 | } | 1445 | } |
1453 | 1446 | ||
1454 | static char *deb_extract_control_file_to_buffer(archive_handle_t *ar_handle, llist_t *myaccept) | 1447 | static char *deb_extract_control_file_to_buffer(archive_handle_t *ar_handle, llist_t *myaccept) |
@@ -1472,7 +1465,6 @@ static void data_extract_all_prefix(archive_handle_t *archive_handle) | |||
1472 | archive_handle->file_header->name = xasprintf("%s%s", archive_handle->buffer, name_ptr); | 1465 | archive_handle->file_header->name = xasprintf("%s%s", archive_handle->buffer, name_ptr); |
1473 | data_extract_all(archive_handle); | 1466 | data_extract_all(archive_handle); |
1474 | } | 1467 | } |
1475 | return; | ||
1476 | } | 1468 | } |
1477 | 1469 | ||
1478 | static void unpack_package(deb_file_t *deb_file) | 1470 | static void unpack_package(deb_file_t *deb_file) |
diff --git a/archival/libunarchive/data_align.c b/archival/libunarchive/data_align.c index 81594d87c..946c94d0d 100644 --- a/archival/libunarchive/data_align.c +++ b/archival/libunarchive/data_align.c | |||
@@ -5,9 +5,6 @@ | |||
5 | 5 | ||
6 | #include <sys/types.h> | 6 | #include <sys/types.h> |
7 | 7 | ||
8 | #include <errno.h> | ||
9 | #include <unistd.h> | ||
10 | |||
11 | #include "libbb.h" | 8 | #include "libbb.h" |
12 | #include "unarchive.h" | 9 | #include "unarchive.h" |
13 | 10 | ||
@@ -17,6 +14,4 @@ void data_align(archive_handle_t *archive_handle, const unsigned short boundary) | |||
17 | 14 | ||
18 | archive_handle->seek(archive_handle, skip_amount); | 15 | archive_handle->seek(archive_handle, skip_amount); |
19 | archive_handle->offset += skip_amount; | 16 | archive_handle->offset += skip_amount; |
20 | |||
21 | return; | ||
22 | } | 17 | } |
diff --git a/archival/tar.c b/archival/tar.c index 3ed0c3650..176a7e22d 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
@@ -134,7 +134,6 @@ static void freeHardLinkInfo(HardLinkInfo ** hlInfoHeadPtr) | |||
134 | } | 134 | } |
135 | *hlInfoHeadPtr = NULL; | 135 | *hlInfoHeadPtr = NULL; |
136 | } | 136 | } |
137 | return; | ||
138 | } | 137 | } |
139 | 138 | ||
140 | /* Might be faster (and bigger) if the dev/ino were stored in numeric order;) */ | 139 | /* Might be faster (and bigger) if the dev/ino were stored in numeric order;) */ |