Use same indent for all c-code

Signed-off-by: Alexey Gladkov <[email protected]>

Author: legionus

.astylerc

@@ -0,0 +1,9 @@
+lineend=linux
+style=linux
+indent=tab=8
+indent-switches
+indent-cases
+min-conditional-indent=0
+max-instatement-indent=120
+align-pointer=name
+max-code-length=130

Makefile.in

@@ -196,6 +196,11 @@ check-unit:
 
 check: check-unit
 
+.PHONY: indent-c
+indent-c:
+	@find . \! -path './external/*' -name '*.[ch]' \
+	    -exec astyle -n --quiet --options=.astylerc '{}' '+'
+
 release:
 	$(Q)git archive -o $(PKGFILE).tar --prefix=$(PREFIX)/ HEAD
 	$(Q)git submodule update --init --checkout --depth=1 --force

datasrc/do_mounts.h

@@ -25,14 +25,14 @@ int create_dev(const char *name, dev_t dev);
 dev_t name_to_dev_t(const char *name);
 
 const char *mount_block(const char *source, const char *target,
-			const char *type, unsigned long flags,
-			const void *data);
+                        const char *type, unsigned long flags,
+                        const void *data);
 
 int mount_root(int argc, char *argv[], dev_t root_dev,
-	       const char *root_dev_name);
+               const char *root_dev_name);
 
 int mount_mtd_root(int argc, char *argv[], const char *root_dev_name,
-		   const char *type, unsigned long flags);
+                   const char *type, unsigned long flags);
 
 int do_mounts(int argc, char *argv[]);
 
@@ -47,7 +47,7 @@ static inline dev_t bstat(const char *name)
 	return st.st_rdev;
 }
 
-int load_ramdisk_compressed(const char *devpath, FILE * wfd,
-			    off_t ramdisk_start);
+int load_ramdisk_compressed(const char *devpath, FILE *wfd,
+                            off_t ramdisk_start);
 
 #endif				/* DO_MOUNTS_H */

datasrc/do_mounts_md.c

@@ -108,7 +108,7 @@ static unsigned int mdp_major(void)
 			n = strtol(line, &p, 10);
 			if (errno == ERANGE || n < INT_MIN || n > INT_MAX) {
 				fprintf(stderr,
-					"Error: mdp device numner is out of range.\n");
+				        "Error: mdp device numner is out of range.\n");
 				exit(1);
 			}
 			major_no = (unsigned int) n;
@@ -127,7 +127,7 @@ static unsigned int mdp_major(void)
 
 	if (!found) {
 		fprintf(stderr,
-			"Error: mdp devices detected but no mdp device found!\n");
+		        "Error: mdp devices detected but no mdp device found!\n");
 		exit(1);
 	}
 
