From 206f93e3ec6fd6e970bc5b1bf003dba465033d88 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Sat, 11 Jul 2015 19:02:01 +0300
Subject: [PATCH] Fixed missing return values.

---
 server/core/dcb.c                        | 32 +++++++++++++-----------
 server/modules/protocol/mysql_client.c   |  4 +--
 server/modules/routing/binlog/blr_file.c |  2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/server/core/dcb.c b/server/core/dcb.c
index 36c49a009..3b7744830 100644
--- a/server/core/dcb.c
+++ b/server/core/dcb.c
@@ -106,7 +106,7 @@ static inline bool dcb_write_parameter_check(DCB *dcb, GWBUF *queue);
 static inline void dcb_write_fake_code(DCB *dcb);
 #endif
 static inline void dcb_write_when_already_queued(DCB *dcb, GWBUF *queue);
-static void dcb_log_write_failure(DCB *dcb, GWBUF *queue, int errno);
+static void dcb_log_write_failure(DCB *dcb, GWBUF *queue, int eno);
 static inline void dcb_write_tidy_up(DCB *dcb, bool below_water);
 static int dcb_write_SSL_error_report (DCB *dcb, int ret);
 
@@ -1263,6 +1263,7 @@ dcb_write_parameter_check(DCB *dcb, GWBUF *queue)
             return false;
         }
     }
+    return true;
 }
 
 /**
@@ -1305,11 +1306,11 @@ dcb_write_when_already_queued(DCB *dcb, GWBUF *queue)
  * @return 0 on failure, 1 on success
  */
 static void
-dcb_log_write_failure(DCB *dcb, GWBUF *queue, int errno)
+dcb_log_write_failure(DCB *dcb, GWBUF *queue, int eno)
 {
     if (LOG_IS_ENABLED(LOGFILE_DEBUG))
     {
-        if (errno == EPIPE)
+        if (eno == EPIPE)
         {
             LOGIF(LD, (skygw_log_write(
                 LOGFILE_DEBUG,
@@ -1320,16 +1321,16 @@ dcb_log_write_failure(DCB *dcb, GWBUF *queue, int errno)
                 dcb,
                 STRDCBSTATE(dcb->state),
                 dcb->fd,
-                errno,
-                strerror(errno))));
+                eno,
+                strerror(eno))));
         }
     }
 
     if (LOG_IS_ENABLED(LOGFILE_ERROR))
     {
-        if (errno != EPIPE &&
-            errno != EAGAIN &&
-            errno != EWOULDBLOCK)
+        if (eno != EPIPE &&
+            eno != EAGAIN &&
+            eno != EWOULDBLOCK)
         {
             LOGIF(LE, (skygw_log_write_flush(
                 LOGFILE_ERROR,
@@ -1339,8 +1340,8 @@ dcb_log_write_failure(DCB *dcb, GWBUF *queue, int errno)
                 dcb,
                 STRDCBSTATE(dcb->state),
                 dcb->fd,
-                errno,
-                strerror(errno))));
+                eno,
+                strerror(eno))));
 
         }
 
@@ -1348,9 +1349,9 @@ dcb_log_write_failure(DCB *dcb, GWBUF *queue, int errno)
                 
     bool dolog = true;
 
-    if (errno != 0           &&
-        errno != EAGAIN      &&
-        errno != EWOULDBLOCK)
+    if (eno != 0           &&
+        eno != EAGAIN      &&
+        eno != EWOULDBLOCK)
     {
         /**
          * Do not log if writing COM_QUIT to backend failed.
@@ -1371,8 +1372,8 @@ dcb_log_write_failure(DCB *dcb, GWBUF *queue, int errno)
                 "%lu [dcb_write] Writing to %s socket failed due %d, %s.",
                 pthread_self(),
                 dcb_isclient(dcb) ? "client" : "backend server",
-                errno,
-                strerror(errno))));
+                eno,
+                strerror(eno))));
         }
     }
 }
@@ -1567,6 +1568,7 @@ dcb_write_SSL_error_report (DCB *dcb, int ret)
             } while((ssl_errno = ERR_get_error()) != 0);
         }
     }
+    return SSL_ERROR_NONE;
 }
 
 /**
diff --git a/server/modules/protocol/mysql_client.c b/server/modules/protocol/mysql_client.c
index 0639c8676..8fcf13ad2 100644
--- a/server/modules/protocol/mysql_client.c
+++ b/server/modules/protocol/mysql_client.c
@@ -1467,9 +1467,7 @@ int gw_MySQLListener(
         if (poll_add_dcb(listen_dcb) == -1) {
             fprintf(stderr,
                     "\n* MaxScale encountered system limit while "
-                    "attempting to register on an epoll instance.\n\n",
-                    errno,
-                    strerror(errno));
+                    "attempting to register on an epoll instance.\n\n");
 		return 0;
         }
 #if defined(FAKE_CODE)
diff --git a/server/modules/routing/binlog/blr_file.c b/server/modules/routing/binlog/blr_file.c
index 3196a8cf4..d9a62f00e 100644
--- a/server/modules/routing/binlog/blr_file.c
+++ b/server/modules/routing/binlog/blr_file.c
@@ -46,7 +46,7 @@
 #include <blr.h>
 #include <dcb.h>
 #include <spinlock.h>
-
+#include <gwdirs.h>
 #include <skygw_types.h>
 #include <skygw_utils.h>
 #include <log_manager.h>