lkml.org 
[lkml]   [2003]   [Aug]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH][resend] 12/13 2.4.22-rc2 fix __FUNCTION__ warnings net/irda [6/7]
Hi people,
this patch fix the warning: concatenation of string literals with __FUNCTION__ is deprecated

irnet.h | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)

--- linux-2.4.22-rc2/net/irda/irnet/irnet.h 2003-06-13 11:51:39.000000000 -0300
+++ linux-2.4.22-rc2-fix/net/irda/irnet/irnet.h 2003-08-21 00:08:28.000000000 -0300
@@ -322,29 +322,29 @@
* compiler will optimise away the if() in all cases.
*/
/* All error messages (will show up in the normal logs) */
-#define DERROR(dbg, args...) \
- {if(DEBUG_##dbg) \
- printk(KERN_INFO "irnet: " __FUNCTION__ "(): " args);}
+#define DERROR(dbg, format, args...) \
+ {if(DEBUG_##dbg) \
+ printk(KERN_INFO "irnet: %s(): " format, __FUNCTION__ , ##args);}

/* Normal debug message (will show up in /var/log/debug) */
-#define DEBUG(dbg, args...) \
- {if(DEBUG_##dbg) \
- printk(KERN_DEBUG "irnet: " __FUNCTION__ "(): " args);}
+#define DEBUG(dbg, format, args...) \
+ {if(DEBUG_##dbg) \
+ printk(KERN_DEBUG "irnet: %s(): " format, __FUNCTION__ , ##args);}

/* Entering a function (trace) */
-#define DENTER(dbg, args...) \
- {if(DEBUG_##dbg) \
- printk(KERN_DEBUG "irnet: ->" __FUNCTION__ args);}
+#define DENTER(dbg, format, args...) \
+ {if(DEBUG_##dbg) \
+ printk(KERN_DEBUG "irnet: -> %s" format, __FUNCTION__ , ##args);}

/* Entering and exiting a function in one go (trace) */
-#define DPASS(dbg, args...) \
- {if(DEBUG_##dbg) \
- printk(KERN_DEBUG "irnet: <>" __FUNCTION__ args);}
+#define DPASS(dbg, format, args...) \
+ {if(DEBUG_##dbg) \
+ printk(KERN_DEBUG "irnet: <>%s" format, __FUNCTION__ , ##args);}

/* Exiting a function (trace) */
-#define DEXIT(dbg, args...) \
- {if(DEBUG_##dbg) \
- printk(KERN_DEBUG "irnet: <-" __FUNCTION__ "()" args);}
+#define DEXIT(dbg, format, args...) \
+ {if(DEBUG_##dbg) \
+ printk(KERN_DEBUG "irnet: <-%s()" format, __FUNCTION__ , ##args);}

/* Exit a function with debug */
#define DRETURN(ret, dbg, args...) \
ciao
djgera


--
Gerardo Exequiel Pozzi ( djgera )
http://www.vmlinuz.com.ar http://www.djgera.com.ar
KeyID: 0x1B8C330D
Key fingerprint = 0CAA D5D4 CD85 4434 A219 76ED 39AB 221B 1B8C 330D
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:47    [W:0.022 / U:1.324 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site