trylink: automatically use custom link script if user provides one

vinfo_msg: one user (info_msg), incorporate in it
*: style fixes

2 files changed, 5 insertions, 5 deletions

diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index f842d458b..f824fcf67 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -212,7 +212,7 @@ char* make_new_name_gunzip(char *filename)
 
         extension++;
         if (strcmp(extension, "tgz" + 1) == 0
-#if  ENABLE_FEATURE_GUNZIP_UNCOMPRESS
+#if ENABLE_FEATURE_GUNZIP_UNCOMPRESS
          || strcmp(extension, "Z") == 0
 #endif
         ) {
diff --git a/archival/dpkg.c b/archival/dpkg.c
index caa50f90d..b5fc06d3d 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -1412,10 +1412,10 @@ static void init_archive_deb_control(archive_handle_t *ar_handle)
         tar_handle->src_fd = ar_handle->src_fd;
 
         /* We don't care about data.tar.* or debian-binary, just control.tar.* */
-#if  ENABLE_FEATURE_DEB_TAR_GZ
+#if ENABLE_FEATURE_DEB_TAR_GZ
         llist_add_to(&(ar_handle->accept), (char*)"control.tar.gz");
 #endif
-#if  ENABLE_FEATURE_DEB_TAR_BZ2
+#if ENABLE_FEATURE_DEB_TAR_BZ2
         llist_add_to(&(ar_handle->accept), (char*)"control.tar.bz2");
 #endif
 
@@ -1432,10 +1432,10 @@ static void init_archive_deb_data(archive_handle_t *ar_handle)
         tar_handle->src_fd = ar_handle->src_fd;
 
         /* We don't care about control.tar.* or debian-binary, just data.tar.* */
-#if  ENABLE_FEATURE_DEB_TAR_GZ
+#if ENABLE_FEATURE_DEB_TAR_GZ
         llist_add_to(&(ar_handle->accept), (char*)"data.tar.gz");
 #endif
-#if  ENABLE_FEATURE_DEB_TAR_BZ2
+#if ENABLE_FEATURE_DEB_TAR_BZ2
         llist_add_to(&(ar_handle->accept), (char*)"data.tar.bz2");
 #endif