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

Merge branch 'hartmut-compile-warnings' of https://github.com/hholzgra/MaxScale into hholzgra-hartmut-compile-warnings

Browse Source
This commit is contained in:
Mark Riddoch
2014-09-19 17:34:48 +01:00
parent 24e16e97ed 25c5d1af25
commit 13ec9a4073
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
log_manager/log_manager.cc
View File

@ -249,7 +249,7 @@ static int logmanager_write_log(
bool use_valist, bool use_valist,
bool spread_down, bool spread_down,
size_t len, size_t len,
char* str, const char* str,
va_list valist); va_list valist);
static blockbuf_t* blockbuf_init(logfile_id_t id); static blockbuf_t* blockbuf_init(logfile_id_t id);
@ -603,7 +603,7 @@ static int logmanager_write_log(
bool use_valist, bool use_valist,
bool spread_down, bool spread_down,
size_t str_len, size_t str_len,
char* str, const char* str,
va_list valist) va_list valist)
{ {
logfile_t* lf; logfile_t* lf;
@ -617,7 +617,7 @@ static int logmanager_write_log(
CHK_LOGMANAGER(lm); CHK_LOGMANAGER(lm);
if (id < LOGFILE_FIRST || id > LOGFILE_LAST) { if (id < LOGFILE_FIRST || id > LOGFILE_LAST) {
char* errstr = "Invalid logfile id argument."; const char* errstr = "Invalid logfile id argument.";
/** /**
* invalid id, since we don't have logfile yet. * invalid id, since we don't have logfile yet.
*/ */
@ -1092,7 +1092,7 @@ static bool logfile_set_enabled(
CHK_LOGMANAGER(lm); CHK_LOGMANAGER(lm);
if (id < LOGFILE_FIRST || id > LOGFILE_LAST) { if (id < LOGFILE_FIRST || id > LOGFILE_LAST) {
char* errstr = "Invalid logfile id argument."; const char* errstr = "Invalid logfile id argument.";
/** /**
* invalid id, since we don't have logfile yet. * invalid id, since we don't have logfile yet.
*/ */
@ -1146,7 +1146,7 @@ return_succp:
int skygw_log_write_flush( int skygw_log_write_flush(
logfile_id_t id, logfile_id_t id,
char* str, const char* str,
...) ...)
{ {
int err = 0; int err = 0;
@ -1199,7 +1199,7 @@ return_err:
int skygw_log_write( int skygw_log_write(
logfile_id_t id, logfile_id_t id,
char* str, const char* str,
...) ...)
{ {
int err = 0; int err = 0;

4
log_manager/log_manager.h
View File

@ -66,9 +66,9 @@ void skygw_logmanager_exit(void);
* free private write buffer list * free private write buffer list
*/ */
void skygw_log_done(void); void skygw_log_done(void);
int skygw_log_write(logfile_id_t id, char* format, ...); int skygw_log_write(logfile_id_t id, const char* format, ...);
int skygw_log_flush(logfile_id_t id); int skygw_log_flush(logfile_id_t id);
int skygw_log_write_flush(logfile_id_t id, char* format, ...); int skygw_log_write_flush(logfile_id_t id, const char* format, ...);
int skygw_log_enable(logfile_id_t id); int skygw_log_enable(logfile_id_t id);
int skygw_log_disable(logfile_id_t id); int skygw_log_disable(logfile_id_t id);

2
server/core/dcb.c
View File

@ -1772,7 +1772,7 @@ int rval = 1;
* @return Non-zero (true) if the callback was removed * @return Non-zero (true) if the callback was removed
*/ */
int int
dcb_remove_callback(DCB *dcb, DCB_REASON reason, int (*callback)(struct dcb *, DCB_REASON), void *userdata) dcb_remove_callback(DCB *dcb, DCB_REASON reason, int (*callback)(struct dcb *, DCB_REASON, void *), void *userdata)
{ {
DCB_CALLBACK *cb, *pcb = NULL; DCB_CALLBACK *cb, *pcb = NULL;
int rval = 0; int rval = 0;

2
server/include/dcb.h
View File

@ -289,7 +289,7 @@ void dcb_hashtable_stats(DCB *, void *); /**< Print statisitics */
void dcb_add_to_zombieslist(DCB* dcb); void dcb_add_to_zombieslist(DCB* dcb);
int dcb_add_callback(DCB *, DCB_REASON, int (*)(struct dcb *, DCB_REASON, void *), int dcb_add_callback(DCB *, DCB_REASON, int (*)(struct dcb *, DCB_REASON, void *),
void *); void *);
int dcb_remove_callback(DCB *, DCB_REASON, int (*)(struct dcb *, DCB_REASON), int dcb_remove_callback(DCB *, DCB_REASON, int (*)(struct dcb *, DCB_REASON, void *),
void *); void *);
int dcb_isvalid(DCB *); /* Check the DCB is in the linked list */ int dcb_isvalid(DCB *); /* Check the DCB is in the linked list */