1
0
mirror of https://review.coreboot.org/flashrom.git synced 2025-06-30 21:52:36 +02:00

Convert printf to msg_* where appropriate

Clean up cli_output.c to be more readable.
Use enum instead of #define for message levels.
Kill a few exit(0) calls.
Print the command line arguments in verbose mode.
Move actions (--list-supported etc.) after argument sanity checks.
Reduce the number of code paths which have their own
programmer_shutdown().

Corresponding to flashrom svn r1536.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
This commit is contained in:
Carl-Daniel Hailfinger
2012-05-14 22:54:58 +00:00
parent 2cef9164ef
commit 901a3ba023
4 changed files with 98 additions and 88 deletions

View File

@ -40,7 +40,7 @@
const char flashrom_version[] = FLASHROM_VERSION;
char *chip_to_probe = NULL;
int verbose = 0;
int verbose = MSG_INFO;
static enum programmer programmer = PROGRAMMER_INVALID;
@ -1457,27 +1457,27 @@ void list_programmers_linebreak(int startcol, int cols, int paren)
if (firstline)
firstline = 0;
else
printf("\n");
msg_ginfo("\n");
for (i = 0; i < startcol; i++)
printf(" ");
msg_ginfo(" ");
remaining = cols - startcol;
} else {
printf(" ");
msg_ginfo(" ");
remaining--;
}
if (paren && (p == 0)) {
printf("(");
msg_ginfo("(");
remaining--;
}
printf("%s", pname);
msg_ginfo("%s", pname);
remaining -= pnamelen;
if (p < PROGRAMMER_INVALID - 1) {
printf(",");
msg_ginfo(",");
remaining--;
} else {
if (paren)
printf(")");
printf("\n");
msg_ginfo(")");
msg_ginfo("\n");
}
}
}