hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed missing return values.

Browse Source
This commit is contained in:
Markus Makela
2015-07-11 19:02:01 +03:00
parent e03dcc07c3
commit 206f93e3ec
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
server/core/dcb.c
View File

@ -106,7 +106,7 @@ static inline bool dcb_write_parameter_check(DCB *dcb, GWBUF *queue);
static inline void dcb_write_fake_code(DCB *dcb); static inline void dcb_write_fake_code(DCB *dcb);
#endif #endif
static inline void dcb_write_when_already_queued(DCB *dcb, GWBUF *queue); 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 inline void dcb_write_tidy_up(DCB *dcb, bool below_water);
static int dcb_write_SSL_error_report (DCB *dcb, int ret); 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 false;
} }
} }
return true;
} }
/** /**
@ -1305,11 +1306,11 @@ dcb_write_when_already_queued(DCB *dcb, GWBUF *queue)
* @return 0 on failure, 1 on success * @return 0 on failure, 1 on success
*/ */
static void 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 (LOG_IS_ENABLED(LOGFILE_DEBUG))
{ {
if (errno == EPIPE) if (eno == EPIPE)
{ {
LOGIF(LD, (skygw_log_write( LOGIF(LD, (skygw_log_write(
LOGFILE_DEBUG, LOGFILE_DEBUG,
@ -1320,16 +1321,16 @@ dcb_log_write_failure(DCB *dcb, GWBUF *queue, int errno)
dcb, dcb,
STRDCBSTATE(dcb->state), STRDCBSTATE(dcb->state),
dcb->fd, dcb->fd,
errno, eno,
strerror(errno)))); strerror(eno))));
} }
} }
if (LOG_IS_ENABLED(LOGFILE_ERROR)) if (LOG_IS_ENABLED(LOGFILE_ERROR))
{ {
if (errno != EPIPE && if (eno != EPIPE &&
errno != EAGAIN && eno != EAGAIN &&
errno != EWOULDBLOCK) eno != EWOULDBLOCK)
{ {
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
@ -1339,8 +1340,8 @@ dcb_log_write_failure(DCB *dcb, GWBUF *queue, int errno)
dcb, dcb,
STRDCBSTATE(dcb->state), STRDCBSTATE(dcb->state),
dcb->fd, dcb->fd,
errno, eno,
strerror(errno)))); strerror(eno))));
} }
@ -1348,9 +1349,9 @@ dcb_log_write_failure(DCB *dcb, GWBUF *queue, int errno)
bool dolog = true; bool dolog = true;
if (errno != 0 && if (eno != 0 &&
errno != EAGAIN && eno != EAGAIN &&
errno != EWOULDBLOCK) eno != EWOULDBLOCK)
{ {
/** /**
* Do not log if writing COM_QUIT to backend failed. * 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.", "%lu [dcb_write] Writing to %s socket failed due %d, %s.",
pthread_self(), pthread_self(),
dcb_isclient(dcb) ? "client" : "backend server", dcb_isclient(dcb) ? "client" : "backend server",
errno, eno,
strerror(errno)))); strerror(eno))));
} }
} }
} }
@ -1567,6 +1568,7 @@ dcb_write_SSL_error_report (DCB *dcb, int ret)
} while((ssl_errno = ERR_get_error()) != 0); } while((ssl_errno = ERR_get_error()) != 0);
} }
} }
return SSL_ERROR_NONE;
} }
/** /**

4
server/modules/protocol/mysql_client.c
View File

@ -1467,9 +1467,7 @@ int gw_MySQLListener(
if (poll_add_dcb(listen_dcb) == -1) { if (poll_add_dcb(listen_dcb) == -1) {
fprintf(stderr, fprintf(stderr,
"\n* MaxScale encountered system limit while " "\n* MaxScale encountered system limit while "
"attempting to register on an epoll instance.\n\n", "attempting to register on an epoll instance.\n\n");
errno,
strerror(errno));
return 0; return 0;
} }
#if defined(FAKE_CODE) #if defined(FAKE_CODE)

2
server/modules/routing/binlog/blr_file.c
View File

@ -46,7 +46,7 @@
#include <blr.h> #include <blr.h>
#include <dcb.h> #include <dcb.h>
#include <spinlock.h> #include <spinlock.h>
#include <gwdirs.h>
#include <skygw_types.h> #include <skygw_types.h>
#include <skygw_utils.h> #include <skygw_utils.h>
#include <log_manager.h> #include <log_manager.h>