Move get_unaligned_le32() macros to platform.h

[oweals/busybox.git] / archival / libarchive / data_extract_all.c

diff --git a/archival/libarchive/data_extract_all.c b/archival/libarchive/data_extract_all.c
index cf821c9de0deaa5f50b9eb9722dbdb6b89de7809..1830ffb8d0f786be7abe4ac4636fde932c87d6a5 100644 (file)
--- a/archival/libarchive/data_extract_all.c
+++ b/archival/libarchive/data_extract_all.c
@@ -8,7 +8,6 @@
 
 void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
 {
-
        file_header_t *file_header = archive_handle->file_header;
        int dst_fd;
        int res;
@@ -44,7 +43,7 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
                        dst_name = strchr(dst_name, '/');
                        if (!dst_name || dst_name[1] == '\0') {
                                data_skip(archive_handle);
-                               return;
+                               goto ret;
                        }
                        dst_name++;
                        /*
@@ -60,7 +59,7 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
                                hard_link = strchr(hard_link, '/');
                                if (!hard_link || hard_link[1] == '\0') {
                                        data_skip(archive_handle);
-                                       return;
+                                       goto ret;
                                }
                                hard_link++;
                        }
@@ -128,8 +127,9 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
        if (hard_link) {
                res = link(hard_link, dst_name);
                if (res != 0 && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)) {
+                       /* shared message */
                        bb_perror_msg("can't create %slink "
-                                       "from %s to %s", "hard",
+                                       "%s to %s", "hard",
                                        dst_name,
                                        hard_link);
                }
@@ -182,8 +182,9 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
                if (res != 0
                 && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
                ) {
+                       /* shared message */
                        bb_perror_msg("can't create %slink "
-                               "from %s to %s", "sym",
+                               "%s to %s", "sym",
                                dst_name,
                                file_header->link_target);
                }