summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Stuge <peter@stuge.se>2010-01-16 17:21:17 +0000
committerPeter Stuge <peter@stuge.se>2010-01-16 17:21:17 +0000
commit350ca4a94faa4f35b0b63045f9c7132c2801e1b8 (patch)
tree7047f3345443cb717aa36bbdd0886faae814b1a6
parent6ade16144221b528bad0b971dfe38f3e0a13ef16 (diff)
downloadcoreboot-350ca4a94faa4f35b0b63045f9c7132c2801e1b8.tar.xz
msrtool: Remove indent by using continue inside for() to avoid an if block
The only actual code change is from if (.. >= 1) { } to if (.. < 1) continue so this is pretty trivial. Signed-off-by: Peter Stuge <peter@stuge.se> Acked-by: Peter Stuge <peter@stuge.se> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5020 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--util/msrtool/msrtool.c27
1 files changed, 14 insertions, 13 deletions
diff --git a/util/msrtool/msrtool.c b/util/msrtool/msrtool.c
index 56d2591db4..7ef40d82b4 100644
--- a/util/msrtool/msrtool.c
+++ b/util/msrtool/msrtool.c
@@ -182,7 +182,7 @@ done:
int do_diff(const char *difffn) {
char tmpfn[20], line[512];
size_t start, len;
- int ret = 1, tmp;
+ int ret = 1, found, tmp;
FILE *fin = NULL, *fout = stdout;
uint8_t rev = 0;
uint32_t addr, linenum;
@@ -203,19 +203,20 @@ int do_diff(const char *difffn) {
goto done;
for (linenum = 1; NULL != fgets(line, sizeof(line), fin); ++linenum) {
start = (0 == strncmp("0x", line, 2)) ? 2 : 0;
- if (sscanf(line + start, "%8x %n%*x", &addr, &tmp) >= 1) {
- start += tmp;
- for (len = strlen(line) - 1; NULL != strchr("\r\n", line[len]); --len)
- line[len] = 0;
- if (!str2msr(line + start, &mf)) {
- fprintf(stderr, "%s:%d: invalid MSR value '%s'\n", difffn, linenum, line + start);
- continue;
- }
- if (!sys->rdmsr(cpu, addr, &mhw))
- goto done;
- if (diff_msr(fout, addr, rev ? mhw : mf, rev ? mf : mhw))
- fprintf(fout, "\n");
+ found = sscanf(line + start, "%8x %n%*x", &addr, &tmp);
+ if (found < 1)
+ continue;
+ start += tmp;
+ for (len = strlen(line) - 1; NULL != strchr("\r\n", line[len]); --len)
+ line[len] = 0;
+ if (!str2msr(line + start, &mf)) {
+ fprintf(stderr, "%s:%d: invalid MSR value '%s'\n", difffn, linenum, line + start);
+ continue;
}
+ if (!sys->rdmsr(cpu, addr, &mhw))
+ goto done;
+ if (diff_msr(fout, addr, rev ? mhw : mf, rev ? mf : mhw))
+ fprintf(fout, "\n");
}
if (!feof(fin))
fprintf(stderr, "%s:%d: fgets: %s\n", difffn, linenum, strerror(errno));