whitespace cleanup. no code changes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

coreutils/cal.c

@@ -184,7 +184,8 @@ int cal_main(int argc UNUSED_PARAM, char **argv)
 				(WEEK_LEN * 3 + HEAD_SEP * 2)
 				+ julian * (J_WEEK_LEN * 2 + HEAD_SEP
 						   - (WEEK_LEN * 3 + HEAD_SEP * 2)),
-			   0);
+				0
+		);
 		puts("\n");		/* two \n's */
 		for (i = 0; i < 12; i++) {
 			day_array(i + 1, year, days[i]);

coreutils/stat.c

@@ -591,8 +591,10 @@ static bool do_stat(const char *filename, const char *format)
 # else
 		if (option_mask32 & OPT_TERSE) {
 			format = (option_mask32 & OPT_SELINUX ?
-				  "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o %C\n":
-				  "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o\n");
+				"%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o %C\n"
+				:
+				"%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o\n"
+				);
 		} else {
 			if (S_ISBLK(statbuf.st_mode) || S_ISCHR(statbuf.st_mode)) {
 				format = (option_mask32 & OPT_SELINUX ?
@@ -602,13 +604,15 @@ static bool do_stat(const char *filename, const char *format)
 					" Device type: %t,%T\n"
 					"Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 					"   S_Context: %C\n"
-					  "Access: %x\n" "Modify: %y\n" "Change: %z\n":
+					"Access: %x\n" "Modify: %y\n" "Change: %z\n"
+					:
 					"  File: %N\n"
 					"  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
 					"Device: %Dh/%dd\tInode: %-10i  Links: %-5h"
 					" Device type: %t,%T\n"
 					"Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
-					  "Access: %x\n" "Modify: %y\n" "Change: %z\n");
+					"Access: %x\n" "Modify: %y\n" "Change: %z\n"
+					);
 			} else {
 				format = (option_mask32 & OPT_SELINUX ?
 					"  File: %N\n"
@@ -616,12 +620,14 @@ static bool do_stat(const char *filename, const char *format)
 					"Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 					"Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
 					"S_Context: %C\n"
-					  "Access: %x\n" "Modify: %y\n" "Change: %z\n":
+					"Access: %x\n" "Modify: %y\n" "Change: %z\n"
+					:
 					"  File: %N\n"
 					"  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
 					"Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
 					"Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
-					  "Access: %x\n" "Modify: %y\n" "Change: %z\n");
+					"Access: %x\n" "Modify: %y\n" "Change: %z\n"
+					);
 			}
 		}
 # endif

coreutils/test.c

@@ -610,7 +610,7 @@ static int test_eaccess(char *path, int mode)
 			return 0;
 
 		/* Root can execute any file that has any one of the execute
-		   bits set. */
+		 * bits set. */
 		if (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))
 			return 0;
 	}

findutils/grep.c

