github
/
mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix client state conversion warnings.

Browse Source
pull/1920/head
Roger A. Light 5 years ago
parent 27967f8885
commit df1802d8f1
13 changed files with 20 additions and 44 deletions
Show Stats Download Patch File Download Diff File

10
lib/handle_ping.c
Unescape Escape View File

@ -39,12 +39,9 @@ Contributors:
int handle__pingreq(struct mosquitto *mosq)
{
int state;
assert(mosq);
state = mosquitto__get_state(mosq);
if(state != mosq_cs_active){
if(mosquitto__get_state(mosq) != mosq_cs_active){
return MOSQ_ERR_PROTOCOL;
}
@ -58,12 +55,9 @@ int handle__pingreq(struct mosquitto *mosq)
int handle__pingresp(struct mosquitto *mosq)
{
int state;
assert(mosq);
state = mosquitto__get_state(mosq);
if(state != mosq_cs_active){
if(mosquitto__get_state(mosq) != mosq_cs_active){
return MOSQ_ERR_PROTOCOL;
}

4
lib/handle_pubackcomp.c
Unescape Escape View File

@ -45,12 +45,10 @@ int handle__pubackcomp(struct mosquitto *mosq, const char *type)
int rc;
mosquitto_property *properties = NULL;
int qos;
int state;
assert(mosq);
state = mosquitto__get_state(mosq);
if(state != mosq_cs_active){
if(mosquitto__get_state(mosq) != mosq_cs_active){
return MOSQ_ERR_PROTOCOL;
}

4
lib/handle_publish.c
Unescape Escape View File

@ -42,12 +42,10 @@ int handle__publish(struct mosquitto *mosq)
uint16_t mid;
uint16_t slen;
mosquitto_property *properties = NULL;
int state;
assert(mosq);
state = mosquitto__get_state(mosq);
if(state != mosq_cs_active){
if(mosquitto__get_state(mosq) != mosq_cs_active){
return MOSQ_ERR_PROTOCOL;
}

4
lib/handle_pubrec.c
Unescape Escape View File

@ -43,12 +43,10 @@ int handle__pubrec(struct mosquitto *mosq)
uint16_t mid;
int rc;
mosquitto_property *properties = NULL;
int state;
assert(mosq);
state = mosquitto__get_state(mosq);
if(state != mosq_cs_active){
if(mosquitto__get_state(mosq) != mosq_cs_active){
return MOSQ_ERR_PROTOCOL;
}

4
lib/handle_pubrel.c
Unescape Escape View File

@ -47,12 +47,10 @@ int handle__pubrel(struct mosquitto *mosq)
#endif
int rc;
mosquitto_property *properties = NULL;
int state;
assert(mosq);
state = mosquitto__get_state(mosq);
if(state != mosq_cs_active){
if(mosquitto__get_state(mosq) != mosq_cs_active){
return MOSQ_ERR_PROTOCOL;
}

4
lib/handle_suback.c
Unescape Escape View File

@ -43,12 +43,10 @@ int handle__suback(struct mosquitto *mosq)
int i = 0;
int rc;
mosquitto_property *properties = NULL;
int state;
assert(mosq);
state = mosquitto__get_state(mosq);
if(state != mosq_cs_active){
if(mosquitto__get_state(mosq) != mosq_cs_active){
return MOSQ_ERR_PROTOCOL;
}

4
lib/handle_unsuback.c
Unescape Escape View File

@ -44,12 +44,10 @@ int handle__unsuback(struct mosquitto *mosq)
uint16_t mid;
int rc;
mosquitto_property *properties = NULL;
int state;
assert(mosq);
state = mosquitto__get_state(mosq);
if(state != mosq_cs_active){
if(mosquitto__get_state(mosq) != mosq_cs_active){
return MOSQ_ERR_PROTOCOL;
}

10
lib/loop.c
Unescape Escape View File

@ -49,9 +49,6 @@ int mosquitto_loop(struct mosquitto *mosq, int timeout, int max_packets)
char pairbuf;
int maxfd = 0;
time_t now;
#ifdef WITH_SRV
int state;
#endif
time_t timeout_ms;
if(!mosq || max_packets < 1) return MOSQ_ERR_INVAL;
@ -89,8 +86,7 @@ int mosquitto_loop(struct mosquitto *mosq, int timeout, int max_packets)
}else{
#ifdef WITH_SRV
if(mosq->achan){
state = mosquitto__get_state(mosq);
if(state == mosq_cs_connect_srv){
if(mosquitto__get_state(mosq) == mosq_cs_connect_srv){
rc = ares_fds(mosq->achan, &readfds, &writefds);
if(rc > maxfd){
maxfd = rc;
@ -252,7 +248,7 @@ int mosquitto_loop_forever(struct mosquitto *mosq, int timeout, int max_packets)
int run = 1;
int rc;
unsigned long reconnect_delay;
int state;
enum mosquitto_client_state state;
if(!mosq) return MOSQ_ERR_INVAL;
@ -338,7 +334,7 @@ int mosquitto_loop_misc(struct mosquitto *mosq)
static int mosquitto__loop_rc_handle(struct mosquitto *mosq, int rc)
{
int state;
enum mosquitto_client_state state;
if(rc){
net__socket_close(mosq);

8
lib/packet_mosq.c
Unescape Escape View File

@ -210,7 +210,7 @@ int packet__write(struct mosquitto *mosq)
{
ssize_t write_length;
struct mosquitto__packet *packet;
int state;
enum mosquitto_client_state state;
if(!mosq) return MOSQ_ERR_INVAL;
if(mosq->sock == INVALID_SOCKET) return MOSQ_ERR_NO_CONN;
@ -228,7 +228,7 @@ int packet__write(struct mosquitto *mosq)
state = mosquitto__get_state(mosq);
#if defined(WITH_TLS) && !defined(WITH_BROKER)
if((state == mosq_cs_connect_pending) || mosq->want_connect){
if(state == mosq_cs_connect_pending || mosq->want_connect){
#else
if(state == mosq_cs_connect_pending){
#endif
@ -328,7 +328,7 @@ int packet__read(struct mosquitto *mosq)
uint8_t byte;
ssize_t read_length;
int rc = 0;
int state;
enum mosquitto_client_state state;
if(!mosq){
return MOSQ_ERR_INVAL;
@ -363,7 +363,7 @@ int packet__read(struct mosquitto *mosq)
#ifdef WITH_BROKER
G_BYTES_RECEIVED_INC(1);
/* Clients must send CONNECT as their first command. */
if(!(mosq->bridge) && mosq->state == mosq_cs_connected && (byte&0xF0) != CMD_CONNECT){
if(!(mosq->bridge) && state == mosq_cs_connected && (byte&0xF0) != CMD_CONNECT){
return MOSQ_ERR_PROTOCOL;
}
#endif

4
lib/socks_mosq.c
Unescape Escape View File

@ -122,7 +122,7 @@ int socks5__send(struct mosquitto *mosq)
struct in6_addr addr_ipv6;
int ipv4_pton_result;
int ipv6_pton_result;
int state;
enum mosquitto_client_state state;
state = mosquitto__get_state(mosq);
@ -264,7 +264,7 @@ int socks5__read(struct mosquitto *mosq)
ssize_t len;
uint8_t *payload;
uint8_t i;
int state;
enum mosquitto_client_state state;
state = mosquitto__get_state(mosq);
if(state == mosq_cs_socks5_start){

4
lib/thread_mosq.c
Unescape Escape View File

@ -99,7 +99,6 @@ int mosquitto_loop_stop(struct mosquitto *mosq, bool force)
void *mosquitto__thread_main(void *obj)
{
struct mosquitto *mosq = obj;
int state;
#ifndef WIN32
struct timespec ts;
ts.tv_sec = 0;
@ -109,8 +108,7 @@ void *mosquitto__thread_main(void *obj)
if(!mosq) return NULL;
do{
state = mosquitto__get_state(mosq);
if(state == mosq_cs_new){
if(mosquitto__get_state(mosq) == mosq_cs_new){
#ifdef WIN32
Sleep(10);
#else

2
lib/util_mosq.c
Unescape Escape View File

@ -67,7 +67,7 @@ int mosquitto__check_keepalive(struct mosquitto *mosq)
#ifndef WITH_BROKER
int rc;
#endif
int state;
enum mosquitto_client_state state;
assert(mosq);
#ifdef WITH_BROKER

2
src/mosquitto_broker_internal.h
Unescape Escape View File

@ -374,7 +374,7 @@ struct mosquitto_msg_store{
uint16_t mid;
uint8_t qos;
bool retain;
uint8_t origin;
enum mosquitto_msg_origin origin;
};
struct mosquitto_client_msg{

Write Preview
Loading…
Cancel
Save