diff options
| author | Thomas White <taw@physics.org> | 2011-02-01 12:02:56 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:12 +0100 |
| commit | 7c93c89421b5be2b37426b51ef997760fcb2e08d (patch) | |
| tree | a2bf6ea9ec02c461de95ef16be2b0a3b894997b3 | |
| parent | 93af08221a99887a4fc8bfab4ded0d04d2ce4d19 (diff) | |
Don't use a common variable name inside the STATUS() and ERROR() macros
| -rw-r--r-- | src/utils.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/utils.h b/src/utils.h index 30ab27c8..e7223f88 100644 --- a/src/utils.h +++ b/src/utils.h @@ -223,20 +223,20 @@ extern ReflItemList *intersection_items(ReflItemList *i1, ReflItemList *i2); extern pthread_mutex_t stderr_lock; #define ERROR(...) { \ - int val = get_status_label(); \ + int error_print_val = get_status_label(); \ pthread_mutex_lock(&stderr_lock); \ - if ( val >= 0 ) { \ - fprintf(stderr, "%3i: ", val); \ + if ( error_print_val >= 0 ) { \ + fprintf(stderr, "%3i: ", error_print_val); \ } \ fprintf(stderr, __VA_ARGS__); \ pthread_mutex_unlock(&stderr_lock); \ } #define STATUS(...) { \ - int val = get_status_label(); \ + int status_print_val = get_status_label(); \ pthread_mutex_lock(&stderr_lock); \ - if ( val >= 0 ) { \ - fprintf(stderr, "%3i: ", val); \ + if ( status_print_val >= 0 ) { \ + fprintf(stderr, "%3i: ", status_print_val); \ } \ fprintf(stderr, __VA_ARGS__); \ pthread_mutex_unlock(&stderr_lock); \ |