From 43ed77b52b8837c1d8aa8fb74c6c3b0837eb4b53 Mon Sep 17 00:00:00 2001
From: Mark Riddoch <Mark.Riddoch@skysql.com>
Date: Wed, 19 Nov 2014 16:43:21 +0000
Subject: [PATCH] Bug 515 Conditional arguemnt to gw_write

---
 server/core/dcb.c    | 31 ++++++++++++-------------------
 server/include/dcb.h |  8 +-------
 server/include/gw.h  |  8 +-------
 3 files changed, 14 insertions(+), 33 deletions(-)

diff --git a/server/core/dcb.c b/server/core/dcb.c
index 6e667b00a..4d5942a17 100644
--- a/server/core/dcb.c
+++ b/server/core/dcb.c
@@ -954,11 +954,7 @@ int	below_water;
 #endif /* FAKE_CODE */
 			qlen = GWBUF_LENGTH(queue);
 			GW_NOINTR_CALL(
-                                w = gw_write(
-#if defined(SS_DEBUG)
-                                        dcb,
-#endif
-                                        dcb->fd, GWBUF_DATA(queue), qlen);
+                                w = gw_write(dcb, GWBUF_DATA(queue), qlen);
                                 dcb->stats.n_writes++;
                                 );
                         
@@ -1110,13 +1106,7 @@ int	above_water;
 		while (dcb->writeq != NULL)
 		{
 			len = GWBUF_LENGTH(dcb->writeq);
-			GW_NOINTR_CALL(w = gw_write(
-#if defined(SS_DEBUG)
-                               dcb,
-#endif
-                               dcb->fd,
-                               GWBUF_DATA(dcb->writeq),
-                               len););
+			GW_NOINTR_CALL(w = gw_write(dcb, GWBUF_DATA(dcb->writeq), len););
 			saved_errno = errno;
                         errno = 0;
                         
@@ -1759,15 +1749,18 @@ static bool dcb_set_state_nomutex(
         return succp;
 }
 
-int gw_write(
-#if defined(SS_DEBUG)
-        DCB* dcb,
-#endif
-        int fd,
-        const void* buf,
-        size_t nbytes)
+/**
+ * Write data to a DCB
+ *
+ * @param dcb		The DCB to write buffer
+ * @param buf		Buffer to write
+ * @param nbytes	Number of bytes to write
+ */
+int
+gw_write(DCB *dcb, const void *buf, size_t nbytes)
 {
         int w;
+	int fd = dcb->fd;
 #if defined(FAKE_CODE)                
         if (dcb_fake_write_errno[fd] != 0) {
                 ss_dassert(dcb_fake_write_ev[fd] != 0);
diff --git a/server/include/dcb.h b/server/include/dcb.h
index d9cdeb05a..57c4b0358 100644
--- a/server/include/dcb.h
+++ b/server/include/dcb.h
@@ -290,13 +290,7 @@ int           fail_accept_errno;
 #define	DCB_POLL_BUSY(x)		((x)->evq.next != NULL)
 
 DCB             *dcb_get_zombies(void);
-int             gw_write(
-#if defined(SS_DEBUG)
-        DCB*        dcb,
-#endif
-        int         fd, 
-        const void* buf, 
-        size_t      nbytes);
+int             gw_write(DCB *, const void *, size_t);
 int             dcb_write(DCB *, GWBUF *);
 DCB             *dcb_alloc(dcb_role_t);
 void            dcb_free(DCB *);
diff --git a/server/include/gw.h b/server/include/gw.h
index 23d949ed0..9c8507210 100644
--- a/server/include/gw.h
+++ b/server/include/gw.h
@@ -61,13 +61,7 @@ int  do_read_dcb(DCB *dcb);
 int  do_read_10(DCB *dcb, uint8_t *buffer);
 int  MySQLWrite(DCB *dcb, GWBUF *queue);
 int  setnonblocking(int fd);
-int  gw_write(
-#if defined(SS_DEBUG)
-        DCB*        dcb,
-#endif
-        int         fd, 
-        const void* buf, 
-        size_t      nbytes);
+int  gw_write(DCB *dcb, const void *buf, size_t nbytes);
 int  gw_getsockerrno(int fd);
 int  parse_bindconfig(char *, unsigned short, struct sockaddr_in *);
 int setipaddress(struct in_addr *, char *);