From 6bbe5558adeead2970b5090782466e87f8801f53 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Mon, 14 Jun 2010 10:03:34 +0300 Subject: ubi-tests: rename err_msg to errmsg For consistency with ubi-utils. Signed-off-by: Artem Bityutskiy --- tests/ubi-tests/common.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'tests/ubi-tests/common.h') diff --git a/tests/ubi-tests/common.h b/tests/ubi-tests/common.h index faa2865..3821098 100644 --- a/tests/ubi-tests/common.h +++ b/tests/ubi-tests/common.h @@ -35,8 +35,8 @@ extern "C" { #define min(a, b) ((a) < (b) ? (a) : (b)) -#define err_msg(fmt, ...) \ - __err_msg(TESTNAME, __FUNCTION__, __LINE__, fmt, ##__VA_ARGS__) +#define errmsg(fmt, ...) \ + __errmsg(TESTNAME, __FUNCTION__, __LINE__, fmt, ##__VA_ARGS__) #define failed(name) \ __failed(TESTNAME, __FUNCTION__, __LINE__, name) @@ -59,14 +59,14 @@ extern "C" { int __ret; \ \ if (!ret) { \ - err_msg("%s() returned success but should have failed", func); \ - err_msg(fmt, ##__VA_ARGS__); \ + errmsg("%s() returned success but should have failed", func); \ + errmsg(fmt, ##__VA_ARGS__); \ __ret = -1; \ } \ if (errno != (error)) { \ - err_msg("%s failed with error %d (%s), expected %d (%s)", \ - func, errno, strerror(errno), error, strerror(error)); \ - err_msg(fmt, ##__VA_ARGS__); \ + errmsg("%s failed with error %d (%s), expected %d (%s)", \ + func, errno, strerror(errno), error, strerror(error)); \ + errmsg(fmt, ##__VA_ARGS__); \ __ret = -1; \ } \ __ret = 0; \ @@ -80,8 +80,8 @@ extern "C" { (s)/5-3, (s)/5-2, (s)/5-1, (s)/5+1, (s)/5+2, (s)/5+3, (s)-17, (s)-9, \ (s)-8, (s)-6, (s)-4, (s)-1, (s)}; -extern void __err_msg(const char *test, const char *func, int line, - const char *fmt, ...); +extern void __errmsg(const char *test, const char *func, int line, + const char *fmt, ...); void __failed(const char *test, const char *func, int line, const char *failed); int __initial_check(const char *test, int argc, char * const argv[]); -- cgit v1.2.3