@@ -638,7 +638,7 @@ int grep_main(int argc UNUSED_PARAM, char **argv)
 
 	if (opts & OPT_C) {
 		/* -C unsets prev -A and -B, but following -A or -B
-		   may override it */
+		 * may override it */
 		if (!(opts & OPT_A)) /* not overridden */
 			lines_after = Copt;
 		if (!(opts & OPT_B)) /* not overridden */

libbb/loop.c

@@ -150,9 +150,9 @@ int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offse
 			}
 
 		/* If this block device already set up right, re-use it.
-		   (Yes this is racy, but associating two loop devices with the same
-		   file isn't pretty either.  In general, mounting the same file twice
-		   without using losetup manually is problematic.)
+		 * (Yes this is racy, but associating two loop devices with the same
+		 * file isn't pretty either.  In general, mounting the same file twice
+		 * without using losetup manually is problematic.)
 		 */
 		} else
 		if (strcmp(file, (char *)loopinfo.lo_file_name) != 0

miscutils/devfsd.c

@@ -234,7 +234,7 @@ static void expand_regexp(char *, size_t, const char *, const char *, const regm
 static const char *expand_variable(	char *, unsigned, unsigned *, const char *,
 									const char *(*)(const char *, void *), void *);
 static const char *get_variable_v2(const char *, const char *(*)(const char *, void *), void *);
-static char get_old_ide_name(unsigned , unsigned);
+static char get_old_ide_name(unsigned, unsigned);
 static char *write_old_sd_name(char *, unsigned, unsigned, const char *);
 
 /* busybox functions */

miscutils/hdparm.c

@@ -1022,8 +1022,8 @@ static void identify(uint16_t *val)
 		}
 		if ((like_std > 3) && (val[CMDS_SUPP_1] & 0x0008)) {
 			/* We print out elsewhere whether the APM feature is enabled or
-			   not.  If it's not enabled, let's not repeat the info; just print
-			   nothing here. */
+			 * not.  If it's not enabled, let's not repeat the info; just print
+			 * nothing here. */
 			printf("\tAdvancedPM level: ");
 			if ((val[ADV_PWR] & 0xFF00) == 0x4000) {
 				uint8_t apm_level = val[ADV_PWR] & 0x00FF;

networking/ether-wake.c

@@ -113,7 +113,7 @@ void bb_debug_dump_packet(unsigned char *outpack, int pktsize)
  *    Host name
  *    IP address string
  *    MAC address string
-*/
+ */
 static void get_dest_addr(const char *hostid, struct ether_addr *eaddr)
 {
 	struct ether_addr *eap;

networking/libiproute/ipaddress.c

@@ -315,13 +315,15 @@ static int FAST_FUNC print_addrinfo(const struct sockaddr_nl *who UNUSED_PARAM,
 		printf("brd %s ",
 			rt_addr_n2a(ifa->ifa_family,
 					RTA_DATA(rta_tb[IFA_BROADCAST]),
-				    abuf, sizeof(abuf)));
+					abuf, sizeof(abuf))
+		);
 	}
 	if (rta_tb[IFA_ANYCAST]) {
 		printf("any %s ",
 			rt_addr_n2a(ifa->ifa_family,
 					RTA_DATA(rta_tb[IFA_ANYCAST]),
-				    abuf, sizeof(abuf)));
+					abuf, sizeof(abuf))
+		);
 	}
 	printf("scope %s ", rtnl_rtscope_n2a(ifa->ifa_scope, b1));
 	if (ifa->ifa_flags & IFA_F_SECONDARY) {

networking/libiproute/iprule.c

@@ -81,7 +81,9 @@ static int FAST_FUNC print_rule(const struct sockaddr_nl *who UNUSED_PARAM,
 			fputs(format_host(r->rtm_family,
 						RTA_PAYLOAD(tb[RTA_SRC]),
 						RTA_DATA(tb[RTA_SRC]),
-						       abuf, sizeof(abuf)), stdout);
+						abuf, sizeof(abuf)),
+				stdout
+			);
 		}
 	} else if (r->rtm_src_len) {
 		printf("0/%d", r->rtm_src_len);

networking/netstat.c

@@ -187,7 +187,7 @@ static void prg_cache_add(long inode, char *name)
 	for (pnp = prg_hash + hi; (pn = *pnp) != NULL; pnp = &pn->next) {
 		if (pn->inode == inode) {
 			/* Some warning should be appropriate here
-			   as we got multiple processes for one i-node */
+			 * as we got multiple processes for one i-node */
 			return;
 		}
 	}

networking/tc.c

@@ -526,7 +526,8 @@ int tc_main(int argc UNUSED_PARAM, char **argv)
 				duparg(*argv, "handle");
 			/* reject LONG_MIN || LONG_MAX */
 			/* TODO: for fw
-			   if ((slash = strchr(handle, '/')) != NULL)
+			slash = strchr(handle, '/');
+			if (slash != NULL)
 				   *slash = '\0';
 			 */
 			msg.tcm_handle = get_u32(*argv, "handle");

networking/traceroute.c

@@ -290,7 +290,8 @@
 #endif
 
 
-#define OPT_STRING "FIlnrdvxt:i:m:p:q:s:w:z:f:" \
+#define OPT_STRING \
+	"FIlnrdvxt:i:m:p:q:s:w:z:f:" \
 	IF_FEATURE_TRACEROUTE_SOURCE_ROUTE("g:") \
 	"4" IF_TRACEROUTE6("6")
 enum {

selinux/chcon.c

@@ -181,7 +181,7 @@ int chcon_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_FEATURE_CHCON_LONG_OPTIONS
 	if (option_mask32 & OPT_REFERENCE) {
 		/* FIXME: lgetfilecon() should be used when '-h' is specified.
-		   But current implementation follows the original one. */
+		 * But current implementation follows the original one. */
 		if (getfilecon(reference_file, &specified_context) < 0)
 			bb_perror_msg_and_die("getfilecon('%s') failed", reference_file);
 	} else

selinux/setfiles.c

@@ -501,7 +501,8 @@ static int process_one(char *name)
 				ACTION_RECURSE,
 				apply_spec,
 				apply_spec,
-				     NULL, 0) != TRUE) {
+				NULL, 0) != TRUE
+		) {
 			bb_error_msg("error while labeling %s", name);
 			goto err;
 		}
