Update to C99, s/__FUNCTION__/__func__/,

also don't use ANSI string concatenation.

2 files changed, 9 insertions, 9 deletions

diff --git a/sys/dev/ray/if_raydbg.h b/sys/dev/ray/if_raydbg.h
index 965a180..2ab5310 100644
--- a/sys/dev/ray/if_raydbg.h
+++ b/sys/dev/ray/if_raydbg.h
@@ -95,14 +95,14 @@
 
 #define RAY_DPRINTF(sc, mask, fmt, args...) do {if (RAY_DEBUG & (mask)) {\
     device_printf((sc)->dev, "%s(%d) " fmt "\n",			\
-    	__FUNCTION__ , __LINE__ , ##args);				\
+    	__func__ , __LINE__ , ##args);					\
 } } while (0)
 
 /* This macro assumes that common memory is mapped into kernel space */
 #define RAY_DHEX8(sc, mask, off, len, s) do { if (RAY_DEBUG & (mask)) {	\
     int i, j;								\
     device_printf((sc)->dev, "%s(%d) %s\n",				\
-    	__FUNCTION__ , __LINE__ , (s));					\
+    	__func__ , __LINE__ , (s));					\
     for (i = (off); i < (off)+(len); i += 8) {				\
 	    printf(".  0x%04x ", i);					\
 	    for (j = 0; j < 8; j++)					\
@@ -113,7 +113,7 @@
 
 #define RAY_DCOM(sc, mask, com, s) do { if (RAY_DEBUG & (mask)) {	\
     device_printf((sc)->dev, "%s(%d) %s com entry 0x%p\n",		\
-        __FUNCTION__ , __LINE__ , (s) , (com));				\
+        __func__ , __LINE__ , (s) , (com));				\
     printf(".  c_mesg %s\n", (com)->c_mesg);				\
     printf(".  c_flags 0x%b\n", (com)->c_flags, RAY_COM_FLAGS_PRINTFB);	\
     printf(".  c_retval 0x%x\n", (com)->c_retval);			\
@@ -134,13 +134,13 @@
 #if RAY_DEBUG
 #define RAY_RECERR(sc, fmt, args...) do {				\
     device_printf((sc)->dev, "%s(%d) " fmt "\n",			\
-	__FUNCTION__ , __LINE__ , ##args);				\
+	__func__ , __LINE__ , ##args);					\
 } while (0)
 #endif /* RAY_DEBUG */
 
 #if RAY_DEBUG & RAY_DBG_COM
 #define RAY_COM_CHECK(sc, com) do { if (RAY_DEBUG & RAY_DBG_COM) {	\
-    ray_com_ecf_check((sc), (com), __FUNCTION__ );			\
+    ray_com_ecf_check((sc), (com), __func__ );				\
 } } while (0)
 #endif /* RAY_DEBUG & RAY_DBG_COM */
 
diff --git a/sys/dev/ray/if_rayvar.h b/sys/dev/ray/if_rayvar.h
index a5a09b5..09430e3 100644
--- a/sys/dev/ray/if_rayvar.h
+++ b/sys/dev/ray/if_rayvar.h
@@ -237,12 +237,12 @@ static int mib_info[RAY_MIB_MAX+1][3] = RAY_MIB_INFO;
 
 #define RAY_PANIC(sc, fmt, args...) do {				\
     panic("ray%d: %s(%d) " fmt "\n", device_get_unit((sc)->dev),	\
-	__FUNCTION__ , __LINE__ , ##args);				\
+	__func__ , __LINE__ , ##args);					\
 } while (0)
 
 #define RAY_PRINTF(sc, fmt, args...) do {				\
     device_printf((sc)->dev, "%s(%d) " fmt "\n",			\
-        __FUNCTION__ , __LINE__ , ##args);				\
+        __func__ , __LINE__ , ##args);					\
 } while (0)
 
 #define RAY_COM_MALLOC(function, flags)	\
@@ -303,7 +303,7 @@ static int mib_info[RAY_MIB_MAX+1][3] = RAY_MIB_INFO;
     struct ifnet *ifp = &(sc)->arpcom.ac_if;				\
     if (ifp->if_flags & IFF_DEBUG) {					\
 	    device_printf((sc)->dev, "%s(%d) " fmt "\n",		\
-		__FUNCTION__ , __LINE__ , ##args);			\
+		__func__ , __LINE__ , ##args);				\
 } } while (0)
 #endif /* RAY_RECERR */
 
@@ -316,7 +316,7 @@ static int mib_info[RAY_MIB_MAX+1][3] = RAY_MIB_INFO;
 	if (ifp->if_flags & IFF_DEBUG) {				\
 	    device_printf((sc)->dev,					\
 	        "%s(%d) ECF command completed with status %s\n",	\
-		__FUNCTION__ , __LINE__ , ss[(status)]);		\
+		__func__ , __LINE__ , ss[(status)]);			\
 } } } while (0)
 #endif /* RAY_CCSERR */