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

Remove dependency on skygw_utils.h

Browse Source 
- STRERROR_BUFLEN moved to cdefs.h and renamed to MXS_STRERROR_BUFLEN.
  Better would be to provide a 'const char* mxs_strerror(int errno)'
  that would have a thread specific buffer for the error message.
- MIN and MAX also moved to defs.h as MXS_MIN and MXS_MAX.
- Now only mlist.h of the headers depend upon skygw_utils.h.
This commit is contained in:
Johan Wikman 2016-10-14 15:38:16 +03:00
parent bff2cfb7e5
commit 03dbc6df80
51 changed files with 215 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
avro/maxavro_record.c
View File

@ -11,8 +11,8 @@
* Public License.
*/
#include <maxscale/cdefs.h>
#include "maxavro.h"
#include <maxscale/skygw_utils.h>
#include <string.h>
#include <maxscale/debug.h>
#include <maxscale/log_manager.h>
@ -324,7 +324,7 @@ GWBUF* maxavro_record_read_binary(MAXAVRO_FILE *file)
{
if (ferror(file->file))
{
char err[STRERROR_BUFLEN];
char err[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to read %ld bytes: %d, %s", data_size, errno,
strerror_r(errno, err, sizeof(err)));
file->last_error = MAXAVRO_ERR_IO;

38
include/maxscale/cdefs.h
View File

@ -35,4 +35,42 @@
# define MXS_END_DECLS
#endif
/**
* Define intended for use with strerror.
*
* char errbuf[MXS_STRERROR_BUFLEN];
* strerror_r(errno, errbuf, sizeof(errbuf))
*/
#define MXS_STRERROR_BUFLEN 512
/**
* Returns the smaller of two items.
*
* @param a A value.
* @param b Another value.
*
* @return a if a is smaller than b, b otherwise.
*
* @note This a macro, so the arguments will be evaluated more than once.
*/
#define MXS_MIN(a,b) ((a)<(b) ? (a) : (b))
/**
* Returns the larger of two items.
*
* @param a A value.
* @param b Another value.
*
* @return a if a is larger than b, b otherwise.
*
* @note This a macro, so the arguments will be evaluated more than once.
*/
#define MXS_MAX(a,b) ((a)>(b) ? (a) : (b))
/**
* COMMON INCLUDE FILES
*/
#include <stdbool.h>
#include <stddef.h>
#endif

1
include/maxscale/config.h
View File

@ -31,7 +31,6 @@
*/
#include <maxscale/cdefs.h>
#include <maxscale/skygw_utils.h>
#include <sys/utsname.h>
#include <stdint.h>
#include <openssl/sha.h>

1
include/maxscale/dcb.h
View File

@ -56,7 +56,6 @@
#include <maxscale/gw_ssl.h>
#include <maxscale/modinfo.h>
#include <maxscale/gwbitmask.h>
#include <maxscale/skygw_utils.h>
#include <netinet/in.h>
MXS_BEGIN_DECLS

1
include/maxscale/externcmd.h
View File

@ -18,7 +18,6 @@
#include <unistd.h>
#include <string.h>
#include <errno.h>
#include <maxscale/skygw_utils.h>
#include <maxscale/log_manager.h>
#include <maxscale/pcre2.h>

1
include/maxscale/gwdirs.h.in
View File

@ -20,7 +20,6 @@
#include <maxscale/cdefs.h>
#include <stdlib.h>
#include <string.h>
#include <maxscale/skygw_utils.h>
MXS_BEGIN_DECLS

7
include/maxscale/log_manager.h
View File

@ -21,13 +21,6 @@
MXS_BEGIN_DECLS
/*
* We need a common.h file that is included by every component.
*/
#if !defined(STRERROR_BUFLEN)
#define STRERROR_BUFLEN 512
#endif
/**
* If MXS_MODULE_NAME is defined before log_manager.h is included, then all
* logged messages will be prefixed with that string enclosed in square brackets.

1
include/maxscale/query_classifier.h
View File

@ -15,7 +15,6 @@
*/
#include <maxscale/cdefs.h>
#include <maxscale/skygw_utils.h>
#include <maxscale/buffer.h>
MXS_BEGIN_DECLS

1
include/maxscale/session.h
View File

@ -42,7 +42,6 @@
#include <maxscale/listmanager.h>
#include <maxscale/spinlock.h>
#include <maxscale/resultset.h>
#include <maxscale/skygw_utils.h>
#include <maxscale/log_manager.h>
MXS_BEGIN_DECLS

13
include/maxscale/skygw_utils.h
View File

@ -18,19 +18,6 @@
MXS_BEGIN_DECLS
/*
* We need a common.h file that is included by every component.
*/
#if !defined(STRERROR_BUFLEN)
#define STRERROR_BUFLEN 512
#endif
#ifndef MIN
#define MIN(a,b) (a<b ? a : b)
#endif
#ifndef MAX
#define MAX(a,b) (a>b ? a : b)
#endif
#define FSYNCLIMIT 10
#include <maxscale/debug.h>

2
include/maxscale/slist.h
View File

@ -15,7 +15,7 @@
*/
#include <maxscale/cdefs.h>
#include <maxscale/skygw_utils.h>
#include <maxscale/debug.h>
MXS_BEGIN_DECLS

1
query_classifier/test/canonical_tests/canonizer.c
View File

@ -18,6 +18,7 @@
#include <maxscale/query_classifier.h>
#include <maxscale/buffer.h>
#include <maxscale/gwdirs.h>
#include <maxscale/skygw_utils.h>
int main(int argc, char** argv)
{

4
server/core/buffer.c
View File

@ -121,7 +121,7 @@ gwbuf_alloc(unsigned int size)
retblock:
if (rval == NULL)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Memory allocation failed due to %s.",
strerror_r(errno, errbuf, sizeof(errbuf)));
}
@ -964,7 +964,7 @@ size_t gwbuf_copy_data(GWBUF *buffer, size_t offset, size_t bytes, uint8_t* dest
if (buffer)
{
bytes_left = MIN(GWBUF_LENGTH(buffer), bytes);
bytes_left = MXS_MIN(GWBUF_LENGTH(buffer), bytes);
ptr = (uint8_t*) GWBUF_DATA(buffer);
}
}

4
server/core/config.c
View File

@ -233,7 +233,7 @@ char* config_clean_string_list(char* str)
PCRE2_ZERO_TERMINATED, 0, &re_err, &err_offset, NULL)) == NULL ||
(data = pcre2_match_data_create_from_pattern(re, NULL)) == NULL)
{
PCRE2_UCHAR errbuf[STRERROR_BUFLEN];
PCRE2_UCHAR errbuf[MXS_STRERROR_BUFLEN];
pcre2_get_error_message(re_err, errbuf, sizeof(errbuf));
MXS_ERROR("[%s] Regular expression compilation failed at %d: %s",
__FUNCTION__, (int)err_offset, errbuf);
@ -2145,7 +2145,7 @@ bool config_has_duplicate_sections(const char* config)
}
else
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to open file '%s': %s", config,
strerror_r(errno, errbuf, sizeof(errbuf)));
rval = true;

48
server/core/dcb.c
View File

