Commit e90b0c8b authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt

ftrace/trivial: Clean up record mcount to use Linux switch style

The Linux style for switch statements is:

	switch (var) {
	case x:
		[...]
		break;
	}

Not:
	switch (var) {
	case x: {
		[...]
	} break;

Cc: John Reiser <jreiser@bitwagon.com>
Link: http://lkml.kernel.org/r/20110421023737.523968644@goodmis.orgSigned-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent dd5477ff
...@@ -264,27 +264,27 @@ do_file(char const *const fname) ...@@ -264,27 +264,27 @@ do_file(char const *const fname)
w8 = w8nat; w8 = w8nat;
switch (ehdr->e_ident[EI_DATA]) { switch (ehdr->e_ident[EI_DATA]) {
static unsigned int const endian = 1; static unsigned int const endian = 1;
default: { default:
fprintf(stderr, "unrecognized ELF data encoding %d: %s\n", fprintf(stderr, "unrecognized ELF data encoding %d: %s\n",
ehdr->e_ident[EI_DATA], fname); ehdr->e_ident[EI_DATA], fname);
fail_file(); fail_file();
} break; break;
case ELFDATA2LSB: { case ELFDATA2LSB:
if (*(unsigned char const *)&endian != 1) { if (*(unsigned char const *)&endian != 1) {
/* main() is big endian, file.o is little endian. */ /* main() is big endian, file.o is little endian. */
w = w4rev; w = w4rev;
w2 = w2rev; w2 = w2rev;
w8 = w8rev; w8 = w8rev;
} }
} break; break;
case ELFDATA2MSB: { case ELFDATA2MSB:
if (*(unsigned char const *)&endian != 0) { if (*(unsigned char const *)&endian != 0) {
/* main() is little endian, file.o is big endian. */ /* main() is little endian, file.o is big endian. */
w = w4rev; w = w4rev;
w2 = w2rev; w2 = w2rev;
w8 = w8rev; w8 = w8rev;
} }
} break; break;
} /* end switch */ } /* end switch */
if (memcmp(ELFMAG, ehdr->e_ident, SELFMAG) != 0 if (memcmp(ELFMAG, ehdr->e_ident, SELFMAG) != 0
|| w2(ehdr->e_type) != ET_REL || w2(ehdr->e_type) != ET_REL
...@@ -295,11 +295,11 @@ do_file(char const *const fname) ...@@ -295,11 +295,11 @@ do_file(char const *const fname)
gpfx = 0; gpfx = 0;
switch (w2(ehdr->e_machine)) { switch (w2(ehdr->e_machine)) {
default: { default:
fprintf(stderr, "unrecognized e_machine %d %s\n", fprintf(stderr, "unrecognized e_machine %d %s\n",
w2(ehdr->e_machine), fname); w2(ehdr->e_machine), fname);
fail_file(); fail_file();
} break; break;
case EM_386: reltype = R_386_32; break; case EM_386: reltype = R_386_32; break;
case EM_ARM: reltype = R_ARM_ABS32; case EM_ARM: reltype = R_ARM_ABS32;
altmcount = "__gnu_mcount_nc"; altmcount = "__gnu_mcount_nc";
...@@ -315,12 +315,12 @@ do_file(char const *const fname) ...@@ -315,12 +315,12 @@ do_file(char const *const fname)
} /* end switch */ } /* end switch */
switch (ehdr->e_ident[EI_CLASS]) { switch (ehdr->e_ident[EI_CLASS]) {
default: { default:
fprintf(stderr, "unrecognized ELF class %d %s\n", fprintf(stderr, "unrecognized ELF class %d %s\n",
ehdr->e_ident[EI_CLASS], fname); ehdr->e_ident[EI_CLASS], fname);
fail_file(); fail_file();
} break; break;
case ELFCLASS32: { case ELFCLASS32:
if (w2(ehdr->e_ehsize) != sizeof(Elf32_Ehdr) if (w2(ehdr->e_ehsize) != sizeof(Elf32_Ehdr)
|| w2(ehdr->e_shentsize) != sizeof(Elf32_Shdr)) { || w2(ehdr->e_shentsize) != sizeof(Elf32_Shdr)) {
fprintf(stderr, fprintf(stderr,
...@@ -334,7 +334,7 @@ do_file(char const *const fname) ...@@ -334,7 +334,7 @@ do_file(char const *const fname)
is_fake_mcount32 = MIPS32_is_fake_mcount; is_fake_mcount32 = MIPS32_is_fake_mcount;
} }
do32(ehdr, fname, reltype); do32(ehdr, fname, reltype);
} break; break;
case ELFCLASS64: { case ELFCLASS64: {
Elf64_Ehdr *const ghdr = (Elf64_Ehdr *)ehdr; Elf64_Ehdr *const ghdr = (Elf64_Ehdr *)ehdr;
if (w2(ghdr->e_ehsize) != sizeof(Elf64_Ehdr) if (w2(ghdr->e_ehsize) != sizeof(Elf64_Ehdr)
...@@ -352,7 +352,8 @@ do_file(char const *const fname) ...@@ -352,7 +352,8 @@ do_file(char const *const fname)
is_fake_mcount64 = MIPS64_is_fake_mcount; is_fake_mcount64 = MIPS64_is_fake_mcount;
} }
do64(ghdr, fname, reltype); do64(ghdr, fname, reltype);
} break; break;
}
} /* end switch */ } /* end switch */
cleanup(); cleanup();
...@@ -386,23 +387,23 @@ main(int argc, char const *argv[]) ...@@ -386,23 +387,23 @@ main(int argc, char const *argv[])
continue; continue;
switch (sjval) { switch (sjval) {
default: { default:
fprintf(stderr, "internal error: %s\n", argv[0]); fprintf(stderr, "internal error: %s\n", argv[0]);
exit(1); exit(1);
} break; break;
case SJ_SETJMP: { /* normal sequence */ case SJ_SETJMP: /* normal sequence */
/* Avoid problems if early cleanup() */ /* Avoid problems if early cleanup() */
fd_map = -1; fd_map = -1;
ehdr_curr = NULL; ehdr_curr = NULL;
mmap_failed = 1; mmap_failed = 1;
do_file(argv[0]); do_file(argv[0]);
} break; break;
case SJ_FAIL: { /* error in do_file or below */ case SJ_FAIL: /* error in do_file or below */
++n_error; ++n_error;
} break; break;
case SJ_SUCCEED: { /* premature success */ case SJ_SUCCEED: /* premature success */
/* do nothing */ /* do nothing */
} break; break;
} /* end switch */ } /* end switch */
} }
return !!n_error; return !!n_error;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment