From: Kirill Okhotnikov <kirill.okhotnikov@gmail.com>
Date: Mon, 11 May 2015 11:51:00 +0000 (+0200)
Subject: Small cosmetic changes.
X-Git-Tag: v3.1.900a~94^2~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F106%2Fhead;p=thirdparty%2Flibarchive.git

Small cosmetic changes.
---

diff --git a/Makefile.am b/Makefile.am
index 541c94889..1a3a0ee10 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -212,9 +212,9 @@ libarchive_la_SOURCES= \
 	libarchive/archive_write_set_format_7zip.c \
 	libarchive/archive_write_set_format_ar.c \
 	libarchive/archive_write_set_format_by_name.c \
-    libarchive/archive_write_set_format_filter_by_ext.c \	
 	libarchive/archive_write_set_format_cpio.c \
 	libarchive/archive_write_set_format_cpio_newc.c \
+	libarchive/archive_write_set_format_filter_by_ext.c \
 	libarchive/archive_write_set_format_iso9660.c \
 	libarchive/archive_write_set_format_mtree.c \
 	libarchive/archive_write_set_format_pax.c \
@@ -353,7 +353,7 @@ libarchive_test_SOURCES= \
 	libarchive/test/test_archive_write_add_filter_by_name.c \
 	libarchive/test/test_archive_write_set_filter_option.c \
 	libarchive/test/test_archive_write_set_format_by_name.c \
-    libarchive/test/test_archive_write_set_format_filter_by_ext.c \	
+	libarchive/test/test_archive_write_set_format_filter_by_ext.c \	
 	libarchive/test/test_archive_write_set_format_option.c \
 	libarchive/test/test_archive_write_set_option.c \
 	libarchive/test/test_archive_write_set_options.c \
diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt
index b9d09b9ff..d61374315 100644
--- a/libarchive/CMakeLists.txt
+++ b/libarchive/CMakeLists.txt
@@ -134,6 +134,7 @@ SET(libarchive_SOURCES
   archive_write_set_format_by_name.c
   archive_write_set_format_cpio.c
   archive_write_set_format_cpio_newc.c
+  archive_write_set_format_filter_by_ext.c
   archive_write_set_format_gnutar.c
   archive_write_set_format_iso9660.c
   archive_write_set_format_mtree.c
@@ -145,7 +146,6 @@ SET(libarchive_SOURCES
   archive_write_set_format_warc.c
   archive_write_set_format_xar.c
   archive_write_set_format_zip.c
-  archive_write_set_format_filter_by_ext.c
   archive_write_set_options.c
   archive_write_set_passphrase.c
   archive_xxhash.h
diff --git a/libarchive/archive_cryptor.c b/libarchive/archive_cryptor.c
index ac2ad9cbb..9b01df8f1 100644
--- a/libarchive/archive_cryptor.c
+++ b/libarchive/archive_cryptor.c
@@ -366,7 +366,7 @@ aes_ctr_update(archive_crypto_ctx *ctx, const uint8_t * const in,
 	(void)in_len; /* UNUSED */
 	(void)out; /* UNUSED */
 	(void)out_len; /* UNUSED */
-    aes_ctr_encrypt_counter(ctx); /* UNUSED */ /* Fix unused function warning */
+	aes_ctr_encrypt_counter(ctx); /* UNUSED */ /* Fix unused function warning */
 	return -1;
 }