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

Resolve compiler warnings

Browse Source
This commit is contained in:
counterpoint
2015-07-08 11:35:41 +01:00
parent 77db46359e
commit 10d690273d
5 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/core/adminusers.c
View File

@ -19,7 +19,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#define _XOPEN_SOURCE
#include <unistd.h> #include <unistd.h>
#include <crypt.h> #include <crypt.h>
#include <users.h> #include <users.h>

2
server/core/config.c
View File

@ -310,7 +310,7 @@ if((monitorhash = hashtable_alloc(5,simple_str_hash,strcmp)) == NULL)
return 0; return 0;
} }
hashtable_memory_fns(monitorhash,strdup,NULL,free,NULL); hashtable_memory_fns(monitorhash,(HASHMEMORYFN)strdup,NULL,(HASHMEMORYFN)free,NULL);
/** /**
* Process the data and create the services and servers defined * Process the data and create the services and servers defined
* in the data. * in the data.

2
server/modules/include/shardrouter.h
View File

@ -245,4 +245,6 @@ typedef struct router_instance {
#define BACKEND_TYPE(b) (SERVER_IS_MASTER((b)->backend_server) ? BE_MASTER : \ #define BACKEND_TYPE(b) (SERVER_IS_MASTER((b)->backend_server) ? BE_MASTER : \
(SERVER_IS_SLAVE((b)->backend_server) ? BE_SLAVE : BE_UNDEFINED)); (SERVER_IS_SLAVE((b)->backend_server) ? BE_SLAVE : BE_UNDEFINED));
bool subsvc_is_valid(SUBSERVICE*);
#endif /*< _SHARDROUTER_H */ #endif /*< _SHARDROUTER_H */

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

@ -3554,7 +3554,6 @@ static rses_property_t* rses_property_init(
prop->rses_prop_chk_tail = CHK_NUM_ROUTER_PROPERTY; prop->rses_prop_chk_tail = CHK_NUM_ROUTER_PROPERTY;
#endif #endif
return_prop:
CHK_RSES_PROP(prop); CHK_RSES_PROP(prop);
return prop; return prop;
} }

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

@ -319,7 +319,7 @@ parse_mapping_response(ROUTER_CLIENT_SES* rses, char* target, GWBUF* buf)
if(PTR_IS_RESULTSET(((unsigned char*)buf->start)) && if(PTR_IS_RESULTSET(((unsigned char*)buf->start)) &&
modutil_count_signal_packets(buf,0,0,&more) == 2) modutil_count_signal_packets(buf,0,0,&more) == 2)
{ {
ptr = (char*)buf->start; ptr = (unsigned char*)buf->start;
if(ptr[5] != 1) if(ptr[5] != 1)
{ {