Messages in this thread Patch in this message | | | From | Michael Buesch <> | Subject | [PATCH 2.4.22-pre5] cpia.c compile-warning fix | Date | Mon, 14 Jul 2003 21:08:42 +0200 |
| |
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
Hi.
this patch fixes these compiletime warnings: cpia.c:1912: Warnung: concatenation of string literals with __FUNCTION__ is deprecated cpia.c:1918: Warnung: concatenation of string literals with __FUNCTION__ is deprecated cpia.c:1924: Warnung: concatenation of string literals with __FUNCTION__ is deprecated cpia.c:1930: Warnung: concatenation of string literals with __FUNCTION__ is deprecated cpia.c:1949: Warnung: concatenation of string literals with __FUNCTION__ is deprecated cpia.c:1956: Warnung: concatenation of string literals with __FUNCTION__ is deprecated
- --- drivers/media/video/cpia.h.orig 2003-07-14 20:31:30.000000000 +0200 +++ drivers/media/video/cpia.h 2003-07-14 21:03:49.000000000 +0200 @@ -393,12 +393,14 @@ /* ErrorCode */ #define ERROR_FLICKER_BELOW_MIN_EXP 0x01 /*flicker exposure got below minimum exposure */ - -#define ALOG(lineno,fmt,args...) printk(fmt,lineno,##args) - -#define LOG(fmt,args...) ALOG((__LINE__),KERN_INFO __FILE__":"__FUNCTION__"(%d):"fmt,##args) +#define ALOG(function,lineno,fmt,args...) printk(fmt, function, lineno, ##args) +#define LOG(fmt,args...) ALOG((__FUNCTION__), (__LINE__), \ + KERN_INFO __FILE__":%s(%d):"fmt, ##args) #ifdef _CPIA_DEBUG_ - -#define ADBG(lineno,fmt,args...) printk(fmt, jiffies, lineno, ##args) - -#define DBG(fmt,args...) ADBG((__LINE__),KERN_DEBUG __FILE__"(%ld):"__FUNCTION__"(%d):"fmt,##args) +#define ADBG(function,lineno,fmt,args...) printk(fmt, jiffies, function, lineno, ##args) +#define DBG(fmt,args...) ADBG((__FUNCTION__), (__LINE__), \ + KERN_DEBUG __FILE__"(%ld):%s(%d):"fmt, ##args) #else #define DBG(fmn,args...) do {} while(0) #endif - -- Regards Michael Buesch http://www.8ung.at/tuxsoft 21:03:56 up 2:14, 3 users, load average: 1.10, 1.11, 1.23
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD4DBQE/Ev+6oxoigfggmSgRAqyZAJjHwQmFBfWP9eJuOyUTN3fU/qSYAJ9nFh0I 24mG+0/qdSLulRw159uMqw== =IJ9d -----END PGP SIGNATURE-----
- 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/
| |