[Compile Regression in 2.4.25-pre8][PATCH 39/42]

Kronos
2004-02-02T20:08:54Z

st5481_b.c:122: warning: concatenation of string literals with __FUNCTION__ is deprecated
[etc]
st5481_usb.c:134: warning: concatenation of string literals with __FUNCTION__ is deprecated
[etc]

__FUNCTION__ shouldn't be concatenated with other literals.

diff -Nru -X dontdiff linux-2.4-vanilla/drivers/isdn/hisax/st5481.h linux-2.4/drivers/isdn/hisax/st5481.h
--- linux-2.4-vanilla/drivers/isdn/hisax/st5481.h Fri Jun 13 16:51:34 2003
+++ linux-2.4/drivers/isdn/hisax/st5481.h Sat Jan 31 19:10:56 2004
@@ -219,13 +219,13 @@
#define L1_EVENT_COUNT (EV_TIMER3 + 1)

#define ERR(format, arg...) \
-printk(KERN_ERR __FILE__ ": " __FUNCTION__ ": " format "\n" , ## arg)
+printk(KERN_ERR __FILE__ ": %s: " format "\n" , __FUNCTION__ , ## arg)

#define WARN(format, arg...) \
-printk(KERN_WARNING __FILE__ ": " __FUNCTION__ ": " format "\n" , ## arg)
+printk(KERN_WARNING __FILE__ ": %s: " format "\n" , __FUNCTION__ , ## arg)

#define INFO(format, arg...) \
-printk(KERN_INFO __FILE__ ": " __FUNCTION__ ": " format "\n" , ## arg)
+printk(KERN_INFO __FILE__ ": %s: " format "\n" , __FUNCTION__ , ## arg)

#include "isdnhdlc.h"
#include "fsm.h"

--
Reply-To: kronos@kronoz.cjb.net
Home: http://kronoz.cjb.net
Do, or do not. There is no try.