@@ -600,8 +601,8 @@ int setfiles_main(int argc UNUSED_PARAM, char **argv)
 		fclose(policystream);
 
 		/* Only process the specified file_contexts file, not
-		   any .homedirs or .local files, and do not perform
-		   context translations. */
+		 * any .homedirs or .local files, and do not perform
+		 * context translations. */
 		set_matchpathcon_flags(MATCHPATHCON_BASEONLY |
 				       MATCHPATHCON_NOTRANS |
 				       MATCHPATHCON_VALIDATE);
@@ -631,8 +632,8 @@ int setfiles_main(int argc UNUSED_PARAM, char **argv)
 
 	if (applet_name[0] == 's') { /* setfiles */
 		/* Use our own invalid context checking function so that
-		   we can support either checking against the active policy or
-		   checking against a binary policy file. */
+		 * we can support either checking against the active policy or
+		 * checking against a binary policy file. */
 		set_matchpathcon_canoncon(&canoncon);
 		if (!argv[0])
 			bb_show_usage();

shell/ash.c

@@ -3564,7 +3564,8 @@ set_curjob(struct job *jp, unsigned mode)
 		break;
 	case CUR_RUNNING:
 		/* newly created job or backgrounded job,
-		   put after all stopped jobs. */
+		 * put after all stopped jobs.
+		 */
 		while (1) {
 			jp1 = *jpp;
 #if JOBS
@@ -11640,8 +11641,9 @@ parsebackq: {
 	INT_ON;
 	if (oldstyle) {
 		/* We must read until the closing backquote, giving special
-		   treatment to some slashes, and then push the string and
-		   reread it as input, interpreting it normally.  */
+		 * treatment to some slashes, and then push the string and
+		 * reread it as input, interpreting it normally.
+		 */
 		char *pout;
 		size_t psavelen;
 		char *pstr;

shell/hush.c

@@ -4219,7 +4219,7 @@ static struct pipe *parse_stream(char **pstring,
 			/* (this makes bare "&" cmd a no-op.
 			 * bash says: "syntax error near unexpected token '&'") */
 			if (pi->num_cmds == 0
-			    IF_HAS_KEYWORDS( && pi->res_word == RES_NONE)
+			IF_HAS_KEYWORDS(&& pi->res_word == RES_NONE)
 			) {
 				free_pipe_list(pi);
 				pi = NULL;

util-linux/fdisk_osf.c

@@ -898,8 +898,7 @@ xbsd_initlabel(struct partition *p)
 	pp->p_fstype = BSD_FS_UNUSED;
 #else
 	d->d_npartitions = 3;
-	pp = &d->d_partitions[2];             /* Partition C should be
-						   the whole disk */
+	pp = &d->d_partitions[2]; /* Partition C should be the whole disk */
 	pp->p_offset = 0;
 	pp->p_size   = d->d_secperunit;
 	pp->p_fstype = BSD_FS_UNUSED;

util-linux/fsck_minix.c

@@ -22,7 +22,6 @@
  * 16.11.91  -  More corrections (thanks to Mika Jalava). Most
  *		things seem to work now. Yeah, sure.
  *
- *
  * 19.04.92  -  Had to start over again from this old version, as a
  *		kernel bug ate my enhanced fsck in february.
  *

util-linux/getopt.c

@@ -372,7 +372,7 @@ int getopt_main(int argc, char **argv)
 	if (!argv[1]) {
 		if (compatible) {
 			/* For some reason, the original getopt gave no error
-			   when there were no arguments. */
+			 * when there were no arguments. */
 			printf(" --\n");
 			return 0;
 		}

util-linux/ipcs.c

@@ -152,7 +152,7 @@ static NOINLINE void do_shm(void)
 		if ((shmctl(0, IPC_INFO, (struct shmid_ds *) (void *) &shminfo)) < 0)
 			return;
 		/* glibc 2.1.3 and all earlier libc's have ints as fields
-		   of struct shminfo; glibc 2.1.91 has unsigned long; ach */
+		 * of struct shminfo; glibc 2.1.91 has unsigned long; ach */
 		printf("max number of segments = %lu\n"
 				"max seg size (kbytes) = %lu\n"
 				"max total shared memory (pages) = %lu\n"