From 7f9fafbbf8a2c3d7a4b9aab56d63d9ee6f4bed82 Mon Sep 17 00:00:00 2001 From: marta Date: Thu, 7 Jan 2010 12:32:07 +0000 Subject: [PATCH] Reverted the changes to the log() function, deleting the void* cast. The problem was related to a conflict on variable names. --- dummynet2/missing.h | 4 ++-- dummynet2/radix.c | 9 ++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dummynet2/missing.h b/dummynet2/missing.h index 09ea13a..9bc11b5 100644 --- a/dummynet2/missing.h +++ b/dummynet2/missing.h @@ -24,7 +24,7 @@ */ /* - * $Id: missing.h 4666 2010-01-04 12:55:32Z luigi $ + * $Id: missing.h 4696 2010-01-07 12:37:09Z marta $ * * Header for kernel variables and functions that are not available in * userland. @@ -160,7 +160,7 @@ struct malloc_type { #define LOG_ERR 0x100 #define LOG_INFO 0x200 #define log(_level, fmt, arg...) do { \ - int __unused x=_level;printk(KERN_ERR fmt, ##arg); } while (0) + int __unused _qwerty=_level; printk(KERN_ERR fmt, ##arg); } while (0) /* * gettimeofday would be in sys/time.h but it is not diff --git a/dummynet2/radix.c b/dummynet2/radix.c index 6e256d3..7c8c4bf 100644 --- a/dummynet2/radix.c +++ b/dummynet2/radix.c @@ -934,13 +934,8 @@ on1: MKFree(m); m = mm; } - if (m) { - /* these two variables are used to avoid a possible - compiler bug while using a macro with variable arguments */ - void *log_m = m; - void *log_x = x; - log(LOG_ERR, "rn_delete: Orphaned Mask %p at %p\n", log_m, log_x); - } + if (m) + log(LOG_ERR, "rn_delete: Orphaned Mask %p at %p\n", m, x); } } /* -- 2.43.0