@@ -173,58 +173,58 @@ static int md_setup(char *str)
 	str1 = str;
 	if (minor_num < 0) {
 		fprintf(stderr, "md: md=%d, Minor device number must be positive.\n",
-			minor_num);
+		        minor_num);
 		return 0;
 	}
 	if (minor_num >= MAX_MD_DEVS) {
 		fprintf(stderr, "md: md=%d, Minor device number too high.\n",
-			minor_num);
+		        minor_num);
 		return 0;
 	}
 	for (ent = 0; ent < md_setup_ents; ent++)
 		if (md_setup_args[ent].minor == (unsigned) minor_num &&
 		    md_setup_args[ent].partitioned == partitioned) {
 			fprintf(stderr,
-				"md: md=%s%d, Specified more than once. "
-				"Replacing previous definition.\n",
-				partitioned ? "d" : "", minor_num);
+			        "md: md=%s%d, Specified more than once. "
+			        "Replacing previous definition.\n",
+			        partitioned ? "d" : "", minor_num);
 			break;
 		}
 	if (ent >= MAX_MD_DEVS) {
 		fprintf(stderr, "md: md=%s%d - too many md initialisations\n",
-			partitioned ? "d" : "", minor_num);
+		        partitioned ? "d" : "", minor_num);
 		return 0;
 	}
 	if (ent >= md_setup_ents)
 		md_setup_ents++;
 	switch (get_option(&str, &level)) {	/* RAID level */
-	case 2:		/* could be 0 or -1.. */
-		if (level == 0 || level == LEVEL_LINEAR) {
-			if (get_option(&str, &factor) != 2 ||	/* Chunk Size */
-			    get_option(&str, &fault) != 2) {
-				fprintf(stderr,
-					"md: Too few arguments supplied to md=.\n");
-				return 0;
+		case 2:		/* could be 0 or -1.. */
+			if (level == 0 || level == LEVEL_LINEAR) {
+				if (get_option(&str, &factor) != 2 ||	/* Chunk Size */
+				    get_option(&str, &fault) != 2) {
+					fprintf(stderr,
+					        "md: Too few arguments supplied to md=.\n");
+					return 0;
+				}
+				md_setup_args[ent].level = level;
+				md_setup_args[ent].chunk = 1 << (factor + 12);
+				if (level == LEVEL_LINEAR)
+					pername = "linear";
+				else
+					pername = "raid0";
+				break;
 			}
-			md_setup_args[ent].level = level;
-			md_setup_args[ent].chunk = 1 << (factor + 12);
-			if (level == LEVEL_LINEAR)
-				pername = "linear";
-			else
-				pername = "raid0";
-			break;
-		}
 		/* FALL THROUGH */
-	case 1:		/* the first device is numeric */
-		str = str1;
+		case 1:		/* the first device is numeric */
+			str = str1;
 		/* FALL THROUGH */
-	case 0:
-		md_setup_args[ent].level = LEVEL_NONE;
-		pername = "super-block";
+		case 0:
+			md_setup_args[ent].level = LEVEL_NONE;
+			pername = "super-block";
 	}
 
 	fprintf(stderr, "md: Will configure md%s%d (%s) from %s, below.\n",
-		partitioned ? "_d" : "", minor_num, pername, str);
+	        partitioned ? "_d" : "", minor_num, pername, str);
 	md_setup_args[ent].device_names = str;
 	md_setup_args[ent].partitioned = partitioned;
 	md_setup_args[ent].minor = (unsigned) minor_num;
@@ -254,7 +254,7 @@ static void md_setup_drive(void)
 		devname = md_setup_args[ent].device_names;
 
 		snprintf(name, sizeof name,
-			 "/dev/md%s%d", partitioned ? "_d" : "", dev_minor);
+		         "/dev/md%s%d", partitioned ? "_d" : "", dev_minor);
 
 		if (stat(name, &st_chk) == 0)
 			continue;
@@ -274,7 +274,7 @@ static void md_setup_drive(void)
 			dev = name_to_dev_t(devname);
 			if (!dev) {
 				fprintf(stderr, "md: Unknown device name: %s\n",
-					devname);
+				        devname);
 				break;
 			}
 
@@ -288,19 +288,19 @@ static void md_setup_drive(void)
 			continue;
 
 		fprintf(stderr, "md: Loading md%s%d: %s\n",
-			partitioned ? "_d" : "", dev_minor,
-			md_setup_args[ent].device_names);
+		        partitioned ? "_d" : "", dev_minor,
+		        md_setup_args[ent].device_names);
 
 		fd = open(name, 0, 0);
 		if (fd < 0) {
 			fprintf(stderr, "md: open failed - cannot start "
-				"array %s\n", name);
+			        "array %s\n", name);
 			continue;
 		}
 		if (ioctl(fd, SET_ARRAY_INFO, 0) == -EBUSY) {
 			fprintf(stderr,
-				"md: Ignoring md=%d, already autodetected. (Use raid=noautodetect)\n",
-				dev_minor);
+			        "md: Ignoring md=%d, already autodetected. (Use raid=noautodetect)\n",
+			        dev_minor);
 			close(fd);
 			continue;
 		}
@@ -328,7 +328,7 @@ static void md_setup_drive(void)
 				dinfo.number = i;
 				dinfo.raid_disk = i;
 				dinfo.state =
-				    (1 << MD_DISK_ACTIVE) | (1 << MD_DISK_SYNC);
+				        (1 << MD_DISK_ACTIVE) | (1 << MD_DISK_SYNC);
 				dinfo.major = (int) major(dev);
 				dinfo.minor = (int) minor(dev);
 				err = ioctl(fd, ADD_NEW_DISK, &dinfo);
