whitespace fixes, no code changes
diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c
index 115632f..00688aa 100644
--- a/coreutils/dos2unix.c
+++ b/coreutils/dos2unix.c
@@ -89,7 +89,7 @@
} else {
conv_type = CT_UNIX2DOS; /* 1 */
}
-
+
/* -u convert to unix, -d convert to dos */
opt_complementary = "u--d:d--u"; /* mutally exclusive */
o = getopt32(argc, argv, "du");
diff --git a/coreutils/expand.c b/coreutils/expand.c
index 30815ff..4b5fa10 100644
--- a/coreutils/expand.c
+++ b/coreutils/expand.c
@@ -196,7 +196,7 @@
exit_status = EXIT_FAILURE;
}
/* If stdin also clear EOF */
- if (file == stdin)
+ if (file == stdin)
clearerr(file);
} while (*++argv);
diff --git a/coreutils/ln.c b/coreutils/ln.c
index 93a283d..cffd4fd 100644
--- a/coreutils/ln.c
+++ b/coreutils/ln.c
@@ -54,7 +54,8 @@
if (is_directory(src,
(flag & LN_NODEREFERENCE) ^ LN_NODEREFERENCE,
- NULL)) {
+ NULL)
+ ) {
src_name = xstrdup(*argv);
src = concat_path_file(src, bb_get_last_path_component(src_name));
free(src_name);
diff --git a/editors/vi.c b/editors/vi.c
index 7456649..461cf98 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -136,9 +136,9 @@
#if ENABLE_FEATURE_VI_READONLY
//static smallint vi_readonly, readonly;
static smallint readonly_mode = 0;
-#define SET_READONLY_FILE(flags) ((flags) |= 0x01)
-#define SET_READONLY_MODE(flags) ((flags) |= 0x02)
-#define UNSET_READONLY_FILE(flags) ((flags) &= 0xfe)
+#define SET_READONLY_FILE(flags) ((flags) |= 0x01)
+#define SET_READONLY_MODE(flags) ((flags) |= 0x02)
+#define UNSET_READONLY_FILE(flags) ((flags) &= 0xfe)
#else
#define readonly_mode 0
#define SET_READONLY_FILE(flags)
diff --git a/libbb/getopt32.c b/libbb/getopt32.c
index 672d70a..c099569 100644
--- a/libbb/getopt32.c
+++ b/libbb/getopt32.c
@@ -53,8 +53,8 @@
char *pointer_to_arg_for_d;
flags = getopt32(argc, argv, "a:b:c:d:",
- &pointer_to_arg_for_a, &pointer_to_arg_for_b,
- &pointer_to_arg_for_c, &pointer_to_arg_for_d);
+ &pointer_to_arg_for_a, &pointer_to_arg_for_b,
+ &pointer_to_arg_for_c, &pointer_to_arg_for_d);
The type of the pointer (char* or llist_t*) may be controlled
by the "::" special separator that is set in the external string
@@ -121,9 +121,9 @@
opt_complementary = "ww";
getopt32(argc, argv, "w", &w_counter);
if (w_counter)
- width = (w_counter == 1) ? 132 : INT_MAX;
+ width = (w_counter == 1) ? 132 : INT_MAX;
else
- get_terminal_width(...&width...);
+ get_terminal_width(...&width...);
w_counter is a pointer to an integer. It has to be passed to
getopt32() after all other option argument sinks.
@@ -137,9 +137,9 @@
opt_complementary = "vv:b::b-c:c-b";
f = getopt32(argc, argv, "vb:c", &my_b, &verbose_level);
if (f & 2) // -c after -b unsets -b flag
- while (my_b) { dosomething_with(my_b->data); my_b = my_b->link; }
+ while (my_b) { dosomething_with(my_b->data); my_b = my_b->link; }
if (my_b) // but llist is stored if -b is specified
- free_llist(my_b);
+ free_llist(my_b);
if (verbose_level) printf("verbose level is %d\n", verbose_level);
Special characters:
@@ -200,9 +200,9 @@
opt = getopt32(argc, argv, "sd:x", &smax_print_depth);
if (opt & 2)
- max_print_depth = atoi(smax_print_depth);
+ max_print_depth = atoi(smax_print_depth);
if (opt & 4)
- printf("Detected odd -x usage\n");
+ printf("Detected odd -x usage\n");
"--" A double dash between two options, or between an option and a group
of options, means that they are mutually exclusive. Unlike
diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c
index 6fb4dca..e2a717a 100644
--- a/loginutils/chpasswd.c
+++ b/loginutils/chpasswd.c
@@ -31,7 +31,7 @@
if (getuid())
bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
- opt_complementary = "m--e:e--m";
+ opt_complementary = "m--e:e--m";
USE_GETOPT_LONG(applet_long_options = chpasswd_longopts;)
opt = getopt32(argc, argv, "em");
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index 484c970..c47cc4e 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -239,83 +239,84 @@
/* word 81: minor version number */
#define MINOR_MAX 0x22
#if ENABLE_FEATURE_HDPARM_GET_IDENTITY
-static const char *minor_str[MINOR_MAX+2] = { /* word 81 value: */
- "Unspecified", /* 0x0000 */
- "ATA-1 X3T9.2 781D prior to rev.4", /* 0x0001 */
- "ATA-1 published, ANSI X3.221-1994", /* 0x0002 */
- "ATA-1 X3T9.2 781D rev.4", /* 0x0003 */
- "ATA-2 published, ANSI X3.279-1996", /* 0x0004 */
- "ATA-2 X3T10 948D prior to rev.2k", /* 0x0005 */
- "ATA-3 X3T10 2008D rev.1", /* 0x0006 */
- "ATA-2 X3T10 948D rev.2k", /* 0x0007 */
- "ATA-3 X3T10 2008D rev.0", /* 0x0008 */
- "ATA-2 X3T10 948D rev.3", /* 0x0009 */
- "ATA-3 published, ANSI X3.298-199x", /* 0x000a */
- "ATA-3 X3T10 2008D rev.6", /* 0x000b */
- "ATA-3 X3T13 2008D rev.7 and 7a", /* 0x000c */
- "ATA/ATAPI-4 X3T13 1153D rev.6", /* 0x000d */
- "ATA/ATAPI-4 T13 1153D rev.13", /* 0x000e */
- "ATA/ATAPI-4 X3T13 1153D rev.7", /* 0x000f */
- "ATA/ATAPI-4 T13 1153D rev.18", /* 0x0010 */
- "ATA/ATAPI-4 T13 1153D rev.15", /* 0x0011 */
- "ATA/ATAPI-4 published, ANSI INCITS 317-1998", /* 0x0012 */
- "ATA/ATAPI-5 T13 1321D rev.3",
- "ATA/ATAPI-4 T13 1153D rev.14", /* 0x0014 */
- "ATA/ATAPI-5 T13 1321D rev.1", /* 0x0015 */
- "ATA/ATAPI-5 published, ANSI INCITS 340-2000", /* 0x0016 */
- "ATA/ATAPI-4 T13 1153D rev.17", /* 0x0017 */
- "ATA/ATAPI-6 T13 1410D rev.0", /* 0x0018 */
- "ATA/ATAPI-6 T13 1410D rev.3a", /* 0x0019 */
- "ATA/ATAPI-7 T13 1532D rev.1", /* 0x001a */
- "ATA/ATAPI-6 T13 1410D rev.2", /* 0x001b */
- "ATA/ATAPI-6 T13 1410D rev.1", /* 0x001c */
- "ATA/ATAPI-7 published, ANSI INCITS 397-2005", /* 0x001d */
- "ATA/ATAPI-7 T13 1532D rev.0", /* 0x001e */
- "Reserved" /* 0x001f */
- "Reserved" /* 0x0020 */
- "ATA/ATAPI-7 T13 1532D rev.4a", /* 0x0021 */
- "ATA/ATAPI-6 published, ANSI INCITS 361-2002", /* 0x0022 */
- "Reserved" /* 0x0023-0xfffe*/
+static const char *const minor_str[MINOR_MAX + 2] = {
+ /* word 81 value: */
+ "Unspecified", /* 0x0000 */
+ "ATA-1 X3T9.2 781D prior to rev.4", /* 0x0001 */
+ "ATA-1 published, ANSI X3.221-1994", /* 0x0002 */
+ "ATA-1 X3T9.2 781D rev.4", /* 0x0003 */
+ "ATA-2 published, ANSI X3.279-1996", /* 0x0004 */
+ "ATA-2 X3T10 948D prior to rev.2k", /* 0x0005 */
+ "ATA-3 X3T10 2008D rev.1", /* 0x0006 */
+ "ATA-2 X3T10 948D rev.2k", /* 0x0007 */
+ "ATA-3 X3T10 2008D rev.0", /* 0x0008 */
+ "ATA-2 X3T10 948D rev.3", /* 0x0009 */
+ "ATA-3 published, ANSI X3.298-199x", /* 0x000a */
+ "ATA-3 X3T10 2008D rev.6", /* 0x000b */
+ "ATA-3 X3T13 2008D rev.7 and 7a", /* 0x000c */
+ "ATA/ATAPI-4 X3T13 1153D rev.6", /* 0x000d */
+ "ATA/ATAPI-4 T13 1153D rev.13", /* 0x000e */
+ "ATA/ATAPI-4 X3T13 1153D rev.7", /* 0x000f */
+ "ATA/ATAPI-4 T13 1153D rev.18", /* 0x0010 */
+ "ATA/ATAPI-4 T13 1153D rev.15", /* 0x0011 */
+ "ATA/ATAPI-4 published, ANSI INCITS 317-1998", /* 0x0012 */
+ "ATA/ATAPI-5 T13 1321D rev.3", /* 0x0013 */
+ "ATA/ATAPI-4 T13 1153D rev.14", /* 0x0014 */
+ "ATA/ATAPI-5 T13 1321D rev.1", /* 0x0015 */
+ "ATA/ATAPI-5 published, ANSI INCITS 340-2000", /* 0x0016 */
+ "ATA/ATAPI-4 T13 1153D rev.17", /* 0x0017 */
+ "ATA/ATAPI-6 T13 1410D rev.0", /* 0x0018 */
+ "ATA/ATAPI-6 T13 1410D rev.3a", /* 0x0019 */
+ "ATA/ATAPI-7 T13 1532D rev.1", /* 0x001a */
+ "ATA/ATAPI-6 T13 1410D rev.2", /* 0x001b */
+ "ATA/ATAPI-6 T13 1410D rev.1", /* 0x001c */
+ "ATA/ATAPI-7 published, ANSI INCITS 397-2005", /* 0x001d */
+ "ATA/ATAPI-7 T13 1532D rev.0", /* 0x001e */
+ "Reserved" /* 0x001f */
+ "Reserved" /* 0x0020 */
+ "ATA/ATAPI-7 T13 1532D rev.4a", /* 0x0021 */
+ "ATA/ATAPI-6 published, ANSI INCITS 361-2002", /* 0x0022 */
+ "Reserved" /* 0x0023-0xfffe */
};
#endif
-static const char actual_ver[MINOR_MAX+2] = {
- /* word 81 value: */
- 0, /* 0x0000 WARNING: */
- 1, /* 0x0001 WARNING: */
- 1, /* 0x0002 WARNING: */
- 1, /* 0x0003 WARNING: */
- 2, /* 0x0004 WARNING: This array */
- 2, /* 0x0005 WARNING: corresponds */
- 3, /* 0x0006 WARNING: *exactly* */
- 2, /* 0x0007 WARNING: to the ATA/ */
- 3, /* 0x0008 WARNING: ATAPI version */
- 2, /* 0x0009 WARNING: listed in */
- 3, /* 0x000a WARNING: the */
- 3, /* 0x000b WARNING: minor_str */
- 3, /* 0x000c WARNING: array */
- 4, /* 0x000d WARNING: above. */
- 4, /* 0x000e WARNING: */
- 4, /* 0x000f WARNING: if you change */
- 4, /* 0x0010 WARNING: that one, */
- 4, /* 0x0011 WARNING: change this one */
- 4, /* 0x0012 WARNING: too!!! */
- 5, /* 0x0013 WARNING: */
- 4, /* 0x0014 WARNING: */
- 5, /* 0x0015 WARNING: */
- 5, /* 0x0016 WARNING: */
- 4, /* 0x0017 WARNING: */
- 6, /* 0x0018 WARNING: */
- 6, /* 0x0019 WARNING: */
- 7, /* 0x001a WARNING: */
- 6, /* 0x001b WARNING: */
- 6, /* 0x001c WARNING: */
- 7, /* 0x001d WARNING: */
- 7, /* 0x001e WARNING: */
- 0, /* 0x001f WARNING: */
- 0, /* 0x0020 WARNING: */
- 7, /* 0x0021 WARNING: */
- 6, /* 0x0022 WARNING: */
- 0 /* 0x0023-0xfffe */
+static const char actual_ver[MINOR_MAX + 2] ALIGN1 = {
+ /* word 81 value: */
+ 0, /* 0x0000 WARNING: actual_ver[] array */
+ 1, /* 0x0001 WARNING: corresponds */
+ 1, /* 0x0002 WARNING: *exactly* */
+ 1, /* 0x0003 WARNING: to the ATA/ */
+ 2, /* 0x0004 WARNING: ATAPI version */
+ 2, /* 0x0005 WARNING: listed in */
+ 3, /* 0x0006 WARNING: the */
+ 2, /* 0x0007 WARNING: minor_str */
+ 3, /* 0x0008 WARNING: array */
+ 2, /* 0x0009 WARNING: above. */
+ 3, /* 0x000a WARNING: */
+ 3, /* 0x000b WARNING: If you change */
+ 3, /* 0x000c WARNING: that one, */
+ 4, /* 0x000d WARNING: change this one */
+ 4, /* 0x000e WARNING: too!!! */
+ 4, /* 0x000f */
+ 4, /* 0x0010 */
+ 4, /* 0x0011 */
+ 4, /* 0x0012 */
+ 5, /* 0x0013 */
+ 4, /* 0x0014 */
+ 5, /* 0x0015 */
+ 5, /* 0x0016 */
+ 4, /* 0x0017 */
+ 6, /* 0x0018 */
+ 6, /* 0x0019 */
+ 7, /* 0x001a */
+ 6, /* 0x001b */
+ 6, /* 0x001c */
+ 7, /* 0x001d */
+ 7, /* 0x001e */
+ 0, /* 0x001f */
+ 0, /* 0x0020 */
+ 7, /* 0x0021 */
+ 6, /* 0x0022 */
+ 0 /* 0x0023-0xfffe */
};
/* words 82-84: cmds/feats supported */
@@ -343,11 +344,11 @@
"Removable Media feature set", /* word 82 bit 2 */
"Security Mode feature set", /* word 82 bit 1 */
"SMART feature set", /* word 82 bit 0 */
- /* --------------*/
+ /* -------------- */
"", /* word 83 bit 15: !valid bit */
"", /* word 83 bit 14: valid bit */
- "FLUSH CACHE EXT cmd", /* word 83 bit 13 */
- "Mandatory FLUSH CACHE cmd ", /* word 83 bit 12 */
+ "FLUSH CACHE EXT cmd", /* word 83 bit 13 */
+ "Mandatory FLUSH CACHE cmd ", /* word 83 bit 12 */
"Device Configuration Overlay feature set ",
"48-bit Address feature set ", /* word 83 bit 10 */
"",
@@ -356,11 +357,11 @@
"SET FEATURES subcommand required to spinup after power up",
"Power-Up In Standby feature set", /* word 83 bit 5 */
"Removable Media Status Notification feature set",
- "Adv. Power Management feature set",/* word 83 bit 3 */
+ "Adv. Power Management feature set", /* word 83 bit 3 */
"CFA feature set", /* word 83 bit 2 */
"READ/WRITE DMA QUEUED", /* word 83 bit 1 */
"DOWNLOAD MICROCODE cmd", /* word 83 bit 0 */
- /* --------------*/
+ /* -------------- */
"", /* word 84 bit 15: !valid bit */
"", /* word 84 bit 14: valid bit */
"", /* word 84 bit 13: reserved */
diff --git a/networking/httpd.c b/networking/httpd.c
index 9a9489e..b44beaa 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1090,7 +1090,7 @@
setenv1("REMOTE_ADDR", p);
if (cp) *cp = ':';
}
- setenv1("HTTP_USER_AGENT", user_agent);
+ setenv1("HTTP_USER_AGENT", user_agent);
#if ENABLE_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
setenv_long("REMOTE_PORT", tcp_port);
#endif
diff --git a/selinux/setfiles.c b/selinux/setfiles.c
index dcc8cbb..08b911a 100644
--- a/selinux/setfiles.c
+++ b/selinux/setfiles.c
@@ -264,15 +264,15 @@
static int restore(const char *file)
{
- char *my_file;
+ char *my_file;
struct stat my_sb;
int i, j, ret;
char *context = NULL;
char *newcon = NULL;
bool user_only_changed = 0;
int retval = 0;
-
- my_file = bb_simplify_path(file);
+
+ my_file = bb_simplify_path(file);
i = match(my_file, &my_sb, &newcon);