@ -672,7 +672,7 @@ dcb_process_victim_queue(DCB *listofdcb)
{
int eno = errno;
errno = 0;
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("%lu [dcb_process_victim_queue] Error : Failed to close "
"socket %d on dcb %p due error %d, %s.",
pthread_self(),
@ -1003,7 +1003,7 @@ dcb_bytes_readable(DCB *dcb)
if (-1 == ioctl(dcb->fd, FIONREAD, &bytesavailable))
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
/* <editor-fold defaultstate="collapsed" desc=" Error Logging "> */
MXS_ERROR("%lu [dcb_read] Error : ioctl FIONREAD for dcb %p in "
"state %s fd %d failed due error %d, %s.",
@ -1069,10 +1069,10 @@ dcb_basic_read(DCB *dcb, int bytesavailable, int maxbytes, int nreadtotal, int *
{
GWBUF *buffer;
int bufsize = MIN(bytesavailable, MAX_BUFFER_SIZE);
int bufsize = MXS_MIN(bytesavailable, MAX_BUFFER_SIZE);
if (maxbytes)
{
bufsize = MIN(bufsize, maxbytes - nreadtotal);
bufsize = MXS_MIN(bufsize, maxbytes - nreadtotal);
}
if ((buffer = gwbuf_alloc(bufsize)) == NULL)
@ -1081,7 +1081,7 @@ dcb_basic_read(DCB *dcb, int bytesavailable, int maxbytes, int nreadtotal, int *
* This is a fatal error which should cause shutdown.
* Todo shutdown if memory allocation fails.
*/
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
/* <editor-fold defaultstate="collapsed" desc=" Error Logging "> */
MXS_ERROR("%lu [dcb_read] Error : Failed to allocate read buffer "
"for dcb %p fd %d, due %d, %s.",
@ -1102,7 +1102,7 @@ dcb_basic_read(DCB *dcb, int bytesavailable, int maxbytes, int nreadtotal, int *
{
if (errno != 0 && errno != EAGAIN && errno != EWOULDBLOCK)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
/* <editor-fold defaultstate="collapsed" desc=" Error Logging "> */
MXS_ERROR("%lu [dcb_read] Error : Read failed, dcb %p in state "
"%s fd %d, due %d, %s.",
@ -1211,7 +1211,7 @@ dcb_basic_read_SSL(DCB *dcb, int *nsingleread)
* This is a fatal error which should cause shutdown.
* Todo shutdown if memory allocation fails.
*/
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
/* <editor-fold defaultstate="collapsed" desc=" Error Logging "> */
MXS_ERROR("%lu [dcb_read] Error : Failed to allocate read buffer "
"for dcb %p fd %d, due %d, %s.",
@ -1297,7 +1297,7 @@ dcb_basic_read_SSL(DCB *dcb, int *nsingleread)
static int
dcb_log_errors_SSL (DCB *dcb, const char *called_by, int ret)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
unsigned long ssl_errno;
ssl_errno = ERR_get_error();
@ -1327,7 +1327,7 @@ dcb_log_errors_SSL (DCB *dcb, const char *called_by, int ret)
{
while (ssl_errno != 0)
{
ERR_error_string_n(ssl_errno, errbuf, STRERROR_BUFLEN);
ERR_error_string_n(ssl_errno, errbuf, MXS_STRERROR_BUFLEN);
MXS_ERROR("%s", errbuf);
ssl_errno = ERR_get_error();
}
@ -1475,7 +1475,7 @@ dcb_log_write_failure(DCB *dcb, GWBUF *queue, int eno)
{
if (eno == EPIPE)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_DEBUG("%lu [dcb_write] Write to dcb "
"%p in state %s fd %d failed "
"due errno %d, %s",
@ -1494,7 +1494,7 @@ dcb_log_write_failure(DCB *dcb, GWBUF *queue, int eno)
eno != EAGAIN &&
eno != EWOULDBLOCK)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Write to dcb %p in "
"state %s fd %d failed due "
"errno %d, %s",
@ -1528,7 +1528,7 @@ dcb_log_write_failure(DCB *dcb, GWBUF *queue, int eno)
}
if (dolog)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_DEBUG("%lu [dcb_write] Writing to %s socket failed due %d, %s.",
pthread_self(),
DCB_ROLE_CLIENT_HANDLER == dcb->dcb_role ? "client" : "backend server",
@ -2458,7 +2458,7 @@ gw_write(DCB *dcb, GWBUF *writeq, bool *stop_writing)
saved_errno != EPIPE)
#endif
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Write to %s %s in state %s failed due errno %d, %s",
DCB_STRTYPE(dcb), dcb->remote, STRDCBSTATE(dcb->state),
saved_errno, strerror_r(saved_errno, errbuf, sizeof(errbuf)));
@ -2802,7 +2802,7 @@ dcb_persistent_clean_count(DCB *dcb, bool cleanall)
}
persistentdcb = nextdcb;
}
server->persistmax = MAX(server->persistmax, count);
server->persistmax = MXS_MAX(server->persistmax, count);
spinlock_release(&server->persistlock);
/** Call possible callback for this DCB in case of close */
while (disposals)
@ -3087,7 +3087,7 @@ dcb_accept(DCB *listener, GWPROTOCOL *protocol_funcs)
int sendbuf;
struct sockaddr_storage client_conn;
socklen_t optlen = sizeof(sendbuf);
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
if ((c_sock = dcb_accept_one_connection(listener, (struct sockaddr *)&client_conn)) >= 0)
{
@ -3256,7 +3256,7 @@ dcb_accept_one_connection(DCB *listener, struct sockaddr *client_conn)
if (c_sock == -1)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
/* Did not get a file descriptor */
if (eno == EAGAIN || eno == EWOULDBLOCK)
{
@ -3348,7 +3348,7 @@ dcb_listen(DCB *listener, const char *config, const char *protocol_name)
if (listen(listener_socket, 10 * SOMAXCONN) != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to start listening on '%s' with protocol '%s': %d, %s",
config,
protocol_name,
@ -3402,7 +3402,7 @@ dcb_listen_create_socket_inet(const char *config_bind)
/** Create the TCP socket */
if ((listener_socket = socket(AF_INET, SOCK_STREAM, 0)) < 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Can't create socket: %i, %s",
errno,
strerror_r(errno, errbuf, sizeof(errbuf)));
@ -3426,7 +3426,7 @@ dcb_listen_create_socket_inet(const char *config_bind)
if (bind(listener_socket, (struct sockaddr *) &server_address, sizeof(server_address)) < 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to bind on '%s': %i, %s",
config_bind,
errno,
@ -3469,7 +3469,7 @@ dcb_listen_create_socket_unix(const char *config_bind)
// UNIX socket create
if ((listener_socket = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Can't create UNIX socket: %i, %s",
errno,
strerror_r(errno, errbuf, sizeof(errbuf)));
@ -3496,7 +3496,7 @@ dcb_listen_create_socket_unix(const char *config_bind)
if ((-1 == unlink(config_bind)) && (errno != ENOENT))
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to unlink Unix Socket %s: %d %s",
config_bind, errno, strerror_r(errno, errbuf, sizeof(errbuf)));
}
@ -3504,7 +3504,7 @@ dcb_listen_create_socket_unix(const char *config_bind)
/* Bind the socket to the Unix domain socket */
if (bind(listener_socket, (struct sockaddr *) &local_addr, sizeof(local_addr)) < 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to bind to UNIX Domain socket '%s': %i, %s",
config_bind,
errno,
@ -3516,7 +3516,7 @@ dcb_listen_create_socket_unix(const char *config_bind)
/* set permission for all users */
if (chmod(config_bind, 0777) < 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to change permissions on UNIX Domain socket '%s': %i, %s",
config_bind,
errno,
@ -3543,7 +3543,7 @@ dcb_set_socket_option(int sockfd, int level, int optname, void *optval, socklen_
{
if (setsockopt(sockfd, level, optname, optval, optlen) != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to set socket options. Error %d: %s",
errno,
strerror_r(errno, errbuf, sizeof(errbuf)));

2
server/core/externcmd.c
View File

@ -171,7 +171,7 @@ int externcmd_execute(EXTERNCMD* cmd)
if (pid < 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to execute command '%s', fork failed: [%d] %s",
cmd->argv[0], errno, strerror_r(errno, errbuf, sizeof(errbuf)));
rval = -1;

28
server/core/gateway.c
View File

@ -317,7 +317,7 @@ sigchld_handler (int i)
if ((child = wait(&exit_status)) == -1)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to wait child process: %d %s",
errno, strerror_r(errno, errbuf, sizeof(errbuf)));
}
@ -428,7 +428,7 @@ static int signal_set(int sig, void (*handler)(int))
{
int eno = errno;
errno = 0;
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed call sigaction() in %s due to %d, %s.",
program_invocation_short_name,
eno,
@ -463,7 +463,7 @@ static bool create_datadir(const char* base, char* datadir)
}
else
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Cannot create data directory '%s': %d %s\n",
datadir, errno, strerror_r(errno, errbuf, sizeof(errbuf)));
}
@ -473,7 +473,7 @@ static bool create_datadir(const char* base, char* datadir)
{
if (len < PATH_MAX)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr, "Error: Cannot create data directory '%s': %d %s\n",
datadir, errno, strerror_r(errno, errbuf, sizeof(errbuf)));
}
@ -501,7 +501,7 @@ int ntfw_cb(const char* filename,
{
int eno = errno;
errno = 0;
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to remove the data directory %s of MaxScale due to %d, %s.",
datadir, eno, strerror_r(eno, errbuf, sizeof(errbuf)));
}
@ -702,7 +702,7 @@ static void print_log_n_stderr(
{
if (mxs_log_init(NULL, get_logdir(), MXS_LOG_TARGET_FS))
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("%s%s%s%s",
logstr,
eno == 0 ? "" : " (",
@ -712,7 +712,7 @@ static void print_log_n_stderr(
}
if (do_stderr)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr,
"* Error: %s%s%s%s\n",
fprstr,
@ -1798,7 +1798,7 @@ int main(int argc, char **argv)
}
else
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Cannot create data directory '%s': %d %s\n",
datadir, errno, strerror_r(errno, errbuf, sizeof(errbuf)));
goto return_main;
@ -2121,7 +2121,7 @@ static void unlink_pidfile(void)
{
if (unlink(pidfile))
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr,
"MaxScale failed to remove pidfile %s: error %d, %s\n",
pidfile,
@ -2545,7 +2545,7 @@ static int set_user(const char* user)
pwname = getpwnam(user);
if (pwname == NULL)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
printf("Error: Failed to retrieve user information for '%s': %d %s\n",
user, errno, errno == 0 ? "User not found" : strerror_r(errno, errbuf, sizeof(errbuf)));
return -1;
@ -2554,7 +2554,7 @@ static int set_user(const char* user)
rval = setgid(pwname->pw_gid);
if (rval != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
printf("Error: Failed to change group to '%d': %d %s\n",
pwname->pw_gid, errno, strerror_r(errno, errbuf, sizeof(errbuf)));
return rval;
@ -2563,7 +2563,7 @@ static int set_user(const char* user)
rval = setuid(pwname->pw_uid);
if (rval != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
printf("Error: Failed to change user to '%s': %d %s\n",
pwname->pw_name, errno, strerror_r(errno, errbuf, sizeof(errbuf)));
return rval;
@ -2572,7 +2572,7 @@ static int set_user(const char* user)
{
if (prctl(PR_SET_DUMPABLE , 1) == -1)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
printf("Error: Failed to set dumpable flag on for the process '%s': %d %s\n",
pwname->pw_name, errno, strerror_r(errno, errbuf, sizeof(errbuf)));
return -1;
@ -2615,7 +2615,7 @@ static bool change_cwd()
if (chdir(get_logdir()) != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to change working directory to '%s': %d, %s. "
"Trying to change working directory to '/'.",
get_logdir(), errno, strerror_r(errno, errbuf, sizeof (errbuf)));

4
server/core/gw_utils.c
View File

@ -143,7 +143,7 @@ bool gw_daemonize(void)
if (pid < 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr, "fork() error %s\n", strerror_r(errno, errbuf, sizeof(errbuf)));
exit(1);
}
@ -156,7 +156,7 @@ bool gw_daemonize(void)
if (setsid() < 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr, "setsid() error %s\n", strerror_r(errno, errbuf, sizeof(errbuf)));
exit(1);
}

12
server/core/log_manager.cc
View File

@ -1643,7 +1643,7 @@ static bool logfile_write_header(skygw_file_t* file)
if ((header_items != 1) || (line_items != 1))
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
LOG_ERROR("MaxScale Log: Writing header failed due to %d, %s\n",
errno, strerror_r(errno, errbuf, sizeof(errbuf)));
written = false;
@ -1820,13 +1820,13 @@ static bool check_file_and_path(const char* filename, bool* writable)
{
if (file_is_symlink(filename))
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
LOG_ERROR("MaxScale Log: Error, Can't access file pointed to by %s due to %d, %s.\n",
filename, errno, strerror_r(errno, errbuf, sizeof(errbuf)));
}
else
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
LOG_ERROR("MaxScale Log: Error, Can't access %s due to %d, %s.\n",
filename, errno, strerror_r(errno, errbuf, sizeof(errbuf)));
}
@ -1925,7 +1925,7 @@ static bool logfile_init(logfile_t* logfile,
if (mkdir(dir, S_IRWXU | S_IRWXG) != 0 && (errno != EEXIST))
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
LOG_ERROR("MaxScale Log: Error, creating directory %s failed due to %d, %s.\n",
dir, errno, strerror_r(errno, errbuf, sizeof(errbuf)));
@ -2110,7 +2110,7 @@ static bool logfile_write_footer(skygw_file_t* file, const char* suffix)
if ((header_items != 1) || (line_items != 1))
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
LOG_ERROR("MaxScale Log: Writing footer failed due to %d, %s\n",
errno, strerror_r(errno, errbuf, sizeof(errbuf)));
written = false;
@ -2238,7 +2238,7 @@ static bool thr_flush_file(logmanager_t *lm, filewriter_t *fwr)
if (err)
{
// TODO: Log this to syslog.
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
LOG_ERROR("MaxScale Log: Error, writing to the log-file %s failed due to %d, %s. "
"Disabling writing to the log.\n",
lf->lf_full_file_name, err, strerror_r(err, errbuf, sizeof(errbuf)));

5
server/core/modutil.c
View File

@ -30,6 +30,7 @@
#include <maxscale/alloc.h>
#include <maxscale/poll.h>
#include <maxscale/modutil.h>
#include <maxscale/skygw_utils.h>
#include <strings.h>
/** These are used when converting MySQL wildcards to regular expressions */
@ -1059,7 +1060,7 @@ void prepare_pcre2_patterns()
{
int err;
size_t erroff;
PCRE2_UCHAR errbuf[STRERROR_BUFLEN];
PCRE2_UCHAR errbuf[MXS_STRERROR_BUFLEN];
if ((re_percent = pcre2_compile(pattern_percent, PCRE2_ZERO_TERMINATED,
0, &err, &erroff, NULL)) &&
@ -1137,7 +1138,7 @@ mxs_pcre2_result_t modutil_mysql_wildcard_match(const char* pattern, const char*
{
if (errcode != 0)
{
PCRE2_UCHAR errbuf[STRERROR_BUFLEN];
PCRE2_UCHAR errbuf[MXS_STRERROR_BUFLEN];
pcre2_get_error_message(errcode, errbuf, sizeof(errbuf));
MXS_ERROR("Failed to match pattern: %s", errbuf);
}

12
server/core/poll.c
View File

@ -215,7 +215,7 @@ poll_init()
}
if ((epoll_fd = epoll_create(MAX_EVENTS)) == -1)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("FATAL: Could not create epoll instance: %s", strerror_r(errno, errbuf, sizeof(errbuf)));
exit(-1);
}
@ -945,7 +945,7 @@ process_pollq(int thread_id)
}
else
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_DEBUG("%lu [poll_waitevents] "
"EPOLLOUT due %d, %s. "
"dcb %p, fd %i",
@ -1012,7 +1012,7 @@ process_pollq(int thread_id)
if (eno == 0)
{
eno = dcb_fake_write_errno[dcb->fd];
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_DEBUG("%lu [poll_waitevents] "
"Added fake errno %d. "
"%s",
@ -1024,7 +1024,7 @@ process_pollq(int thread_id)
#endif /* FAKE_CODE */
if (eno != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_DEBUG("%lu [poll_waitevents] "
"EPOLLERR due %d, %s.",
pthread_self(),
@ -1047,7 +1047,7 @@ process_pollq(int thread_id)
{
int eno = 0;
eno = gw_getsockerrno(dcb->fd);
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_DEBUG("%lu [poll_waitevents] "
"EPOLLHUP on dcb %p, fd %d. "
"Errno %d, %s.",
@ -1083,7 +1083,7 @@ process_pollq(int thread_id)
{
int eno = 0;
eno = gw_getsockerrno(dcb->fd);
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_DEBUG("%lu [poll_waitevents] "
"EPOLLRDHUP on dcb %p, fd %d. "
"Errno %d, %s.",

1
server/core/query_classifier.c
View File

@ -16,6 +16,7 @@
#include <maxscale/modules.h>
#include <maxscale/modutil.h>
#include <maxscale/alloc.h>
#include <maxscale/skygw_utils.h>
//#define QC_TRACE_ENABLED
#undef QC_TRACE_ENABLED

26
server/core/secrets.c
View File

@ -89,7 +89,7 @@ secrets_readKeys(const char* path)
}
else
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("The provided path \"%s\" does not exist or cannot be accessed. "
"Error: %d, %s.", path, errno, strerror_r(errno, errbuf, sizeof(errbuf)));
return NULL;
@ -111,7 +111,7 @@ secrets_readKeys(const char* path)
{
if (!reported)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_NOTICE("Encrypted password file %s can't be accessed "
"(%s). Password encryption is not used.",
secret_file,
@ -121,7 +121,7 @@ secrets_readKeys(const char* path)
}
else
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Access for secrets file "
"[%s] failed. Error %d, %s.",
secret_file,
@ -137,7 +137,7 @@ secrets_readKeys(const char* path)
{
int eno = errno;
errno = 0;
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed opening secret "
"file [%s]. Error %d, %s.",
secret_file,
@ -153,7 +153,7 @@ secrets_readKeys(const char* path)
int eno = errno;
errno = 0;
close(fd);
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("fstat for secret file %s "
"failed. Error %d, %s.",
secret_file,
@ -167,7 +167,7 @@ secrets_readKeys(const char* path)
int eno = errno;
errno = 0;
close(fd);
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Secrets file %s has "
"incorrect size. Error %d, %s.",
secret_file,
@ -202,7 +202,7 @@ secrets_readKeys(const char* path)
errno = 0;
close(fd);
MXS_FREE(keys);
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Read from secrets file "
"%s failed. Read %ld, expected %d bytes. Error %d, %s.",
secret_file,
@ -219,7 +219,7 @@ secrets_readKeys(const char* path)
int eno = errno;
errno = 0;
MXS_FREE(keys);
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed closing the "
"secrets file %s. Error %d, %s.",
secret_file,
@ -267,7 +267,7 @@ int secrets_writeKeys(const char *dir)
/* Open for writing | Create | Truncate the file for writing */
if ((fd = open(secret_file, O_CREAT | O_WRONLY | O_TRUNC, S_IRUSR)) < 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("failed opening secret "
"file [%s]. Error %d, %s.",
secret_file,
@ -279,7 +279,7 @@ int secrets_writeKeys(const char *dir)
/* Open for writing | Create | Truncate the file for writing */
if ((randfd = open("/dev/random", O_RDONLY)) < 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("failed opening /dev/random. Error %d, %s.",
errno,
strerror_r(errno, errbuf, sizeof(errbuf)));
@ -302,7 +302,7 @@ int secrets_writeKeys(const char *dir)
/* Write data */
if (write(fd, &key, sizeof(key)) < 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("failed writing into "
"secret file [%s]. Error %d, %s.",
secret_file,
@ -315,7 +315,7 @@ int secrets_writeKeys(const char *dir)
/* close file */
if (close(fd) < 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("failed closing the "
"secret file [%s]. Error %d, %s.",
secret_file,
@ -325,7 +325,7 @@ int secrets_writeKeys(const char *dir)
if (chmod(secret_file, S_IRUSR) < 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("failed to change the permissions of the"
"secret file [%s]. Error %d, %s.",
secret_file,

2
server/core/service.c
View File

@ -383,7 +383,7 @@ int serviceStartAllPorts(SERVICE* service)
service->stats.n_failed_starts++;
char taskname[strlen(service->name) + strlen("_start_retry_") +
(int) ceil(log10(INT_MAX)) + 1];
int retry_after = MIN(service->stats.n_failed_starts * 10, SERVICE_MAX_RETRY_INTERVAL);
int retry_after = MXS_MIN(service->stats.n_failed_starts * 10, SERVICE_MAX_RETRY_INTERVAL);
snprintf(taskname, sizeof(taskname), "%s_start_retry_%d",
service->name, service->stats.n_failed_starts);
hktask_oneshot(taskname, service_internal_restart,

60
server/core/skygw_utils.cc
View File

@ -58,7 +58,7 @@ int skygw_rwlock_rdlock(skygw_rwlock_t* rwlock)
else
{
rwlock->srw_rwlock_thr = 0;
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
ss_dfprintf(stderr,
"* pthread_rwlock_rdlock : %s\n",
strerror_r(err, errbuf, sizeof (errbuf)));
@ -77,7 +77,7 @@ int skygw_rwlock_wrlock(skygw_rwlock_t* rwlock)
else
{
rwlock->srw_rwlock_thr = 0;
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
ss_dfprintf(stderr,
"* pthread_rwlock_wrlock : %s\n",
strerror_r(err, errbuf, sizeof (errbuf)));
@ -95,7 +95,7 @@ int skygw_rwlock_unlock(skygw_rwlock_t* rwlock)
}
else
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
ss_dfprintf(stderr, "* pthread_rwlock_unlock : %s\n",
strerror_r(err, errbuf, sizeof (errbuf)));
}
@ -108,7 +108,7 @@ int skygw_rwlock_destroy(skygw_rwlock_t* rwlock)
/** Lock */
if ((err = pthread_rwlock_wrlock(rwlock->srw_rwlock)) != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr, "* Error : pthread_rwlock_wrlock failed due to %d, %s.\n",
err, strerror_r(err, errbuf, sizeof (errbuf)));
goto retblock;
@ -120,7 +120,7 @@ int skygw_rwlock_destroy(skygw_rwlock_t* rwlock)
/** Destroy */
if ((err = pthread_rwlock_destroy(rwlock->srw_rwlock)) != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr, "* Error : pthread_rwlock_destroy failed due to %d,%s\n",
err, strerror_r(err, errbuf, sizeof (errbuf)));
}
@ -152,7 +152,7 @@ int skygw_rwlock_init(skygw_rwlock_t** rwlock)
if (err != 0)
{
free(rwl);
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
ss_dfprintf(stderr, "* Creating pthread_rwlock failed : %s\n",
strerror_r(err, errbuf, sizeof (errbuf)));
goto return_err;
@ -204,7 +204,7 @@ size_t snprint_timestamp(char* p_ts, size_t tslen)
t = time(NULL);
localtime_r(&t, &tm);
snprintf(p_ts, MIN(tslen, timestamp_len), timestamp_formatstr,
snprintf(p_ts, MXS_MIN(tslen, timestamp_len), timestamp_formatstr,
tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour,
tm.tm_min, tm.tm_sec);
rval = strlen(p_ts) * sizeof (char);
@ -245,7 +245,7 @@ size_t snprint_timestamp_hp(char* p_ts, size_t tslen)
gettimeofday(&tv, NULL);
localtime_r(&tv.tv_sec, &tm);
usec = tv.tv_usec / 1000;
snprintf(p_ts, MIN(tslen, timestamp_len_hp), timestamp_formatstr_hp,
snprintf(p_ts, MXS_MIN(tslen, timestamp_len_hp), timestamp_formatstr_hp,
tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
tm.tm_hour, tm.tm_min, tm.tm_sec, usec);
rval = strlen(p_ts) * sizeof (char);
@ -350,7 +350,7 @@ int skygw_thread_start(skygw_thread_t* thr)
if (err != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr, "* Starting file writer thread failed due error, %d, %s\n",
err, strerror_r(errno, errbuf, sizeof (errbuf)));
goto return_err;
@ -526,7 +526,7 @@ simple_mutex_t* simple_mutex_init(simple_mutex_t* mutexptr, const char* name)
if (err != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr, "* Initializing simple mutex %s failed due error %d, %s\n",
name, err, strerror_r(errno, errbuf, sizeof (errbuf)));
perror("simple_mutex : ");
@ -566,7 +566,7 @@ int simple_mutex_done(simple_mutex_t* sm)
if (err != 0)
{
perror("simple_mutex : ");
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr, "* Destroying simple mutex %s failed due %d, %s\n",
sm->sm_name, err, strerror_r(errno, errbuf, sizeof (errbuf)));
goto return_err;
@ -613,7 +613,7 @@ int simple_mutex_lock(simple_mutex_t* sm, bool block)
if (err != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr, "* Locking simple mutex %s failed due error, %d, %s\n",
sm->sm_name, err, strerror_r(errno, errbuf, sizeof (errbuf)));
perror("simple_mutex : ");
@ -642,7 +642,7 @@ int simple_mutex_unlock(simple_mutex_t* sm)
if (err != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr, "* Unlocking simple mutex %s failed due error %d, %s\n",
sm->sm_name, err, strerror_r(errno, errbuf, sizeof (errbuf)));
perror("simple_mutex : ");
@ -676,7 +676,7 @@ skygw_message_t* skygw_message_init(void)
if (err != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr, "* Initializing pthread mutex failed due error %d, %s\n",
err, strerror_r(errno, errbuf, sizeof (errbuf)));
free(mes);
@ -687,7 +687,7 @@ skygw_message_t* skygw_message_init(void)
if (err != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr, "* Initializing pthread cond var failed, due error %d, %s\n",
err, strerror_r(errno, errbuf, sizeof (errbuf)));
pthread_mutex_destroy(&mes->mes_mutex);
@ -716,7 +716,7 @@ void skygw_message_done(skygw_message_t* mes)
if (err != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr, "* Destroying cond var failed due error %d, %s\n",
err, strerror_r(errno, errbuf, sizeof (errbuf)));
}
@ -725,7 +725,7 @@ void skygw_message_done(skygw_message_t* mes)
if (err != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr, "* Destroying pthread mutex failed, due error %d, %s\n",
err, strerror_r(errno, errbuf, sizeof (errbuf)));
}
@ -743,7 +743,7 @@ skygw_mes_rc_t skygw_message_send(skygw_message_t* mes)
if (err != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr, "* Locking pthread mutex failed, due to error %d, %s\n",
err, strerror_r(errno, errbuf, sizeof (errbuf)));
goto return_mes_rc;
@ -757,7 +757,7 @@ skygw_mes_rc_t skygw_message_send(skygw_message_t* mes)
}
else
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr, "* Signaling pthread cond var failed, due to error %d, %s\n",
err, strerror_r(errno, errbuf, sizeof (errbuf)));
}
@ -765,7 +765,7 @@ skygw_mes_rc_t skygw_message_send(skygw_message_t* mes)
if (err != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr, "* Unlocking pthread mutex failed, due to error %d, %s\n",
err, strerror_r(errno, errbuf, sizeof (errbuf)));
}
@ -783,7 +783,7 @@ void skygw_message_wait(skygw_message_t* mes)
if (err != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr, "* Locking pthread mutex failed, due error %d, %s\n",
err, strerror_r(errno, errbuf, sizeof (errbuf)));
}
@ -795,7 +795,7 @@ void skygw_message_wait(skygw_message_t* mes)
if (err != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr, "* Locking pthread cond wait failed, due error %d, %s\n",
err, strerror_r(errno, errbuf, sizeof (errbuf)));
}
@ -805,7 +805,7 @@ void skygw_message_wait(skygw_message_t* mes)
if (err != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr, "* Unlocking pthread mutex failed, due error %d, %s\n",
err, strerror_r(errno, errbuf, sizeof (errbuf)));
}
@ -821,7 +821,7 @@ void skygw_message_reset(skygw_message_t* mes)
if (err != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr, "* Locking pthread mutex failed, due error %d, %s\n",
err, strerror_r(errno, errbuf, sizeof (errbuf)));
goto return_mes_rc;
@ -832,7 +832,7 @@ void skygw_message_reset(skygw_message_t* mes)
if (err != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr, "* Unlocking pthread mutex failed, due error %d, %s\n",
err, strerror_r(errno, errbuf, sizeof (errbuf)));
goto return_mes_rc;
@ -934,7 +934,7 @@ skygw_file_t* skygw_file_init(const char* fname,
{
int eno = errno;
errno = 0;
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr, "* Opening file %s failed due %d, %s.\n",
file->sf_fname, eno, strerror_r(eno, errbuf, sizeof (errbuf)));
free(file);
@ -958,7 +958,7 @@ skygw_file_t* skygw_file_init(const char* fname,
{
int eno = errno;
errno = 0;
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr, "failed to create symlink %s -> %s due %d, %s. Exiting.",
fname, symlinkname, eno, strerror_r(eno, errbuf, sizeof (errbuf)));
free(file);
@ -994,7 +994,7 @@ void skygw_file_close(skygw_file_t* file)
if ((err = fclose(file->sf_file)) != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr, "* Closing file %s failed due to %d, %s.\n",
file->sf_fname, errno, strerror_r(errno, errbuf, sizeof (errbuf)));
}
@ -1170,7 +1170,7 @@ char* replace_literal(char* haystack, const char* needle, const char* replacemen
if (search_re == NULL)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr, "Regex memory allocation failed : %s\n",
strerror_r(errno, errbuf, sizeof (errbuf)));
newstr = haystack;
@ -1183,7 +1183,7 @@ char* replace_literal(char* haystack, const char* needle, const char* replacemen
if (newstr == NULL)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
fprintf(stderr, "Regex memory allocation failed : %s\n",
strerror_r(errno, errbuf, sizeof (errbuf)));
free(search_re);

2
server/core/test/testadminusers.c
View File

@ -37,7 +37,7 @@
#include <maxscale/gwdirs.h>
#include <maxscale/adminusers.h>
#include <maxscale/alloc.h>
#include <maxscale/skygw_utils.h>
/**
* test1 default user

2
server/core/test/testpoll.c
View File

@ -69,7 +69,7 @@ test1()
if (dcb->fd < 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
ss_dfprintf(stderr, "\nError on function call: socket() returned %d: %s\n", errno, strerror_r(errno, errbuf,
sizeof(errbuf)));
return 1;

8
server/core/utils.c
View File

@ -60,7 +60,7 @@ int setnonblocking(int fd)
if ((fl = fcntl(fd, F_GETFL, 0)) == -1)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Can't GET fcntl for %i, errno = %d, %s.",
fd,
errno,
@ -70,7 +70,7 @@ int setnonblocking(int fd)
if (fcntl(fd, F_SETFL, fl | O_NONBLOCK) == -1)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Can't SET fcntl for %i, errno = %d, %s",
fd,
errno,
@ -346,7 +346,7 @@ static bool mkdir_all_internal(char *path, mode_t mask)
}
else
{
char err[STRERROR_BUFLEN];
char err[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to create directory '%s': %d, %s",
path, errno, strerror_r(errno, err, sizeof(err)));
}
@ -355,7 +355,7 @@ static bool mkdir_all_internal(char *path, mode_t mask)
}
else
{
char err[STRERROR_BUFLEN];
char err[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to create directory '%s': %d, %s",
path, errno, strerror_r(errno, err, sizeof(err)));
}

2
server/modules/filter/cache/rules.c vendored
View File

@ -246,7 +246,7 @@ CACHE_RULES *cache_rules_load(const char *path, uint32_t debug)
}
else
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Could not open rules file %s for reading: %s",
path, strerror_r(errno, errbuf, sizeof(errbuf)));

2
server/modules/filter/cache/storage/storage_rocksdb/rocksdbstorage.cc vendored
View File

@ -118,7 +118,7 @@ bool RocksDBStorage::Initialize()
else if (errno != EEXIST)
{
initialized = false;
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to create storage directory %s: %s",
u_storageDirectory.c_str(),

6
server/modules/filter/dbfwfilter/dbfwfilter.c
View File

@ -1173,7 +1173,7 @@ bool define_regex_rule(void* scanner, char* pattern)
}
else
{
PCRE2_UCHAR errbuf[STRERROR_BUFLEN];
PCRE2_UCHAR errbuf[MXS_STRERROR_BUFLEN];
pcre2_get_error_message(err, errbuf, sizeof(errbuf));
MXS_ERROR("dbfwfilter: Invalid regular expression '%s': %s",
start, errbuf);
@ -1343,7 +1343,7 @@ static bool process_rule_file(const char* filename, FW_INSTANCE* instance)
}
else
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to open rule file '%s': %d, %s", filename, errno,
strerror_r(errno, errbuf, sizeof(errbuf)));
@ -2240,7 +2240,7 @@ routeQuery(FILTER *instance, void *session, GWBUF *queue)
int len;
if (modutil_extract_SQL(queue, &sql, &len))
{
len = MIN(len, FW_MAX_SQL_LEN);
len = MXS_MIN(len, FW_MAX_SQL_LEN);
if (match && my_instance->log_match & FW_LOG_MATCH)
{
ss_dassert(rname);

12
server/modules/filter/gatekeeper/gatekeeper.c
View File

@ -183,7 +183,7 @@ static FILTER* createInstance(const char *name, char **options, FILTER_PARAMETER
}
else
{
char err[STRERROR_BUFLEN];
char err[MXS_STRERROR_BUFLEN];
MXS_ERROR(MODNAME"File is not accessible: %d, %s", errno,
strerror_r(errno, err, sizeof(err)));
ok = false;
@ -453,7 +453,7 @@ static bool write_stored_data(GK_INSTANCE *inst)
if (write(fd, &len, sizeof(len)) != sizeof(len) ||
write(fd, key, len) != len)
{
char err[STRERROR_BUFLEN];
char err[MXS_STRERROR_BUFLEN];
MXS_ERROR(MODNAME"Failed to write key '%s' to disk (%d, %s). The datafile at '%s' was "
"not updated but it will be updated when the next session closes. ",
key, errno, strerror_r(errno, err, sizeof(err)), inst->datadir);
@ -471,7 +471,7 @@ static bool write_stored_data(GK_INSTANCE *inst)
if (!rval)
{
char err[STRERROR_BUFLEN];
char err[MXS_STRERROR_BUFLEN];
MXS_ERROR(MODNAME"Failed to rename file '%s' to '%s' when writing data: %d, %s",
filepath, newfilepath, errno, strerror_r(errno, err, sizeof(err)));
}
@ -479,7 +479,7 @@ static bool write_stored_data(GK_INSTANCE *inst)
}
else if (fd == -1)
{
char err[STRERROR_BUFLEN];
char err[MXS_STRERROR_BUFLEN];
MXS_ERROR(MODNAME"Failed to open file '%s' when writing data: %d, %s",
filepath, errno, strerror_r(errno, err, sizeof(err)));
}
@ -497,7 +497,7 @@ static void report_failed_read(FILE *file, int nexpected, int nread)
{
if (ferror(file))
{
char err[STRERROR_BUFLEN];
char err[MXS_STRERROR_BUFLEN];
MXS_ERROR(MODNAME"Failed to read %d bytes, only %d bytes read: %d, %s",
nexpected, nread, errno, strerror_r(errno, err, sizeof(err)));
}
@ -579,7 +579,7 @@ static bool read_stored_data(GK_INSTANCE *inst)
}
else
{
char err[STRERROR_BUFLEN];
char err[MXS_STRERROR_BUFLEN];
MXS_ERROR(MODNAME"Failed to open file '%s' when reading stored data: %d, %s",
filepath, errno, strerror_r(errno, err, sizeof(err)));
}

4
server/modules/filter/qlafilter/qlafilter.c
View File

@ -350,7 +350,7 @@ newSession(FILTER *instance, SESSION *session)
if (my_session->fp == NULL)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Opening output file for qla "
"fileter failed due to %d, %s",
errno,
@ -363,7 +363,7 @@ newSession(FILTER *instance, SESSION *session)
}
else
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Memory allocation for qla filter failed due to "
"%d, %s.",
errno,

6
server/modules/monitor/galeramon/galeramon.c
View File

@ -559,12 +559,12 @@ monitorMain(void *arg)
/*
* Let's select a master server:
* it could be the candidate master following MIN(node_id) rule or
* it could be the candidate master following MXS_MIN(node_id) rule or
* the server that was master in the previous monitor polling cycle
* Decision depends on master_stickiness value set in configuration
*/
/* get the candidate master, following MIN(node_id) rule */
/* get the candidate master, following MXS_MIN(node_id) rule */
candidate_master = get_candidate_master(mon);
/* Select the master, based on master_stickiness */
@ -656,7 +656,7 @@ monitorMain(void *arg)
/**
* get candidate master from all nodes
*
* The current available rule: get the server with MIN(node_id)
* The current available rule: get the server with MXS_MIN(node_id)
* node_id comes from 'wsrep_local_index' variable
*
* @param servers The monitored servers list

18
server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c
View File

@ -310,7 +310,7 @@ gw_do_connect_to_backend(char *host, int port, int *fd)
if (so < 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Establishing connection to backend server "
"%s:%d failed.\n\t\t Socket creation failed "
"due %d, %s.",
@ -328,7 +328,7 @@ gw_do_connect_to_backend(char *host, int port, int *fd)
if (setsockopt(so, SOL_SOCKET, SO_SNDBUF, &bufsize, sizeof(bufsize)) != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to set socket options "
"%s:%d failed.\n\t\t Socket configuration failed "
"due %d, %s.",
@ -345,7 +345,7 @@ gw_do_connect_to_backend(char *host, int port, int *fd)
if (setsockopt(so, SOL_SOCKET, SO_RCVBUF, &bufsize, sizeof(bufsize)) != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to set socket options "
"%s:%d failed.\n\t\t Socket configuration failed "
"due %d, %s.",
@ -362,7 +362,7 @@ gw_do_connect_to_backend(char *host, int port, int *fd)
int one = 1;
if (setsockopt(so, IPPROTO_TCP, TCP_NODELAY, &one, sizeof(one)) != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to set socket options "
"%s:%d failed.\n\t\t Socket configuration failed "
"due %d, %s.",
@ -388,7 +388,7 @@ gw_do_connect_to_backend(char *host, int port, int *fd)
}
else
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to connect backend server %s:%d, "
"due %d, %s.",
host,
@ -1057,7 +1057,7 @@ static int gw_error_backend_event(DCB *dcb)
{
if (error != 0)
{
char errstring[STRERROR_BUFLEN];
char errstring[MXS_STRERROR_BUFLEN];
MXS_ERROR("DCB in state %s got error '%s'.",
STRDCBSTATE(dcb->state),
strerror_r(error, errstring, sizeof(errstring)));
@ -1095,7 +1095,7 @@ static int gw_error_backend_event(DCB *dcb)
{
if (error != 0)
{
char errstring[STRERROR_BUFLEN];
char errstring[MXS_STRERROR_BUFLEN];
MXS_ERROR("Error '%s' in session that is not ready for routing.",
strerror_r(error, errstring, sizeof(errstring)));
}
@ -1199,7 +1199,7 @@ static int gw_backend_hangup(DCB *dcb)
{
if (error != 0 && ses_state != SESSION_STATE_STOPPING)
{
char errstring[STRERROR_BUFLEN];
char errstring[MXS_STRERROR_BUFLEN];
MXS_ERROR("Hangup in session that is not ready for routing, "
"Error reported is '%s'.",
strerror_r(error, errstring, sizeof(errstring)));
@ -1766,7 +1766,7 @@ close_socket(int sock)
/*< Close newly created socket. */
if (close(sock) != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to close socket %d due %d, %s.",
sock,
errno,

2
server/modules/protocol/MySQL/mysql_common.c
View File

@ -844,7 +844,7 @@ void init_response_status(GWBUF* buf,
nparam = gw_mysql_get_byte2(readbuf);
gwbuf_copy_data(buf, 11, 2, readbuf);
nattr = gw_mysql_get_byte2(readbuf);
*npackets = 1 + nparam + MIN(1, nparam) + nattr + MIN(nattr, 1);
*npackets = 1 + nparam + MXS_MIN(1, nparam) + nattr + MXS_MIN(nattr, 1);
break;
case MYSQL_COM_QUIT:

2
server/modules/protocol/maxscaled/maxscaled.c
View File

@ -162,7 +162,7 @@ static bool authenticate_socket(MAXSCALED *protocol, DCB *dcb)
}
else
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Could not get socket family of client connection: %s",
strerror_r(errno, errbuf, sizeof(errbuf)));

6
server/modules/routing/avro/avro.c
View File

@ -411,7 +411,7 @@ createInstance(SERVICE *service, char **options)
}
else if (strcmp(options[i], "start_index") == 0)
{
first_file = MAX(1, atoi(value));
first_file = MXS_MAX(1, atoi(value));
}
else
{
@ -1037,7 +1037,7 @@ void converter_func(void* data)
if (binlog_end == AVRO_LAST_FILE)
{
router->task_delay = MIN(router->task_delay + 1, AVRO_TASK_DELAY_MAX);
router->task_delay = MXS_MIN(router->task_delay + 1, AVRO_TASK_DELAY_MAX);
add_conversion_task(router);
MXS_INFO("Stopped processing file %s at position %lu. Waiting until"
" more data is written before continuing. Next check in %d seconds.",
@ -1060,7 +1060,7 @@ static bool ensure_dir_ok(const char* path, int mode)
if (path)
{
char err[STRERROR_BUFLEN];
char err[MXS_STRERROR_BUFLEN];
char resolved[PATH_MAX + 1];
const char *rp = realpath(path, resolved);

2
server/modules/routing/avro/avro_client.c
View File

@ -857,7 +857,7 @@ GWBUF* read_avro_json_schema(const char *avrofile, const char* dir)
}
else
{
char err[STRERROR_BUFLEN];
char err[MXS_STRERROR_BUFLEN];
MXS_ERROR("Failed to open file '%s': %d, %s", buffer, errno,
strerror_r(errno, err, sizeof(err)));
}

5
server/modules/routing/avro/avro_file.c
View File

@ -40,6 +40,7 @@
#include <stdlib.h>
#include <glob.h>
#include <maxscale/alloc.h>
#include <maxscale/skygw_utils.h>
static const char *statefile_section = "avro-conversion";
static const char *ddl_list_name = "table-ddl.list";
@ -160,7 +161,7 @@ bool avro_save_conversion_state(AVRO_INSTANCE *router)
{
FILE *config_file;
char filename[PATH_MAX + 1];
char err_msg[STRERROR_BUFLEN];
char err_msg[MXS_STRERROR_BUFLEN];
snprintf(filename, sizeof(filename), "%s/"AVRO_PROGRESS_FILE".tmp", router->avrodir);
@ -419,7 +420,7 @@ static GWBUF* read_event_data(AVRO_INSTANCE *router, REP_HEADER* hdr, uint64_t p
{
if (n == -1)
{
char err_msg[STRERROR_BUFLEN];
char err_msg[MXS_STRERROR_BUFLEN];
MXS_ERROR("Error reading the event at %lu in %s. "
"%s, expected %d bytes.",
pos, router->binlog_name,

2
server/modules/routing/avro/avro_rbr.c
View File

@ -523,7 +523,7 @@ uint8_t* process_row_event_data(TABLE_MAP *map, TABLE_CREATE *create, avro_value
{
uint64_t value = 0;
int width = metadata[metadata_offset] + metadata[metadata_offset + 1] * 8;
int bits_in_nullmap = MIN(width, extra_bits);
int bits_in_nullmap = MXS_MIN(width, extra_bits);
extra_bits -= bits_in_nullmap;
width -= bits_in_nullmap;
size_t bytes = width / 8;

6
server/modules/routing/binlog/blr.c
View File

@ -568,7 +568,7 @@ createInstance(SERVICE *service, char **options)
mkdir_rval = mkdir(inst->binlogdir, 0700);
if (mkdir_rval == -1)
{
char err_msg[STRERROR_BUFLEN];
char err_msg[MXS_STRERROR_BUFLEN];
MXS_ERROR("Service %s, Failed to create binlog directory '%s': [%d] %s",
service->name,
inst->binlogdir,
@ -1628,7 +1628,7 @@ errorReply(ROUTER *instance,
ROUTER_INSTANCE *router = (ROUTER_INSTANCE *)instance;
int error;
socklen_t len;
char msg[STRERROR_BUFLEN + 1 + 5] = "";
char msg[MXS_STRERROR_BUFLEN + 1 + 5] = "";
char *errmsg;
unsigned long mysql_errno;
@ -1688,7 +1688,7 @@ errorReply(ROUTER *instance,
getsockopt(router->master->fd, SOL_SOCKET, SO_ERROR, &error, &len) == 0 &&
error != 0)
{
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
sprintf(msg, "%s ", strerror_r(error, errbuf, sizeof(errbuf)));
}
else

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

@ -244,7 +244,7 @@ blr_file_create(ROUTER_INSTANCE *router, char *file)
}
int created = 0;
char err_msg[STRERROR_BUFLEN];
char err_msg[MXS_STRERROR_BUFLEN];
char path[PATH_MAX + 1] = "";
@ -366,7 +366,7 @@ blr_write_binlog_record(ROUTER_INSTANCE *router, REP_HEADER *hdr, uint32_t size,
if ((n = pwrite(router->binlog_fd, buf, size,
router->last_written)) != size)
{
char err_msg[STRERROR_BUFLEN];
char err_msg[MXS_STRERROR_BUFLEN];
MXS_ERROR("%s: Failed to write binlog record at %lu of %s, %s. "
"Truncating to previous record.",
router->service->name, router->last_written,
@ -594,7 +594,7 @@ blr_read_binlog(ROUTER_INSTANCE *router, BLFILE *file, unsigned long pos, REP_HE
break;
case -1:
{
char err_msg[STRERROR_BUFLEN];
char err_msg[MXS_STRERROR_BUFLEN];
snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Failed to read binlog file '%s'; (%s), event at %lu",
file->binlogname, strerror_r(errno, err_msg, sizeof(err_msg)), pos);
@ -677,7 +677,7 @@ blr_read_binlog(ROUTER_INSTANCE *router, BLFILE *file, unsigned long pos, REP_HE
break;
case -1:
{
char err_msg[STRERROR_BUFLEN];
char err_msg[MXS_STRERROR_BUFLEN];
snprintf(errmsg, BINLOG_ERROR_MSG_LEN,
"Failed to reread header in binlog file '%s'; (%s), event at %lu",
file->binlogname, strerror_r(errno, err_msg, sizeof(err_msg)), pos);
@ -737,7 +737,7 @@ blr_read_binlog(ROUTER_INSTANCE *router, BLFILE *file, unsigned long pos, REP_HE
{
if (n == -1)
{
char err_msg[STRERROR_BUFLEN];
char err_msg[MXS_STRERROR_BUFLEN];
snprintf(errmsg, BINLOG_ERROR_MSG_LEN,
"Error reading the binlog event at %lu in binlog file '%s';"
"(%s), expected %d bytes.",
@ -1906,7 +1906,7 @@ blr_file_write_master_config(ROUTER_INSTANCE *router, char *error)
char filename[len + sizeof('/') + sizeof(MASTER_INI)]; // sizeof includes NULL
char tmp_file[len + sizeof('/') + sizeof(MASTER_INI) + sizeof('.') + sizeof(TMP)];
char err_msg[STRERROR_BUFLEN];
char err_msg[MXS_STRERROR_BUFLEN];
char *ssl_ca;
char *ssl_cert;
char *ssl_key;

12
server/modules/routing/binlog/blr_master.c
View File

@ -1291,7 +1291,7 @@ blr_handle_binlog_record(ROUTER_INSTANCE *router, GWBUF *pkt)
if (router->master_chksum)
{
uint32_t size = MIN(len - extra_bytes - semisync_bytes,
uint32_t size = MXS_MIN(len - extra_bytes - semisync_bytes,
router->checksum_size);
router->stored_checksum = crc32(router->stored_checksum,
@ -1342,7 +1342,7 @@ blr_handle_binlog_record(ROUTER_INSTANCE *router, GWBUF *pkt)
size = len - (check_packet_len + MYSQL_CHECKSUM_LEN);
}
size = MIN(size, router->checksum_size);
size = MXS_MIN(size, router->checksum_size);
if (router->checksum_size > 0)
{
@ -2454,7 +2454,7 @@ GWBUF
break;
case -1:
{
char err_msg[STRERROR_BUFLEN];
char err_msg[MXS_STRERROR_BUFLEN];
MXS_ERROR("Reading saved events: failed to read binlog "
"file %s at position %llu"
" (%s).", router->binlog_name,
@ -2514,7 +2514,7 @@ GWBUF
{
if (n == -1)
{
char err_msg[STRERROR_BUFLEN];
char err_msg[MXS_STRERROR_BUFLEN];
MXS_ERROR("Reading saved events: the event at %llu in %s. "
"%s, expected %d bytes.",
pos, router->binlog_name,
@ -2806,7 +2806,7 @@ blr_write_data_into_binlog(ROUTER_INSTANCE *router, uint32_t data_len, uint8_t *
if ((n = pwrite(router->binlog_fd, buf, data_len,
router->last_written)) != data_len)
{
char err_msg[STRERROR_BUFLEN];
char err_msg[MXS_STRERROR_BUFLEN];
MXS_ERROR("%s: Failed to write binlog record at %lu of %s, %s. "
"Truncating to previous record.",
router->service->name, router->last_written,
@ -2934,7 +2934,7 @@ bool blr_send_event(blr_thread_role_t role,
while (rval && len > 0)
{
uint64_t payload_len = first ? MYSQL_PACKET_LENGTH_MAX - 1 :
MIN(MYSQL_PACKET_LENGTH_MAX, len);
MXS_MIN(MYSQL_PACKET_LENGTH_MAX, len);
if (blr_send_packet(slave, buf, payload_len, first))
{

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

@ -874,7 +874,7 @@ blr_slave_query(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, GWBUF *queue)
if (removed_cfg == -1)
{
char err_msg[STRERROR_BUFLEN];
char err_msg[MXS_STRERROR_BUFLEN];
snprintf(error_string, BINLOG_ERROR_MSG_LEN,
"Error removing %s, %s, errno %u", path,
strerror_r(errno, err_msg, sizeof(err_msg)), errno);

2
server/modules/routing/cli/cli.c
View File

@ -272,7 +272,7 @@ execute(ROUTER *instance, void *router_session, GWBUF *queue)
{
const char* data = GWBUF_DATA(queue);
int len = GWBUF_LENGTH(queue);
int n = MIN(len, CMDBUFLEN - cmdlen - 1);
int n = MXS_MIN(len, CMDBUFLEN - cmdlen - 1);
if (n != len)
{

2
server/modules/routing/debugcli/debugcli.c
View File

@ -293,7 +293,7 @@ execute(ROUTER *instance, void *router_session, GWBUF *queue)
{
const char* data = GWBUF_DATA(queue);
int len = GWBUF_LENGTH(queue);
int n = MIN(len, CMDBUFLEN - cmdlen - 1);
int n = MXS_MIN(len, CMDBUFLEN - cmdlen - 1);
if (n != len)
{

6
server/modules/routing/debugcli/debugcmd.c
View File

@ -1051,7 +1051,7 @@ execute_cmd(CLI_SESSION *cli)
}
}
*lptr = 0;
args[MIN(MAXARGS - 1, i + 1)] = NULL;
args[MXS_MIN(MAXARGS - 1, i + 1)] = NULL;
if (args[0] == NULL || *args[0] == 0)
{
@ -1964,9 +1964,9 @@ static void fail_accept(
char* arg1,
char* arg2)
{
int failcount = MIN(atoi(arg2), 100);
int failcount = MXS_MIN(atoi(arg2), 100);
fail_accept_errno = atoi(arg1);
char errbuf[STRERROR_BUFLEN];
char errbuf[MXS_STRERROR_BUFLEN];
switch(fail_accept_errno) {
case EAGAIN:

6
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -559,7 +559,7 @@ static void *newSession(ROUTER *router_inst, SESSION *session)
{
int n_conn = 0;
double pct = (double)client_rses->rses_config.rw_max_slave_conn_percent / 100.0;
n_conn = MAX(floor((double)client_rses->rses_nbackends * pct), 1);
n_conn = MXS_MAX(floor((double)client_rses->rses_nbackends * pct), 1);
client_rses->rses_config.rw_max_slave_conn_count = n_conn;
}
@ -1294,7 +1294,7 @@ int rses_get_max_slavecount(ROUTER_CLIENT_SES *rses,
{
conf_max_nslaves = (router_nservers * rses->rses_config.rw_max_slave_conn_percent) / 100;
}
max_nslaves = MIN(router_nservers - 1, MAX(1, conf_max_nslaves));
max_nslaves = MXS_MIN(router_nservers - 1, MXS_MAX(1, conf_max_nslaves));
return max_nslaves;
}
@ -1897,7 +1897,7 @@ static bool have_enough_servers(ROUTER_CLIENT_SES **p_rses, const int min_nsrv,
/** With too few servers session is not created */
if (router_nsrv < min_nsrv ||
MAX((*p_rses)->rses_config.rw_max_slave_conn_count,
MXS_MAX((*p_rses)->rses_config.rw_max_slave_conn_count,
(router_nsrv * (*p_rses)->rses_config.rw_max_slave_conn_percent) /
100) < min_nsrv)
{

4
server/modules/routing/readwritesplit/rwsplit_mysql.c
View File

@ -163,10 +163,10 @@ log_transaction_status(ROUTER_CLIENT_SES *rses, GWBUF *querybuf, qc_query_type_t
{
uint8_t *packet = GWBUF_DATA(querybuf);
unsigned char ptype = packet[4];
size_t len = MIN(GWBUF_LENGTH(querybuf),
size_t len = MXS_MIN(GWBUF_LENGTH(querybuf),
MYSQL_GET_PACKET_LEN((unsigned char *)querybuf->start) - 1);
char *data = (char *)&packet[5];
char *contentstr = strndup(data, MIN(len, RWSPLIT_TRACE_MSG_LEN));
char *contentstr = strndup(data, MXS_MIN(len, RWSPLIT_TRACE_MSG_LEN));
char *qtypestr = qc_get_qtype_str(qtype);
MXS_INFO("> Autocommit: %s, trx is %s, cmd: %s, type: %s, stmt: %s%s %s",
(rses->rses_autocommit_enabled ? "[enabled]" : "[disabled]"),

2
server/modules/routing/schemarouter/schemarouter.c
View File

@ -2004,7 +2004,7 @@ static int routeQuery(ROUTER* instance,
{
uint8_t* packet = GWBUF_DATA(querybuf);
unsigned char ptype = packet[4];
size_t len = MIN(GWBUF_LENGTH(querybuf),
size_t len = MXS_MIN(GWBUF_LENGTH(querybuf),
MYSQL_GET_PACKET_LEN((unsigned char *)querybuf->start) - 1);
char* data = (char*)&packet[5];
char* contentstr = strndup(data, len);