Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-30 00:00:16 +01:00
Code Issues Releases Wiki Activity

mqtt: some toolchains object to typedef

Browse source 
Use struct type instead of typedef to avoid it.
This commit is contained in:
Sakthi Kannan Ramabadran 2020-04-27 19:42:55 +01:00 • committed by Andy Green
parent 79ef48e33c
commit abf3875d78
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/roles/mqtt/private-lib-roles-mqtt.h
View file

@ -25,8 +25,6 @@
#ifndef _PRIVATE_LIB_ROLES_MQTT #ifndef _PRIVATE_LIB_ROLES_MQTT
#define _PRIVATE_LIB_ROLES_MQTT 1 #define _PRIVATE_LIB_ROLES_MQTT 1
#include <libwebsockets/lws-mqtt.h>
extern struct lws_role_ops role_ops_mqtt; extern struct lws_role_ops role_ops_mqtt;
#define lwsi_role_mqtt(wsi) (wsi->role_ops == &role_ops_mqtt) #define lwsi_role_mqtt(wsi) (wsi->role_ops == &role_ops_mqtt)
@ -115,7 +113,7 @@ lws_mqtt_vbi_r(lws_mqtt_vbi *vbi, const uint8_t **in, size_t *len);
lws_mqtt_stateful_primitive_return_t lws_mqtt_stateful_primitive_return_t
lws_mqtt_mb_parse(lws_mqtt_vbi *vbi, const uint8_t **in, size_t *len); lws_mqtt_mb_parse(lws_mqtt_vbi *vbi, const uint8_t **in, size_t *len);
typedef struct lws_mqtt_str_st { struct lws_mqtt_str_st {
uint8_t *buf; uint8_t *buf;
uint16_t len; uint16_t len;
@ -124,14 +122,14 @@ typedef struct lws_mqtt_str_st {
uint16_t pos; uint16_t pos;
char len_valid; char len_valid;
char needs_freeing; char needs_freeing;
} lws_mqtt_str_t; };
static inline int static inline int
lws_mqtt_str_first(lws_mqtt_str_t *s) { return !s->buf && !s->pos; } lws_mqtt_str_first(struct lws_mqtt_str_st *s) { return !s->buf && !s->pos; }
lws_mqtt_stateful_primitive_return_t lws_mqtt_stateful_primitive_return_t
lws_mqtt_str_parse(lws_mqtt_str_t *bd, const uint8_t **in, size_t *len); lws_mqtt_str_parse(struct lws_mqtt_str_st *bd, const uint8_t **in, size_t *len);
typedef enum { typedef enum {
LMQCPP_IDLE, LMQCPP_IDLE,
@ -251,7 +249,7 @@ typedef enum {
} lwsgs_mqtt_states_t; } lwsgs_mqtt_states_t;
typedef struct lws_mqtt_parser_st { typedef struct lws_mqtt_parser_st {
/* lws_mqtt_str_t s_content_type; */ /* struct lws_mqtt_str_st s_content_type; */
lws_mqtt_packet_parse_state_t state; lws_mqtt_packet_parse_state_t state;
lws_mqtt_vbi vbit; lws_mqtt_vbi vbit;
@ -308,12 +306,12 @@ typedef struct lws_mqtts {
typedef struct lws_mqttc { typedef struct lws_mqttc {
lws_mqtt_parser_t par; lws_mqtt_parser_t par;
lwsgs_mqtt_states_t estate; lwsgs_mqtt_states_t estate;
lws_mqtt_str_t *id; struct lws_mqtt_str_st *id;
lws_mqtt_str_t *username; struct lws_mqtt_str_st *username;
lws_mqtt_str_t *password; struct lws_mqtt_str_st *password;
struct { struct {
lws_mqtt_str_t *topic; struct lws_mqtt_str_st *topic;
lws_mqtt_str_t *message; struct lws_mqtt_str_st *message;
lws_mqtt_qos_levels_t qos; lws_mqtt_qos_levels_t qos;
uint8_t retain; uint8_t retain;
} will; } will;