Author: trasz
Date: Tue Mar 25 18:30:57 2014
New Revision: 263740
URL: http://svnweb.freebsd.org/changeset/base/263740
Log:
Use a less unusual syntax in debug printfs.
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/cam/ctl/ctl_frontend_iscsi.c
head/sys/dev/iscsi/icl.c
head/sys/dev/iscsi/iscsi.c
Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c
==============================================================================
--- head/sys/cam/ctl/ctl_frontend_iscsi.c Tue Mar 25 15:35:33 2014
(r263739)
+++ head/sys/cam/ctl/ctl_frontend_iscsi.c Tue Mar 25 18:30:57 2014
(r263740)
@@ -98,29 +98,38 @@ SYSCTL_INT(_kern_cam_ctl_iscsi, OID_AUTO
&maxcmdsn_delta, 256, "Number of commands the initiator can send "
"without confirmation");
-#define CFISCSI_DEBUG(X, ...) \
- if (debug > 1) { \
- printf("%s: " X "\n", __func__, ## __VA_ARGS__);\
+#define CFISCSI_DEBUG(X, ...)
\
+ do { \
+ if (debug > 1) { \
+ printf("%s: " X "\n", \
+ __func__, ## __VA_ARGS__); \
+ } \
} while (0)
-#define CFISCSI_WARN(X, ...) \
- if (debug > 0) { \
- printf("WARNING: %s: " X "\n", \
- __func__, ## __VA_ARGS__); \
+#define CFISCSI_WARN(X, ...)
\
+ do { \
+ if (debug > 0) { \
+ printf("WARNING: %s: " X "\n", \
+ __func__, ## __VA_ARGS__); \
+ } \
} while (0)
-#define CFISCSI_SESSION_DEBUG(S, X, ...) \
- if (debug > 1) { \
- printf("%s: %s (%s): " X "\n", \
- __func__, S->cs_initiator_addr, \
- S->cs_initiator_name, ## __VA_ARGS__); \
+#define CFISCSI_SESSION_DEBUG(S, X, ...)
\
+ do { \
+ if (debug > 1) { \
+ printf("%s: %s (%s): " X "\n", \
+ __func__, S->cs_initiator_addr, \
+ S->cs_initiator_name, ## __VA_ARGS__); \
+ } \
} while (0)
-#define CFISCSI_SESSION_WARN(S, X, ...) \
- if (debug > 0) { \
- printf("WARNING: %s (%s): " X "\n", \
- S->cs_initiator_addr, \
- S->cs_initiator_name, ## __VA_ARGS__); \
+#define CFISCSI_SESSION_WARN(S, X, ...)
\
+ do { \
+ if (debug > 0) { \
+ printf("WARNING: %s (%s): " X "\n", \
+ S->cs_initiator_addr, \
+ S->cs_initiator_name, ## __VA_ARGS__); \
+ } \
} while (0)
#define CFISCSI_SESSION_LOCK(X) mtx_lock(&X->cs_lock)
Modified: head/sys/dev/iscsi/icl.c
==============================================================================
--- head/sys/dev/iscsi/icl.c Tue Mar 25 15:35:33 2014 (r263739)
+++ head/sys/dev/iscsi/icl.c Tue Mar 25 18:30:57 2014 (r263740)
@@ -74,15 +74,18 @@ static uma_zone_t icl_pdu_zone;
static volatile u_int icl_ncons;
-#define ICL_DEBUG(X, ...) \
- if (debug > 1) { \
- printf("%s: " X "\n", __func__, ## __VA_ARGS__);\
+#define ICL_DEBUG(X, ...)
\
+ do { \
+ if (debug > 1) \
+ printf("%s: " X "\n", __func__, ## __VA_ARGS__);\
} while (0)
-#define ICL_WARN(X, ...) \
- if (debug > 0) { \
- printf("WARNING: %s: " X "\n", \
- __func__, ## __VA_ARGS__); \
+#define ICL_WARN(X, ...)
\
+ do { \
+ if (debug > 0) { \
+ printf("WARNING: %s: " X "\n", \
+ __func__, ## __VA_ARGS__); \
+ } \
} while (0)
#define ICL_CONN_LOCK(X) mtx_lock(&X->ic_lock)
Modified: head/sys/dev/iscsi/iscsi.c
==============================================================================
--- head/sys/dev/iscsi/iscsi.c Tue Mar 25 15:35:33 2014 (r263739)
+++ head/sys/dev/iscsi/iscsi.c Tue Mar 25 18:30:57 2014 (r263740)
@@ -99,29 +99,36 @@ static uma_zone_t iscsi_outstanding_zone
#define CONN_SESSION(X) ((struct iscsi_session *)X->ic_prv0)
#define PDU_SESSION(X) (CONN_SESSION(X->ip_conn))
-#define ISCSI_DEBUG(X, ...) \
- if (debug > 1) { \
- printf("%s: " X "\n", __func__, ## __VA_ARGS__);\
+#define ISCSI_DEBUG(X, ...)
\
+ do { \
+ if (debug > 1) \
+ printf("%s: " X "\n", __func__, ## __VA_ARGS__);\
} while (0)
-#define ISCSI_WARN(X, ...) \
- if (debug > 0) { \
- printf("WARNING: %s: " X "\n", \
- __func__, ## __VA_ARGS__); \
+#define ISCSI_WARN(X, ...)
\
+ do { \
+ if (debug > 0) { \
+ printf("WARNING: %s: " X "\n", \
+ __func__, ## __VA_ARGS__); \
+ } \
} while (0)
-#define ISCSI_SESSION_DEBUG(S, X, ...) \
- if (debug > 1) { \
- printf("%s: %s (%s): " X "\n", \
- __func__, S->is_conf.isc_target_addr, \
- S->is_conf.isc_target, ## __VA_ARGS__); \
+#define ISCSI_SESSION_DEBUG(S, X, ...)
\
+ do { \
+ if (debug > 1) { \
+ printf("%s: %s (%s): " X "\n", \
+ __func__, S->is_conf.isc_target_addr, \
+ S->is_conf.isc_target, ## __VA_ARGS__); \
+ } \
} while (0)
-#define ISCSI_SESSION_WARN(S, X, ...) \
- if (debug > 0) { \
- printf("WARNING: %s (%s): " X "\n", \
- S->is_conf.isc_target_addr, \
- S->is_conf.isc_target, ## __VA_ARGS__); \
+#define ISCSI_SESSION_WARN(S, X, ...)
\
+ do { \
+ if (debug > 0) { \
+ printf("WARNING: %s (%s): " X "\n", \
+ S->is_conf.isc_target_addr, \
+ S->is_conf.isc_target, ## __VA_ARGS__); \
+ } \
} while (0)
#define ISCSI_SESSION_LOCK(X) mtx_lock(&X->is_lock)
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
