From: tip-bot for Steven Rostedt <srostedt@redhat.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
rostedt@goodmis.org, srostedt@redhat.com, jreiser@bitwagon.com,
tglx@linutronix.de
Subject: [tip:perf/core] ftrace/trivial: Clean up record mcount to use Linux switch style
Date: Wed, 18 May 2011 18:31:37 GMT [thread overview]
Message-ID: <tip-e90b0c8bf211958a296d60369fecd51b35864407@git.kernel.org> (raw)
In-Reply-To: <20110421023737.523968644@goodmis.org>
Commit-ID: e90b0c8bf211958a296d60369fecd51b35864407
Gitweb: http://git.kernel.org/tip/e90b0c8bf211958a296d60369fecd51b35864407
Author: Steven Rostedt <srostedt@redhat.com>
AuthorDate: Wed, 6 Apr 2011 13:32:24 -0400
Committer: Steven Rostedt <rostedt@goodmis.org>
CommitDate: Mon, 16 May 2011 14:41:07 -0400
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.org
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
scripts/recordmcount.c | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c
index 37afe0e..4ebd839 100644
--- a/scripts/recordmcount.c
+++ b/scripts/recordmcount.c
@@ -264,27 +264,27 @@ do_file(char const *const fname)
w8 = w8nat;
switch (ehdr->e_ident[EI_DATA]) {
static unsigned int const endian = 1;
- default: {
+ default:
fprintf(stderr, "unrecognized ELF data encoding %d: %s\n",
ehdr->e_ident[EI_DATA], fname);
fail_file();
- } break;
- case ELFDATA2LSB: {
+ break;
+ case ELFDATA2LSB:
if (*(unsigned char const *)&endian != 1) {
/* main() is big endian, file.o is little endian. */
w = w4rev;
w2 = w2rev;
w8 = w8rev;
}
- } break;
- case ELFDATA2MSB: {
+ break;
+ case ELFDATA2MSB:
if (*(unsigned char const *)&endian != 0) {
/* main() is little endian, file.o is big endian. */
w = w4rev;
w2 = w2rev;
w8 = w8rev;
}
- } break;
+ break;
} /* end switch */
if (memcmp(ELFMAG, ehdr->e_ident, SELFMAG) != 0
|| w2(ehdr->e_type) != ET_REL
@@ -295,11 +295,11 @@ do_file(char const *const fname)
gpfx = 0;
switch (w2(ehdr->e_machine)) {
- default: {
+ default:
fprintf(stderr, "unrecognized e_machine %d %s\n",
w2(ehdr->e_machine), fname);
fail_file();
- } break;
+ break;
case EM_386: reltype = R_386_32; break;
case EM_ARM: reltype = R_ARM_ABS32;
altmcount = "__gnu_mcount_nc";
@@ -315,12 +315,12 @@ do_file(char const *const fname)
} /* end switch */
switch (ehdr->e_ident[EI_CLASS]) {
- default: {
+ default:
fprintf(stderr, "unrecognized ELF class %d %s\n",
ehdr->e_ident[EI_CLASS], fname);
fail_file();
- } break;
- case ELFCLASS32: {
+ break;
+ case ELFCLASS32:
if (w2(ehdr->e_ehsize) != sizeof(Elf32_Ehdr)
|| w2(ehdr->e_shentsize) != sizeof(Elf32_Shdr)) {
fprintf(stderr,
@@ -334,7 +334,7 @@ do_file(char const *const fname)
is_fake_mcount32 = MIPS32_is_fake_mcount;
}
do32(ehdr, fname, reltype);
- } break;
+ break;
case ELFCLASS64: {
Elf64_Ehdr *const ghdr = (Elf64_Ehdr *)ehdr;
if (w2(ghdr->e_ehsize) != sizeof(Elf64_Ehdr)
@@ -352,7 +352,8 @@ do_file(char const *const fname)
is_fake_mcount64 = MIPS64_is_fake_mcount;
}
do64(ghdr, fname, reltype);
- } break;
+ break;
+ }
} /* end switch */
cleanup();
@@ -386,23 +387,23 @@ main(int argc, char const *argv[])
continue;
switch (sjval) {
- default: {
+ default:
fprintf(stderr, "internal error: %s\n", argv[0]);
exit(1);
- } break;
- case SJ_SETJMP: { /* normal sequence */
+ break;
+ case SJ_SETJMP: /* normal sequence */
/* Avoid problems if early cleanup() */
fd_map = -1;
ehdr_curr = NULL;
mmap_failed = 1;
do_file(argv[0]);
- } break;
- case SJ_FAIL: { /* error in do_file or below */
+ break;
+ case SJ_FAIL: /* error in do_file or below */
++n_error;
- } break;
- case SJ_SUCCEED: { /* premature success */
+ break;
+ case SJ_SUCCEED: /* premature success */
/* do nothing */
- } break;
+ break;
} /* end switch */
}
return !!n_error;
next prev parent reply other threads:[~2011-05-18 18:31 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-21 2:28 [RFC][PATCH 00/11] ftrace/recordmcount: Remove useless mcount calls not being traced Steven Rostedt
2011-04-21 2:28 ` [RFC][PATCH 01/11] ftrace/trivial: Clean up recordmcount.c to use Linux style comparisons Steven Rostedt
2011-04-21 8:46 ` Alan Cox
2011-04-21 11:36 ` Steven Rostedt
2011-04-21 12:28 ` Steven Rostedt
2011-04-22 15:09 ` John Reiser
2011-04-22 15:52 ` Thiago Farina
2011-04-22 16:05 ` Steven Rostedt
2011-04-26 18:52 ` Thiago Farina
2011-04-26 19:09 ` Steven Rostedt
2011-04-22 16:13 ` Steven Rostedt
2011-04-22 17:40 ` John Reiser
2011-04-22 17:56 ` H. Peter Anvin
2011-05-18 18:31 ` [tip:perf/core] " tip-bot for Steven Rostedt
2011-06-16 14:04 ` tip-bot for Steven Rostedt
2011-04-21 2:28 ` [RFC][PATCH 02/11] ftrace/trivial: Clean up record mcount to use Linux switch style Steven Rostedt
2011-05-18 18:31 ` tip-bot for Steven Rostedt [this message]
2011-06-16 14:04 ` [tip:perf/core] " tip-bot for Steven Rostedt
2011-04-21 2:28 ` [RFC][PATCH 03/11] ftrace: Add .kprobe.text section to whitelist for recordmcount.c Steven Rostedt
2011-05-18 18:32 ` [tip:perf/core] " tip-bot for Steven Rostedt
2011-06-16 14:05 ` tip-bot for Steven Rostedt
2011-04-21 2:28 ` [RFC][PATCH 04/11] ftrace/recordmcount: Modify only executable sections Steven Rostedt
2011-05-18 18:32 ` [tip:perf/core] " tip-bot for Steven Rostedt
2011-06-16 14:05 ` tip-bot for Steven Rostedt
2011-04-21 2:28 ` [RFC][PATCH 05/11] ftrace/recordmcount: Make ignored mcount calls into nops at compile time Steven Rostedt
2011-05-18 18:32 ` [tip:perf/core] " tip-bot for Steven Rostedt
2011-06-16 14:05 ` tip-bot for Steven Rostedt
2011-04-21 2:28 ` [RFC][PATCH 06/11] ftrace/recordmcount: Add warning logic to warn on mcount not recorded Steven Rostedt
2011-05-18 18:33 ` [tip:perf/core] " tip-bot for Steven Rostedt
2011-06-16 14:06 ` tip-bot for Steven Rostedt
2011-04-21 2:28 ` [RFC][PATCH 07/11] kbuild/recordmcount: Add RECORDMCOUNT_WARN to warn about mcount callers Steven Rostedt
2011-04-21 2:40 ` Steven Rostedt
2011-04-21 20:40 ` Michal Marek
2011-04-26 19:08 ` Steven Rostedt
2011-05-18 18:33 ` [tip:perf/core] " tip-bot for Steven Rostedt
2011-06-16 14:06 ` tip-bot for Steven Rostedt
2011-04-21 2:28 ` [RFC][PATCH 08/11] ftrace: Avoid recording mcount on .init sections directly Steven Rostedt
2011-05-18 18:34 ` [tip:perf/core] " tip-bot for Steven Rostedt
2011-06-16 14:07 ` tip-bot for Steven Rostedt
2011-04-21 2:28 ` [RFC][PATCH 09/11] ftrace/x86: Do not trace .discard.text section Steven Rostedt
2011-05-18 18:34 ` [tip:perf/core] " tip-bot for Steven Rostedt
2011-06-16 14:07 ` tip-bot for Steven Rostedt
2011-04-21 2:28 ` [RFC][PATCH 10/11] ftrace/recordmcount: Remove duplicate code to find mcount symbol Steven Rostedt
2011-05-18 18:34 ` [tip:perf/core] " tip-bot for Steven Rostedt
2011-06-16 14:07 ` tip-bot for Steven Rostedt
2011-04-21 2:28 ` [RFC][PATCH 11/11] ftrace/recordmcount: Add helper function get_sym_str_and_relp() Steven Rostedt
2011-05-18 18:35 ` [tip:perf/core] " tip-bot for Steven Rostedt
2011-06-16 14:08 ` tip-bot for Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-e90b0c8bf211958a296d60369fecd51b35864407@git.kernel.org \
--to=srostedt@redhat.com \
--cc=hpa@zytor.com \
--cc=jreiser@bitwagon.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).