openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-01 22:21:16 +02:00
Code Issues Releases Wiki Activity

Convert printf to msg_* where appropriate

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

39
cli_output.c
View File

@ -22,34 +22,25 @@
#include <stdarg.h>
#include "flash.h"
int print(int type, const char *fmt, ...)
/* Please note that level is the verbosity, not the importance of the message. */
int print(enum msglevel level, const char *fmt, ...)
{
va_list ap;
int ret;
FILE *output_type;
int ret = 0;
FILE *output_type = stdout;
switch (type) {
case MSG_ERROR:
if (level == MSG_ERROR)
output_type = stderr;
break;
case MSG_BARF:
if (verbose < 3)
return 0;
case MSG_DEBUG2:
if (verbose < 2)
return 0;
case MSG_DEBUG:
if (verbose < 1)
return 0;
case MSG_INFO:
default:
output_type = stdout;
break;
}
va_start(ap, fmt);
ret = vfprintf(output_type, fmt, ap);
va_end(ap);
fflush(output_type);
if (level <= verbose) {
va_start(ap, fmt);
ret = vfprintf(output_type, fmt, ap);
va_end(ap);
/* msg_*spew usually happens inside chip accessors in possibly
* time-critical operations. Don't slow them down by flushing.
*/
if (level != MSG_SPEW)
fflush(output_type);
}
return ret;
}