From 7c93c89421b5be2b37426b51ef997760fcb2e08d Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 1 Feb 2011 12:02:56 +0100 Subject: Don't use a common variable name inside the STATUS() and ERROR() macros --- src/utils.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') 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); \ -- cgit v1.2.3