diff options
| author | Pali Rohár <pali.rohar@gmail.com> | 2012-08-10 12:01:14 +0200 |
|---|---|---|
| committer | Pali Rohár <pali.rohar@gmail.com> | 2012-08-10 12:01:14 +0200 |
| commit | ad68e324c61b708dfd903f2c5fda79f40b87b8bf (patch) | |
| tree | e11e92e39ea5c9244be69f5f66d93339719873ed /src/global.h | |
| parent | 34b55a222ef1ce3ecc18df12a96cd7eea5fffd60 (diff) | |
| download | 0xFFFF-ad68e324c61b708dfd903f2c5fda79f40b87b8bf.tar.bz2 | |
Fix ERROR macros
Diffstat (limited to 'src/global.h')
| -rw-r--r-- | src/global.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/global.h b/src/global.h index ab7247a..6e4e866 100644 --- a/src/global.h +++ b/src/global.h @@ -10,11 +10,14 @@ extern int simulate; extern int noverify; extern int verbose; -#define VERBOSE(format, ...) do { if ( verbose ) { fprintf(stderr, format, ##__VA_ARGS__); } } while (0) -#define ERROR(errno, format, ...) do { fprintf(stderr, "Error: "); fprintf(stderr, format, ##__VA_ARGS__); if ( errno ) fprintf(stderr, ": %s\n", strerror(errno)); else fprintf(stderr, "\n"); } while (0) -#define WARNING(format, ...) do { fprintf(stderr, "Warning: "); fprintf(stderr, format, ##__VA_ARGS__); fprintf(stderr, "\n"); } while (0) +#define VERBOSE(...) do { if ( verbose ) { fprintf(stderr, __VA_ARGS__); } } while (0) +#define WARNING(...) do { fprintf(stderr, "Warning: "); fprintf(stderr, __VA_ARGS__); fprintf(stderr, "\n"); } while (0) +#define ERROR_INFO_STR(str, ...) do { if ( str[0] ) fprintf(stderr, "Error: %s: ", str); else fprintf(stderr, "Error: "); fprintf(stderr, __VA_ARGS__); fprintf(stderr, "\n"); } while (0) +#define ERROR_STR(str, ...) do { errno = 0; ERROR_INFO_STR(str, __VA_ARGS__); } while (0) +#define ERROR_INFO(...) do { ERROR_INFO_STR("", __VA_ARGS__); } while (0) +#define ERROR(...) do { ERROR_STR("", __VA_ARGS__); } while (0) -#define ALLOC_ERROR() do { ERROR(0, "Cannot allocate memory"); } while (0) +#define ALLOC_ERROR() do { ERROR("Cannot allocate memory"); } while (0) #define ALLOC_ERROR_RETURN(...) do { ALLOC_ERROR(); return __VA_ARGS__; } while (0) #endif |