diff options
| author | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2010-01-09 03:22:31 +0000 |
|---|---|---|
| committer | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2010-01-09 03:22:31 +0000 |
| commit | f8dda683591a9ab2ff498500d2eda77068517a64 (patch) | |
| tree | 0207063787c9291156cdfa243a8483b74cb16c52 /flash.h | |
| parent | 4bf4e79907d4147a37639a32e1bce2c9eaea20b7 (diff) | |
| download | ast2050-flashrom-f8dda683591a9ab2ff498500d2eda77068517a64.zip ast2050-flashrom-f8dda683591a9ab2ff498500d2eda77068517a64.tar.gz | |
Change msg_* macros to C99 variadic macros
The msg_* macros won't compile as is if you use more than one parameter
(i.e.
have a format string and a variable). There are two alternative styles:
GNU or C99 variadic macros. While C99 has limitations compared to the
GNU extensions, these limitations do not affect our macros, so I decided
to go with the standard way.
I adjusted whitespace a bit to have aligned values (cosmetic change).
Corresponding to flashrom svn r841.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Sean Nelson <audiohacked@gmail.com>
Diffstat (limited to 'flash.h')
| -rw-r--r-- | flash.h | 32 |
1 files changed, 16 insertions, 16 deletions
@@ -508,22 +508,22 @@ int doit(struct flashchip *flash, int force, char *filename, int read_it, int wr /* cli_output.c */ int print(int type, const char *fmt, ...); -#define MSG_ERROR 0 -#define MSG_INFO 1 -#define MSG_DEBUG 2 -#define MSG_BARF 3 -#define msg_gerr(x) print(MSG_ERROR, x) /* general errors */ -#define msg_perr(x) print(MSG_ERROR, x) /* programmer errors */ -#define msg_cerr(x) print(MSG_ERROR, x) /* chip errors */ -#define msg_ginfo(x) print(MSG_INFO, x) /* general info */ -#define msg_pinfo(x) print(MSG_INFO, x) /* programmer info */ -#define msg_cinfo(x) print(MSG_INFO, x) /* chip info */ -#define msg_gdbg(x) print(MSG_DEBUG, x) /* general debug */ -#define msg_pdbg(x) print(MSG_DEBUG, x) /* programmer debug */ -#define msg_cdbg(x) print(MSG_DEBUG, x) /* chip debug */ -#define msg_gspew(x) print(MSG_BARF, x) /* general debug barf */ -#define msg_pspew(x) print(MSG_BARF, x) /* programmer debug barf */ -#define msg_cspew(x) print(MSG_BARF, x) /* chip debug barf */ +#define MSG_ERROR 0 +#define MSG_INFO 1 +#define MSG_DEBUG 2 +#define MSG_BARF 3 +#define msg_gerr(...) print(MSG_ERROR, __VA_ARGS__) /* general errors */ +#define msg_perr(...) print(MSG_ERROR, __VA_ARGS__) /* programmer errors */ +#define msg_cerr(...) print(MSG_ERROR, __VA_ARGS__) /* chip errors */ +#define msg_ginfo(...) print(MSG_INFO, __VA_ARGS__) /* general info */ +#define msg_pinfo(...) print(MSG_INFO, __VA_ARGS__) /* programmer info */ +#define msg_cinfo(...) print(MSG_INFO, __VA_ARGS__) /* chip info */ +#define msg_gdbg(...) print(MSG_DEBUG, __VA_ARGS__) /* general debug */ +#define msg_pdbg(...) print(MSG_DEBUG, __VA_ARGS__) /* programmer debug */ +#define msg_cdbg(...) print(MSG_DEBUG, __VA_ARGS__) /* chip debug */ +#define msg_gspew(...) print(MSG_BARF, __VA_ARGS__) /* general debug barf */ +#define msg_pspew(...) print(MSG_BARF, __VA_ARGS__) /* programmer debug barf */ +#define msg_cspew(...) print(MSG_BARF, __VA_ARGS__) /* chip debug barf */ /* cli_classic.c */ int cli_classic(int argc, char *argv[]); |
