whitespace cleanup

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

6 files changed, 26 insertions, 26 deletions

diff --git a/archival/ar.c b/archival/ar.c
index 05556c6cb..730d7c6c6 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -179,17 +179,17 @@ static void FAST_FUNC header_verbose_list_ar(const file_header_t *file_header)
         );
 }
 
-#define AR_OPT_VERBOSE          (1 << 0)
-#define AR_OPT_PRESERVE_DATE    (1 << 1)
+#define AR_OPT_VERBOSE          (1 << 0)
+#define AR_OPT_PRESERVE_DATE    (1 << 1)
 /* "ar r" implies create, but warns about it. c suppresses warning.
  * bbox accepts but ignores it: */
-#define AR_OPT_CREATE           (1 << 2)
+#define AR_OPT_CREATE           (1 << 2)
 
-#define AR_CMD_PRINT            (1 << 3)
-#define FIRST_CMD AR_CMD_PRINT
-#define AR_CMD_LIST             (1 << 4)
-#define AR_CMD_EXTRACT          (1 << 5)
-#define AR_CMD_INSERT           (1 << 6)
+#define AR_CMD_PRINT            (1 << 3)
+#define FIRST_CMD               AR_CMD_PRINT
+#define AR_CMD_LIST             (1 << 4)
+#define AR_CMD_EXTRACT          (1 << 5)
+#define AR_CMD_INSERT           (1 << 6)
 
 int ar_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int ar_main(int argc UNUSED_PARAM, char **argv)
diff --git a/archival/bz/bzlib.c b/archival/bz/bzlib.c
index 834179403..b3beeabed 100644
--- a/archival/bz/bzlib.c
+++ b/archival/bz/bzlib.c
@@ -28,7 +28,7 @@ in the file LICENSE.
  * 0.9.0a/b -- no changes in this file.
  * 0.9.0c   -- made zero-length BZ_FLUSH work correctly in bzCompress().
  *             fixed bzWrite/bzRead to ignore zero-length requests.
- *             fixed bzread to correctly handle read requests after EOF.
+ *             fixed bzread to correctly handle read requests after EOF.
  *             wrong parameter order in call to bzDecompressInit in
  *             bzBuffToBuffDecompress.  Fixed.
  */
diff --git a/archival/bz/compress.c b/archival/bz/compress.c
index b9b0949a9..6f1c70a08 100644
--- a/archival/bz/compress.c
+++ b/archival/bz/compress.c
@@ -134,15 +134,14 @@ void generateMTFValues(EState* s)
          * holds the original block data.
          *
          * The first thing to do is generate the MTF values,
-         * and put them in
-         *      ((uint16_t*)s->arr1)[0 .. s->nblock-1].
+         * and put them in ((uint16_t*)s->arr1)[0 .. s->nblock-1].
+         *
          * Because there are strictly fewer or equal MTF values
          * than block values, ptr values in this area are overwritten
          * with MTF values only when they are no longer needed.
          *
          * The final compressed bitstream is generated into the
-         * area starting at
-         *      &((uint8_t*)s->arr2)[s->nblock]
+         * area starting at &((uint8_t*)s->arr2)[s->nblock]
          *
          * These storage aliases are set up in bzCompressInit(),
          * except for the last one, which is arranged in
@@ -459,7 +458,7 @@ void sendMTFValues(EState* s)
         }
 
         AssertH(nGroups < 8, 3002);
-        AssertH(nSelectors < 32768 && nSelectors <= (2 + (900000 / BZ_G_SIZE)), 3003);
+        AssertH(nSelectors < 32768 && nSelectors <= (2 + (900000 / BZ_G_SIZE)), 3003);
 
         /*--- Compute MTF values for the selectors. ---*/
         {
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 508b4297b..53e30d541 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -939,8 +939,8 @@ static int package_satisfies_dependency(int package, int depend_type)
                 return 0;
 
         switch (depend_type) {
-        case EDGE_PRE_DEPENDS:  return get_status(status_num, 3) == search_name_hashtable("installed");
-        case EDGE_DEPENDS:      return get_status(status_num, 1) == search_name_hashtable("install");
+        case EDGE_PRE_DEPENDS: return get_status(status_num, 3) == search_name_hashtable("installed");
+        case EDGE_DEPENDS:     return get_status(status_num, 1) == search_name_hashtable("install");
         }
         return 0;
 }
@@ -967,7 +967,7 @@ static int check_deps(deb_file_t **deb_file, int deb_start /*, int dep_max_count
                 conflicts[conflicts_num] = package_num;
                 conflicts_num++;
                 /* add provides to conflicts list */
-                for (j = 0; j < package_hashtable[package_num]->num_of_edges; j++) {
+                for (j = 0; j < package_hashtable[package_num]->num_of_edges; j++) {
                         if (package_hashtable[package_num]->edge[j]->type == EDGE_PROVIDES) {
                                 const int conflicts_package_num = search_package_hashtable(
                                         package_hashtable[package_num]->edge[j]->name,
@@ -1067,12 +1067,13 @@ static int check_deps(deb_file_t **deb_file, int deb_start /*, int dep_max_count
 
                         if (package_edge->type == EDGE_OR_PRE_DEPENDS
                          || package_edge->type == EDGE_OR_DEPENDS
-                        ) {     /* start an EDGE_OR_ list */
+                        ) {
+                                /* start an EDGE_OR_ list */
                                 number_of_alternatives = package_edge->version;
                                 root_of_alternatives = package_edge;
                                 continue;
                         }
-                        if (number_of_alternatives == 0) {      /* not in the middle of an EDGE_OR_ list */
+                        if (number_of_alternatives == 0) {  /* not in the middle of an EDGE_OR_ list */
                                 number_of_alternatives = 1;
                                 root_of_alternatives = NULL;
                         }
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index 4c627e890..0ce7c02d8 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -7,11 +7,11 @@
 #include "libbb.h"
 #include "unarchive.h"
 
-#define DPKG_DEB_OPT_CONTENTS   1
-#define DPKG_DEB_OPT_CONTROL    2
-#define DPKG_DEB_OPT_FIELD      4
-#define DPKG_DEB_OPT_EXTRACT    8
-#define DPKG_DEB_OPT_EXTRACT_VERBOSE    16
+#define DPKG_DEB_OPT_CONTENTS         1
+#define DPKG_DEB_OPT_CONTROL          2
+#define DPKG_DEB_OPT_FIELD            4
+#define DPKG_DEB_OPT_EXTRACT          8
+#define DPKG_DEB_OPT_EXTRACT_VERBOSE 16
 
 int dpkg_deb_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int dpkg_deb_main(int argc, char **argv)
diff --git a/archival/libunarchive/decompress_bunzip2.c b/archival/libunarchive/decompress_bunzip2.c
index 549c8b19f..cf6e1988f 100644
--- a/archival/libunarchive/decompress_bunzip2.c
+++ b/archival/libunarchive/decompress_bunzip2.c
@@ -86,8 +86,8 @@ struct bunzip_data {
 
         /* Big things go last (register-relative addressing can be larger for big offsets) */
         uint32_t crc32Table[256];
-        unsigned char selectors[32768];                 /* nSelectors=15 bits */
-        struct group_data groups[MAX_GROUPS];   /* Huffman coding tables */
+        unsigned char selectors[32768];  /* nSelectors=15 bits */
+        struct group_data groups[MAX_GROUPS];  /* Huffman coding tables */
 };
 /* typedef struct bunzip_data bunzip_data; -- done in .h file */