whitespace cleanup

util-linux/dmesg.c

@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * 
+ *
  * dmesg - display/control kernel ring buffer.
  *
  * Copyright 2006 Rob Landley <rob@landley.net>
@@ -30,7 +30,7 @@ int dmesg_main(int argc, char *argv[])
 		if (0 > (len = klogctl(3 + (flags & 1), buf, len)))
 			bb_perror_msg_and_die("klogctl");
 
-		// Skip <#> at the start of lines, and make sure we end with a newline. 
+		// Skip <#> at the start of lines, and make sure we end with a newline.
 
 		if (ENABLE_FEATURE_DMESG_PRETTY) {
 			int last = '\n';

util-linux/fdisk.c

@@ -1914,9 +1914,9 @@ sgi_set_swappartition(int i)
 static int
 sgi_check_bootfile(const char* aFile)
 {
- 	if (strlen(aFile) < 3) /* "/a\n" is minimum */ {
- 		printf(_("\nInvalid Bootfile!\n"
- 			"\tThe bootfile must be an absolute non-zero pathname,\n"
+	if (strlen(aFile) < 3) /* "/a\n" is minimum */ {
+		printf(_("\nInvalid Bootfile!\n"
+			"\tThe bootfile must be an absolute non-zero pathname,\n"
 			"\te.g. \"/unix\" or \"/unix.save\".\n"));
 		return 0;
 	} else {
@@ -1931,7 +1931,7 @@ sgi_check_bootfile(const char* aFile)
 				return 0;
 			}
 		}
- 	}
+	}
 	if (strncmp(aFile, (char*)sgilabel->boot_file, 16)) {
 		printf(_("\n\tBe aware, that the bootfile is not checked for existence.\n\t"
 			 "SGI's default is \"/unix\" and for backup \"/unix.save\".\n"));
@@ -2505,7 +2505,7 @@ static const struct systypes sun_sys_types[] = {
 	{ "\x83" "Linux native" }, /* LINUX_NATIVE */
 	{ "\x8e" "Linux LVM"    }, /* 0x8e         */
 /* New (2.2.x) raid partition with autodetect using persistent superblock */
-	{ "\xfd" "Linux raid autodetect" }, /* 0xfd         */  
+	{ "\xfd" "Linux raid autodetect" }, /* 0xfd         */
 	{ NULL }
 };
 
@@ -3080,14 +3080,14 @@ sun_list_table(int xtra)
 			uint32_t start = SUN_SSWAP32(sunlabel->partitions[i].start_cylinder) * heads * sectors;
 			uint32_t len = SUN_SSWAP32(sunlabel->partitions[i].num_sectors);
 			printf("%s %c%c %9ld %9ld %9ld%c  %2x  %s\n",
-				partname(disk_device, i+1, w),			/* device */            
-				(sunlabel->infos[i].flags & 0x01) ? 'u' : ' ',  /* flags */             
-				(sunlabel->infos[i].flags & 0x10) ? 'r' : ' ',  			
-				(long) scround(start),                          /* start */             
-				(long) scround(start+len),                      /* end */               
-				(long) len / 2, len & 1 ? '+' : ' ',            /* odd flag on end */   
-				sunlabel->infos[i].id,                          /* type id */           
-				partition_type(sunlabel->infos[i].id));         /* type name */         
+				partname(disk_device, i+1, w),			/* device */
+				(sunlabel->infos[i].flags & 0x01) ? 'u' : ' ',  /* flags */
+				(sunlabel->infos[i].flags & 0x10) ? 'r' : ' ',
+				(long) scround(start),                          /* start */
+				(long) scround(start+len),                      /* end */
+				(long) len / 2, len & 1 ? '+' : ' ',            /* odd flag on end */
+				sunlabel->infos[i].id,                          /* type id */
+				partition_type(sunlabel->infos[i].id));         /* type name */
 		}
 	}
 }
@@ -4280,8 +4280,8 @@ get_partition(int warn, int max)
 	if (warn) {
 		if (
 			(
-				label_sun != current_label_type && 
-				label_sgi != current_label_type && 
+				label_sun != current_label_type &&
+				label_sgi != current_label_type &&
 				!pe->part_table->sys_ind
 			)
 #ifdef CONFIG_FEATURE_SUN_LABEL

util-linux/hexdump.c

@@ -66,9 +66,9 @@ int hexdump_main(int argc, char **argv)
 				bb_dump_add(add_first);
 				bb_dump_add(add_strings[(int)(p - hexdump_opts)]);
 			} else if (ch == 'C') {
-			        bb_dump_add("\"%08.8_Ax\n\"");
+				bb_dump_add("\"%08.8_Ax\n\"");
 				bb_dump_add("\"%08.8_ax  \" 8/1 \"%02x \" \"  \" 8/1 \"%02x \" ");
-			        bb_dump_add("\"  |\" 16/1 \"%_p\" \"|\\n\"");
+				bb_dump_add("\"  |\" 16/1 \"%_p\" \"|\\n\"");
 			} else {
 				/* Sae a little bit of space below by omitting the 'else's. */
 				if (ch == 'e') {

util-linux/mdev.c

@@ -138,7 +138,7 @@ static void make_device(char *path, int delete)
 							// Command to run
 							char *s = "@$*", *s2;
 							if (!(s2 = strchr(s, *pos++))) {
-							  	// Force error
+								// Force error
 								field = 1;
 								break;
 							}
@@ -171,13 +171,13 @@ static void make_device(char *path, int delete)
 
 		if (major == bbg.root_major && minor == bbg.root_minor)
 			symlink(device_name, "root");
-	
+
 		if (ENABLE_FEATURE_MDEV_CONF) chown(device_name, uid, gid);
 	}
 	if (command) {
 		int rc;
 		char *s;
-		
+
 		s=xasprintf("MDEV=%s",device_name);
 		putenv(s);
 		rc = system(command);

util-linux/mkswap.c

@@ -19,7 +19,7 @@ int mkswap_main(int argc, char *argv[])
 	if (argc!=2) bb_show_usage();
 
 	// Figure out how big the device is and announce our intentions.
-	
+
 	fd = xopen(argv[1],O_RDWR);
 	len = fdlength(fd);
 	pagesize = getpagesize();

util-linux/mount.c

@@ -673,7 +673,7 @@ get_mountport(struct sockaddr_in *server_addr,
 	p.pm_vers = version;
 	p.pm_prot = proto;
 	p.pm_port = port;
-	
+
 	while (pmap) {
 		if (pmap->pml_map.pm_prog != prog)
 			goto next;
@@ -1315,7 +1315,7 @@ static int singlemount(struct mntent *mp, int ignore_busy)
 		s = strrchr(mp->mnt_fsname, '\\');
 		if (s == mp->mnt_fsname+1) goto report_error;
 		*s = 0;
-	   	he = gethostbyname(mp->mnt_fsname+2);
+		he = gethostbyname(mp->mnt_fsname+2);
 		*s = '\\';
 		if (!he) goto report_error;
 
@@ -1517,7 +1517,7 @@ int mount_main(int argc, char **argv)
 		if (rc) bb_perror_msg_and_die("%s", argv[0]);
 		goto clean_up;
 	}
-	
+
 	// Open either fstab or mtab
 
 	if (parse_mount_options(cmdopts,0) & MS_REMOUNT)

util-linux/umount.c

@@ -76,7 +76,7 @@ int umount_main(int argc, char **argv)
 		m = 0;
 		if (!argc) bb_show_usage();
 	}
-	
+
 	// Loop through everything we're supposed to umount, and do so.
 	for (;;) {
 		int curstat;