all: assorted formatting fixes

Since we have a tool to verify the source code style/formatting, let's
put it to good use.

Signed-off-by: Paul Moore <pmoore@redhat.com>

4 files changed, 191 insertions, 190 deletions

diff --git a/tools/scmp_arch_detect.c b/tools/scmp_arch_detect.c
index 0aca5a8..e90f92b 100644
--- a/tools/scmp_arch_detect.c
+++ b/tools/scmp_arch_detect.c
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
 	uint32_t arch;
 
 	/* parse the command line */
-	while ((opt = getopt(argc, argv, "ht"))> 0) {
+	while ((opt = getopt(argc, argv, "ht")) > 0) {
 		switch (opt) {
 		case 't':
 			token = 1;
diff --git a/tools/scmp_bpf_disasm.c b/tools/scmp_bpf_disasm.c
index 5b63fe8..8474eb1 100644
--- a/tools/scmp_bpf_disasm.c
+++ b/tools/scmp_bpf_disasm.c
@@ -44,125 +44,125 @@
 static void bpf_decode_op(const bpf_instr_raw *bpf)
 {
 	switch (bpf->code) {
-		case BPF_LD+BPF_W+BPF_IMM:
-		case BPF_LD+BPF_W+BPF_ABS:
-		case BPF_LD+BPF_W+BPF_IND:
-		case BPF_LD+BPF_W+BPF_MEM:
-		case BPF_LD+BPF_W+BPF_LEN:
-		case BPF_LD+BPF_W+BPF_MSH:
-			printf(_OP_FMT, "ld");
-			break;
-		case BPF_LD+BPF_H+BPF_IMM:
-		case BPF_LD+BPF_H+BPF_ABS:
-		case BPF_LD+BPF_H+BPF_IND:
-		case BPF_LD+BPF_H+BPF_MEM:
-		case BPF_LD+BPF_H+BPF_LEN:
-		case BPF_LD+BPF_H+BPF_MSH:
-			printf(_OP_FMT, "ldh");
-			break;
-		case BPF_LD+BPF_B+BPF_IMM:
-		case BPF_LD+BPF_B+BPF_ABS:
-		case BPF_LD+BPF_B+BPF_IND:
-		case BPF_LD+BPF_B+BPF_MEM:
-		case BPF_LD+BPF_B+BPF_LEN:
-		case BPF_LD+BPF_B+BPF_MSH:
-			printf(_OP_FMT, "ldb");
-			break;
-		case BPF_LDX+BPF_W+BPF_IMM:
-		case BPF_LDX+BPF_W+BPF_ABS:
-		case BPF_LDX+BPF_W+BPF_IND:
-		case BPF_LDX+BPF_W+BPF_MEM:
-		case BPF_LDX+BPF_W+BPF_LEN:
-		case BPF_LDX+BPF_W+BPF_MSH:
-		case BPF_LDX+BPF_H+BPF_IMM:
-		case BPF_LDX+BPF_H+BPF_ABS:
-		case BPF_LDX+BPF_H+BPF_IND:
-		case BPF_LDX+BPF_H+BPF_MEM:
-		case BPF_LDX+BPF_H+BPF_LEN:
-		case BPF_LDX+BPF_H+BPF_MSH:
-		case BPF_LDX+BPF_B+BPF_IMM:
-		case BPF_LDX+BPF_B+BPF_ABS:
-		case BPF_LDX+BPF_B+BPF_IND:
-		case BPF_LDX+BPF_B+BPF_MEM:
-		case BPF_LDX+BPF_B+BPF_LEN:
-		case BPF_LDX+BPF_B+BPF_MSH:
-			printf(_OP_FMT, "ldx");
-			break;
-		case BPF_ST:
-			printf(_OP_FMT, "st");
-			break;
-		case BPF_STX:
-			printf(_OP_FMT, "stx");
-			break;
-		case BPF_ALU+BPF_ADD+BPF_K:
-		case BPF_ALU+BPF_ADD+BPF_X:
-			printf(_OP_FMT, "add");
-			break;
-		case BPF_ALU+BPF_SUB+BPF_K:
-		case BPF_ALU+BPF_SUB+BPF_X:
-			printf(_OP_FMT, "sub");
-			break;
-		case BPF_ALU+BPF_MUL+BPF_K:
-		case BPF_ALU+BPF_MUL+BPF_X:
-			printf(_OP_FMT, "mul");
-			break;
-		case BPF_ALU+BPF_DIV+BPF_K:
-		case BPF_ALU+BPF_DIV+BPF_X:
-			printf(_OP_FMT, "div");
-			break;
-		case BPF_ALU+BPF_OR+BPF_K:
-		case BPF_ALU+BPF_OR+BPF_X:
-			printf(_OP_FMT, "or");
-			break;
-		case BPF_ALU+BPF_AND+BPF_K:
-		case BPF_ALU+BPF_AND+BPF_X:
-			printf(_OP_FMT, "and");
-			break;
-		case BPF_ALU+BPF_LSH+BPF_K:
-		case BPF_ALU+BPF_LSH+BPF_X:
-			printf(_OP_FMT, "lsh");
-			break;
-		case BPF_ALU+BPF_RSH+BPF_K:
-		case BPF_ALU+BPF_RSH+BPF_X:
-			printf(_OP_FMT, "rsh");
-			break;
-		case BPF_ALU+BPF_NEG+BPF_K:
-		case BPF_ALU+BPF_NEG+BPF_X:
-			printf(_OP_FMT, "neg");
-			break;
-		case BPF_JMP+BPF_JA+BPF_K:
-		case BPF_JMP+BPF_JA+BPF_X:
-			printf(_OP_FMT, "jmp");
-			break;
-		case BPF_JMP+BPF_JEQ+BPF_K:
-		case BPF_JMP+BPF_JEQ+BPF_X:
-			printf(_OP_FMT, "jeq");
-			break;
-		case BPF_JMP+BPF_JGT+BPF_K:
-		case BPF_JMP+BPF_JGT+BPF_X:
-			printf(_OP_FMT, "jgt");
-			break;
-		case BPF_JMP+BPF_JGE+BPF_K:
-		case BPF_JMP+BPF_JGE+BPF_X:
-			printf(_OP_FMT, "jge");
-			break;
-		case BPF_JMP+BPF_JSET+BPF_K:
-		case BPF_JMP+BPF_JSET+BPF_X:
-			printf(_OP_FMT, "jset");
-			break;
-		case BPF_RET+BPF_K:
-		case BPF_RET+BPF_X:
-		case BPF_RET+BPF_A:
-			printf(_OP_FMT, "ret");
-			break;
-		case BPF_MISC+BPF_TAX:
-			printf(_OP_FMT, "tax");
-			break;
-		case BPF_MISC+BPF_TXA:
-			printf(_OP_FMT, "txa");
-			break;
-		default:
-			printf(_OP_FMT, "???");
+	case BPF_LD+BPF_W+BPF_IMM:
+	case BPF_LD+BPF_W+BPF_ABS:
+	case BPF_LD+BPF_W+BPF_IND:
+	case BPF_LD+BPF_W+BPF_MEM:
+	case BPF_LD+BPF_W+BPF_LEN:
+	case BPF_LD+BPF_W+BPF_MSH:
+		printf(_OP_FMT, "ld");
+		break;
+	case BPF_LD+BPF_H+BPF_IMM:
+	case BPF_LD+BPF_H+BPF_ABS:
+	case BPF_LD+BPF_H+BPF_IND:
+	case BPF_LD+BPF_H+BPF_MEM:
+	case BPF_LD+BPF_H+BPF_LEN:
+	case BPF_LD+BPF_H+BPF_MSH:
+		printf(_OP_FMT, "ldh");
+		break;
+	case BPF_LD+BPF_B+BPF_IMM:
+	case BPF_LD+BPF_B+BPF_ABS:
+	case BPF_LD+BPF_B+BPF_IND:
+	case BPF_LD+BPF_B+BPF_MEM:
+	case BPF_LD+BPF_B+BPF_LEN:
+	case BPF_LD+BPF_B+BPF_MSH:
+		printf(_OP_FMT, "ldb");
+		break;
+	case BPF_LDX+BPF_W+BPF_IMM:
+	case BPF_LDX+BPF_W+BPF_ABS:
+	case BPF_LDX+BPF_W+BPF_IND:
+	case BPF_LDX+BPF_W+BPF_MEM:
+	case BPF_LDX+BPF_W+BPF_LEN:
+	case BPF_LDX+BPF_W+BPF_MSH:
+	case BPF_LDX+BPF_H+BPF_IMM:
+	case BPF_LDX+BPF_H+BPF_ABS:
+	case BPF_LDX+BPF_H+BPF_IND:
+	case BPF_LDX+BPF_H+BPF_MEM:
+	case BPF_LDX+BPF_H+BPF_LEN:
+	case BPF_LDX+BPF_H+BPF_MSH:
+	case BPF_LDX+BPF_B+BPF_IMM:
+	case BPF_LDX+BPF_B+BPF_ABS:
+	case BPF_LDX+BPF_B+BPF_IND:
+	case BPF_LDX+BPF_B+BPF_MEM:
+	case BPF_LDX+BPF_B+BPF_LEN:
+	case BPF_LDX+BPF_B+BPF_MSH:
+		printf(_OP_FMT, "ldx");
+		break;
+	case BPF_ST:
+		printf(_OP_FMT, "st");
+		break;
+	case BPF_STX:
+		printf(_OP_FMT, "stx");
+		break;
+	case BPF_ALU+BPF_ADD+BPF_K:
+	case BPF_ALU+BPF_ADD+BPF_X:
+		printf(_OP_FMT, "add");
+		break;
+	case BPF_ALU+BPF_SUB+BPF_K:
+	case BPF_ALU+BPF_SUB+BPF_X:
+		printf(_OP_FMT, "sub");
+		break;
+	case BPF_ALU+BPF_MUL+BPF_K:
+	case BPF_ALU+BPF_MUL+BPF_X:
+		printf(_OP_FMT, "mul");
+		break;
+	case BPF_ALU+BPF_DIV+BPF_K:
+	case BPF_ALU+BPF_DIV+BPF_X:
+		printf(_OP_FMT, "div");
+		break;
+	case BPF_ALU+BPF_OR+BPF_K:
+	case BPF_ALU+BPF_OR+BPF_X:
+		printf(_OP_FMT, "or");
+		break;
+	case BPF_ALU+BPF_AND+BPF_K:
+	case BPF_ALU+BPF_AND+BPF_X:
+		printf(_OP_FMT, "and");
+		break;
+	case BPF_ALU+BPF_LSH+BPF_K:
+	case BPF_ALU+BPF_LSH+BPF_X:
+		printf(_OP_FMT, "lsh");
+		break;
+	case BPF_ALU+BPF_RSH+BPF_K:
+	case BPF_ALU+BPF_RSH+BPF_X:
+		printf(_OP_FMT, "rsh");
+		break;
+	case BPF_ALU+BPF_NEG+BPF_K:
+	case BPF_ALU+BPF_NEG+BPF_X:
+		printf(_OP_FMT, "neg");
+		break;
+	case BPF_JMP+BPF_JA+BPF_K:
+	case BPF_JMP+BPF_JA+BPF_X:
+		printf(_OP_FMT, "jmp");
+		break;
+	case BPF_JMP+BPF_JEQ+BPF_K:
+	case BPF_JMP+BPF_JEQ+BPF_X:
+		printf(_OP_FMT, "jeq");
+		break;
+	case BPF_JMP+BPF_JGT+BPF_K:
+	case BPF_JMP+BPF_JGT+BPF_X:
+		printf(_OP_FMT, "jgt");
+		break;
+	case BPF_JMP+BPF_JGE+BPF_K:
+	case BPF_JMP+BPF_JGE+BPF_X:
+		printf(_OP_FMT, "jge");
+		break;
+	case BPF_JMP+BPF_JSET+BPF_K:
+	case BPF_JMP+BPF_JSET+BPF_X:
+		printf(_OP_FMT, "jset");
+		break;
+	case BPF_RET+BPF_K:
+	case BPF_RET+BPF_X:
+	case BPF_RET+BPF_A:
+		printf(_OP_FMT, "ret");
+		break;
+	case BPF_MISC+BPF_TAX:
+		printf(_OP_FMT, "tax");
+		break;
+	case BPF_MISC+BPF_TXA:
+		printf(_OP_FMT, "txa");
+		break;
+	default:
+		printf(_OP_FMT, "???");
 	}
 }
 
@@ -178,80 +178,80 @@ static void bpf_decode_op(const bpf_instr_raw *bpf)
 static void bpf_decode_args(const bpf_instr_raw *bpf, unsigned int line)
 {
 	switch (BPF_CLASS(bpf->code)) {
-		case BPF_LD:
-		case BPF_LDX:
-			switch (BPF_MODE(bpf->code)) {
-				case BPF_ABS:
-					printf("$data[%u]", bpf->k);
-					break;
-				case BPF_MEM:
-					printf("$temp[%u]", bpf->k);
-					break;
-			}
+	case BPF_LD:
+	case BPF_LDX:
+		switch (BPF_MODE(bpf->code)) {
+		case BPF_ABS:
+			printf("$data[%u]", bpf->k);
 			break;
-		case BPF_ST:
-		case BPF_STX:
+		case BPF_MEM:
 			printf("$temp[%u]", bpf->k);
 			break;
-		case BPF_ALU:
-			if (BPF_SRC(bpf->code) == BPF_K) {
-				switch (BPF_OP(bpf->code)) {
-				case BPF_OR:
-				case BPF_AND:
-					printf("0x%.8x", bpf->k);
-					break;
-				default:
-					printf("%u", bpf->k);
-				}
-			} else
+		}
+		break;
+	case BPF_ST:
+	case BPF_STX:
+		printf("$temp[%u]", bpf->k);
+		break;
+	case BPF_ALU:
+		if (BPF_SRC(bpf->code) == BPF_K) {
+			switch (BPF_OP(bpf->code)) {
+			case BPF_OR:
+			case BPF_AND:
+				printf("0x%.8x", bpf->k);
+				break;
+			default:
 				printf("%u", bpf->k);
-			break;
-		case BPF_JMP:
-			if (BPF_OP(bpf->code) == BPF_JA) {
-				printf("%.4u", (line + 1) + bpf->k);
-			} else {
-				printf("%-4u true:%.4u false:%.4u",
-				       bpf->k,
-				       (line + 1) + bpf->jt,
-				       (line + 1) + bpf->jf);
 			}
-			break;
-		case BPF_RET:
-			if (BPF_RVAL(bpf->code) == BPF_A) {
-				/* XXX - accumulator? */
-				printf("$acc");
-			} else if (BPF_SRC(bpf->code) == BPF_K) {
-				uint32_t act = bpf->k & SECCOMP_RET_ACTION;
-				uint32_t data = bpf->k & SECCOMP_RET_DATA;
+		} else
+			printf("%u", bpf->k);
+		break;
+	case BPF_JMP:
+		if (BPF_OP(bpf->code) == BPF_JA) {
+			printf("%.4u", (line + 1) + bpf->k);
+		} else {
+			printf("%-4u true:%.4u false:%.4u",
+			       bpf->k,
+			       (line + 1) + bpf->jt,
+			       (line + 1) + bpf->jf);
+		}
+		break;
+	case BPF_RET:
+		if (BPF_RVAL(bpf->code) == BPF_A) {
+			/* XXX - accumulator? */
+			printf("$acc");
+		} else if (BPF_SRC(bpf->code) == BPF_K) {
+			uint32_t act = bpf->k & SECCOMP_RET_ACTION;
+			uint32_t data = bpf->k & SECCOMP_RET_DATA;
 
-				switch (act) {
-				case SECCOMP_RET_KILL:
-					printf("KILL");
-					break;
-				case SECCOMP_RET_TRAP:
-					printf("TRAP");
-					break;
-				case SECCOMP_RET_ERRNO:
-					printf("ERRNO(%u)", data);
-					break;
-				case SECCOMP_RET_TRACE:
-					printf("TRACE(%u)", data);
-					break;
-				case SECCOMP_RET_ALLOW:
-					printf("ALLOW");
-					break;
-				default:
-					printf("0x%.8x", bpf->k);
-				}
-			} else if (BPF_SRC(bpf->code) == BPF_X) {
-				/* XXX - any idea? */
-				printf("???");
+			switch (act) {
+			case SECCOMP_RET_KILL:
+				printf("KILL");
+				break;
+			case SECCOMP_RET_TRAP:
+				printf("TRAP");
+				break;
+			case SECCOMP_RET_ERRNO:
+				printf("ERRNO(%u)", data);
+				break;
+			case SECCOMP_RET_TRACE:
+				printf("TRACE(%u)", data);
+				break;
+			case SECCOMP_RET_ALLOW:
+				printf("ALLOW");
+				break;
+			default:
+				printf("0x%.8x", bpf->k);
 			}
-			break;
-		case BPF_MISC:
-			break;
-		default:
+		} else if (BPF_SRC(bpf->code) == BPF_X) {
+			/* XXX - any idea? */
 			printf("???");
+		}
+		break;
+	case BPF_MISC:
+		break;
+	default:
+		printf("???");
 	}
 }
 
diff --git a/tools/scmp_bpf_sim.c b/tools/scmp_bpf_sim.c
index 94c6648..1b46cc9 100644
--- a/tools/scmp_bpf_sim.c
+++ b/tools/scmp_bpf_sim.c
@@ -59,9 +59,10 @@ static unsigned int opt_verbose = 0;
  */
 static void exit_usage(const char *program)
 {
-	fprintf(stderr, "usage: %s -f <bpf_file> [-v]"
-			" -a <arch> -s <syscall_num> [-0 <a0>] ... [-5 <a5>]\n",
-			program);
+	fprintf(stderr,
+		"usage: %s -f <bpf_file> [-v]"
+		" -a <arch> -s <syscall_num> [-0 <a0>] ... [-5 <a5>]\n",
+		program);
 	exit(EINVAL);
 }
 
diff --git a/tools/scmp_sys_resolver.c b/tools/scmp_sys_resolver.c
index 7e627d4..e86b400 100644
--- a/tools/scmp_sys_resolver.c
+++ b/tools/scmp_sys_resolver.c
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
 	const char *sys_name;
 
 	/* parse the command line */
-	while ((opt = getopt(argc, argv, "a:ht"))> 0) {
+	while ((opt = getopt(argc, argv, "a:ht")) > 0) {
 		switch (opt) {
 		case 'a':
 			if (strcmp(optarg, "x86") == 0)