@@ -348,7 +348,7 @@ static void md_setup_drive(void)
 			err = ioctl(fd, RUN_ARRAY, 0);
 		if (err)
 			fprintf(stderr, "md: starting md%d failed\n",
-				dev_minor);
+			        dev_minor);
 		else {
 			/* reread the partition table.
 			 * I (neilb) and not sure why this is needed, but I
@@ -394,7 +394,7 @@ static void md_run_setup(void)
 	create_dev("/dev/md0", makedev(MD_MAJOR, 0));
 	if (raid_noautodetect)
 		fprintf(stderr,
-			"md: Skipping autodetection of RAID arrays. (raid=noautodetect)\n");
+		        "md: Skipping autodetection of RAID arrays. (raid=noautodetect)\n");
 	else {
 		int fd = open("/dev/md0", 0, 0);
 		if (fd >= 0) {

datasrc/environ/environ.c

@@ -20,7 +20,8 @@ static unsigned int shell = 0;
 static void __attribute__ ((noreturn))
 show_usage(int ret)
 {
-	fprintf(stderr, "Usage: environ [-c|-q|-s|-h] [-p PREFIX] [-i include0,include1,...] [-u unset0,unset1,...] [-f filename] [command [arg]...]\n");
+	fprintf(stderr,
+	        "Usage: environ [-c|-q|-s|-h] [-p PREFIX] [-i include0,include1,...] [-u unset0,unset1,...] [-f filename] [command [arg]...]\n");
 	exit(ret);
 }
 

datasrc/halt/halt.c

@@ -75,9 +75,9 @@ static void do_shutdown(const char *fl, const char *pw, const char *tm);
 void usage(void)
 {
 	fprintf(stderr, "usage: %s [-n] [-w] [-d] [-f] [-h] [-i]%s%s\n",
-		progname,
-		strcmp(progname, "halt") ? "" : " [-p]",
-		strcmp(progname, "reboot") ? "" : " [-k]");
+	        progname,
+	        strcmp(progname, "halt") ? "" : " [-p]",
+	        strcmp(progname, "reboot") ? "" : " [-k]");
 	fprintf(stderr, "\t-n: don't sync before halting the system\n");
 	fprintf(stderr, "\t-w: only write a wtmp reboot record and exit.\n");
 	fprintf(stderr, "\t-d: don't write a wtmp record.\n");
@@ -118,9 +118,9 @@ int get_runlevel(void)
 
 	/* This should not happen but warn the user! */
 	fprintf(stderr, "WARNING: could not determine runlevel"
-		" - doing soft %s\n", progname);
+	        " - doing soft %s\n", progname);
 	fprintf(stderr, "  (it's better to use shutdown instead of %s"
-		" from the command line)\n", progname);
+	        " from the command line)\n", progname);
 
 	return -1;
 }
@@ -217,7 +217,7 @@ int main(int argc, char **argv)
 			default:
 				usage();
 		}
-	 }
+	}
 	if (argc != optind) usage();
 
 	if (geteuid() != 0) {
@@ -238,11 +238,11 @@ int main(int argc, char **argv)
 		 */
 		if (c != '6' && do_reboot && do_kexec) {
 			fprintf(stderr, "ERROR: using -k at this"
-				" runlevel requires also -f\n"
-				"  (You probably want instead to reboot"
-				" normally and let your reboot\n"
-				"   script, usually /etc/init.d/reboot,"
-				" specify -k)\n");
+			        " runlevel requires also -f\n"
+			        "  (You probably want instead to reboot"
+			        " normally and let your reboot\n"
+			        "   script, usually /etc/init.d/reboot,"
+			        " specify -k)\n");
 			exit(1);
 		}
 
@@ -251,7 +251,7 @@ int main(int argc, char **argv)
 		 */
 		if (c != '0' && c != '6')
 			do_shutdown(do_reboot ? "-r" : "-h",
-				    do_poweroff ? "-P" : (do_reboot ? NULL : "-H"), tm);
+			            do_poweroff ? "-P" : (do_reboot ? NULL : "-H"), tm);
 	}
 
 	/*