Skip to content

Commit

Permalink
Remove text for assert
Browse files Browse the repository at this point in the history
  • Loading branch information
@MaJerle
MaJerle committed Sep 13, 2022
1 parent 95ff0aa commit 005146d
Show file tree
Hide file tree
Showing 20 changed files with 145 additions and 146 deletions.
64 changes: 32 additions & 32 deletions lwesp/src/api/lwesp_netconn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ lwesp_netconn_new(lwesp_netconn_type_t type) {
*/
lwespr_t
lwesp_netconn_delete(lwesp_netconn_p nc) {
LWESP_ASSERT("netconn != NULL", nc != NULL);
LWESP_ASSERT(nc != NULL);

lwesp_core_lock();
flush_mboxes(nc, 0); /* Clear mboxes */
Expand Down Expand Up @@ -384,9 +384,9 @@ lwespr_t
lwesp_netconn_connect(lwesp_netconn_p nc, const char* host, lwesp_port_t port) {
lwespr_t res;

LWESP_ASSERT("nc != NULL", nc != NULL);
LWESP_ASSERT("host != NULL", host != NULL);
LWESP_ASSERT("port > 0", port > 0);
LWESP_ASSERT(nc != NULL);
LWESP_ASSERT(host != NULL);
LWESP_ASSERT(port > 0);

/*
* Start a new connection as client and:
Expand Down Expand Up @@ -416,9 +416,9 @@ lwesp_netconn_connect_ex(lwesp_netconn_p nc, const char* host, lwesp_port_t port
lwesp_conn_start_t cs = {0};
lwespr_t res;

LWESP_ASSERT("nc != NULL", nc != NULL);
LWESP_ASSERT("host != NULL", host != NULL);
LWESP_ASSERT("port > 0", port > 0);
LWESP_ASSERT(nc != NULL);
LWESP_ASSERT(host != NULL);
LWESP_ASSERT(port > 0);

/*
* Start a new connection as client and:
Expand Down Expand Up @@ -451,7 +451,7 @@ lwespr_t
lwesp_netconn_bind(lwesp_netconn_p nc, lwesp_port_t port) {
lwespr_t res = lwespOK;

LWESP_ASSERT("nc != NULL", nc != NULL);
LWESP_ASSERT(nc != NULL);

/*
* Protection is not needed as it is expected
Expand All @@ -477,7 +477,7 @@ lwesp_netconn_bind(lwesp_netconn_p nc, lwesp_port_t port) {
lwespr_t
lwesp_netconn_set_listen_conn_timeout(lwesp_netconn_p nc, uint16_t timeout) {
lwespr_t res = lwespOK;
LWESP_ASSERT("nc != NULL", nc != NULL);
LWESP_ASSERT(nc != NULL);

/*
* Protection is not needed as it is expected
Expand Down Expand Up @@ -512,8 +512,8 @@ lwespr_t
lwesp_netconn_listen_with_max_conn(lwesp_netconn_p nc, uint16_t max_connections) {
lwespr_t res;

LWESP_ASSERT("nc != NULL", nc != NULL);
LWESP_ASSERT("nc->type must be TCP", NETCONN_IS_TCP(nc));
LWESP_ASSERT(nc != NULL);
LWESP_ASSERT(NETCONN_IS_TCP(nc));

/* Enable server on port and set default netconn callback */
if ((res = lwesp_set_server(1, nc->listen_port, LWESP_U16(LWESP_MIN(max_connections, LWESP_CFG_MAX_CONNS)),
Expand All @@ -537,10 +537,10 @@ lwesp_netconn_accept(lwesp_netconn_p nc, lwesp_netconn_p* client) {
lwesp_netconn_t* tmp;
uint32_t time;

LWESP_ASSERT("nc != NULL", nc != NULL);
LWESP_ASSERT("client != NULL", client != NULL);
LWESP_ASSERT("nc->type must be TCP", NETCONN_IS_TCP(nc));
LWESP_ASSERT("nc == listen_api", nc == listen_api);
LWESP_ASSERT(nc != NULL);
LWESP_ASSERT(client != NULL);
LWESP_ASSERT(NETCONN_IS_TCP(nc));
LWESP_ASSERT(nc == listen_api);

*client = NULL;
time = lwesp_sys_mbox_get(&nc->mbox_accept, (void**)&tmp, 0);
Expand Down Expand Up @@ -576,9 +576,9 @@ lwesp_netconn_write(lwesp_netconn_p nc, const void* data, size_t btw) {
const uint8_t* d = data;
lwespr_t res;

LWESP_ASSERT("nc != NULL", nc != NULL);
LWESP_ASSERT("nc->type must be TCP or SSL", NETCONN_IS_TCP(nc) || NETCONN_IS_SSL(nc));
LWESP_ASSERT("nc->conn must be active", lwesp_conn_is_active(nc->conn));
LWESP_ASSERT(nc != NULL);
LWESP_ASSERT(NETCONN_IS_TCP(nc) || NETCONN_IS_SSL(nc));
LWESP_ASSERT(lwesp_conn_is_active(nc->conn));

/*
* Several steps are done in write process
Expand Down Expand Up @@ -654,9 +654,9 @@ lwesp_netconn_write(lwesp_netconn_p nc, const void* data, size_t btw) {
*/
lwespr_t
lwesp_netconn_flush(lwesp_netconn_p nc) {
LWESP_ASSERT("nc != NULL", nc != NULL);
LWESP_ASSERT("nc->type must be TCP or SSL", NETCONN_IS_TCP(nc) || NETCONN_IS_SSL(nc));
LWESP_ASSERT("nc->conn must be active", lwesp_conn_is_active(nc->conn));
LWESP_ASSERT(nc != NULL);
LWESP_ASSERT(NETCONN_IS_TCP(nc) || NETCONN_IS_SSL(nc));
LWESP_ASSERT(lwesp_conn_is_active(nc->conn));

/*
* In case we have data in write buffer,
Expand All @@ -680,9 +680,9 @@ lwesp_netconn_flush(lwesp_netconn_p nc) {
*/
lwespr_t
lwesp_netconn_send(lwesp_netconn_p nc, const void* data, size_t btw) {
LWESP_ASSERT("nc != NULL", nc != NULL);
LWESP_ASSERT("nc->type must be UDP", nc->type == LWESP_NETCONN_TYPE_UDP);
LWESP_ASSERT("nc->conn must be active", lwesp_conn_is_active(nc->conn));
LWESP_ASSERT(nc != NULL);
LWESP_ASSERT(nc->type == LWESP_NETCONN_TYPE_UDP);
LWESP_ASSERT(lwesp_conn_is_active(nc->conn));

return lwesp_conn_send(nc->conn, data, btw, NULL, 1);
}
Expand All @@ -699,9 +699,9 @@ lwesp_netconn_send(lwesp_netconn_p nc, const void* data, size_t btw) {
*/
lwespr_t
lwesp_netconn_sendto(lwesp_netconn_p nc, const lwesp_ip_t* ip, lwesp_port_t port, const void* data, size_t btw) {
LWESP_ASSERT("nc != NULL", nc != NULL);
LWESP_ASSERT("nc->type must be UDP", nc->type == LWESP_NETCONN_TYPE_UDP);
LWESP_ASSERT("nc->conn must be active", lwesp_conn_is_active(nc->conn));
LWESP_ASSERT(nc != NULL);
LWESP_ASSERT(nc->type == LWESP_NETCONN_TYPE_UDP);
LWESP_ASSERT(lwesp_conn_is_active(nc->conn));

return lwesp_conn_sendto(nc->conn, ip, port, data, btw, NULL, 1);
}
Expand All @@ -718,8 +718,8 @@ lwesp_netconn_sendto(lwesp_netconn_p nc, const lwesp_ip_t* ip, lwesp_port_t port
*/
lwespr_t
lwesp_netconn_receive(lwesp_netconn_p nc, lwesp_pbuf_p* pbuf) {
LWESP_ASSERT("nc != NULL", nc != NULL);
LWESP_ASSERT("pbuf != NULL", pbuf != NULL);
LWESP_ASSERT(nc != NULL);
LWESP_ASSERT(pbuf != NULL);

*pbuf = NULL;
#if LWESP_CFG_NETCONN_RECEIVE_TIMEOUT
Expand Down Expand Up @@ -767,9 +767,9 @@ lwespr_t
lwesp_netconn_close(lwesp_netconn_p nc) {
lwesp_conn_p conn;

LWESP_ASSERT("nc != NULL", nc != NULL);
LWESP_ASSERT("nc->conn != NULL", nc->conn != NULL);
LWESP_ASSERT("nc->conn must be active", lwesp_conn_is_active(nc->conn));
LWESP_ASSERT(nc != NULL);
LWESP_ASSERT(nc->conn != NULL);
LWESP_ASSERT(lwesp_conn_is_active(nc->conn));

lwesp_netconn_flush(nc); /* Flush data and ignore result */
conn = nc->conn;
Expand Down
50 changes: 24 additions & 26 deletions lwesp/src/apps/cayenne/lwesp_cayenne.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,9 @@ lwesp_cayenne_parse_topic(lwesp_cayenne_t* c, const char* topic, size_t topic_le
lwesp_cayenne_msg_t* msg;
size_t len;

LWESP_ASSERT("c != NULL", c != NULL);
LWESP_ASSERT("topic != NULL", topic != NULL);
LWESP_ASSERT("topic_len > 0", topic_len > 0);
LWESP_ASSERT(c != NULL);
LWESP_ASSERT(topic != NULL);
LWESP_ASSERT(topic_len > 0);

LWESP_DEBUGF(LWESP_CFG_DBG_CAYENNE_TRACE, "[LWESP CAYENNE] Parsing received topic: %.*s\r\n", (int)topic_len,
topic);
Expand Down Expand Up @@ -205,9 +205,9 @@ static lwespr_t
lwesp_cayenne_parse_payload(lwesp_cayenne_t* c, const char* payload, size_t payload_len) {
lwesp_cayenne_msg_t* msg;

LWESP_ASSERT("c != NULL", c != NULL);
LWESP_ASSERT("payload != NULL", payload != NULL);
LWESP_ASSERT("payload_len > 0", payload_len > 0);
LWESP_ASSERT(c != NULL);
LWESP_ASSERT(payload != NULL);
LWESP_ASSERT(payload_len > 0);

LWESP_DEBUGF(LWESP_CFG_DBG_CAYENNE_TRACE, "[LWESP CAYENNE] Parsing received payload: %.*s\r\n", (int)payload_len,
payload);
Expand Down Expand Up @@ -265,10 +265,10 @@ lwesp_cayenne_build_topic(lwesp_cayenne_t* c, char* topic_str, size_t topic_str_
size_t rem_len;
char ch_token[6];

LWESP_ASSERT("c != NULL", c != NULL);
LWESP_ASSERT("topic_str != NULL", topic_str != NULL);
LWESP_ASSERT("topic_str_len > 0", topic_str_len > 0);
LWESP_ASSERT("topic < LWESP_CAYENNE_TOPIC_END", topic < LWESP_CAYENNE_TOPIC_END);
LWESP_ASSERT(c != NULL);
LWESP_ASSERT(topic_str != NULL);
LWESP_ASSERT(topic_str_len > 0);
LWESP_ASSERT(topic < LWESP_CAYENNE_TOPIC_END);

/*
* Assert for basic part without topic
Expand All @@ -279,9 +279,8 @@ lwesp_cayenne_build_topic(lwesp_cayenne_t* c, char* topic_str, size_t topic_str_
*
* Number 11 contains: "/" + "/things/" + "/" + NULL termination
*/
LWESP_ASSERT("topic_str_len > min_string_length",
topic_str_len
> (strlen(LWESP_CAYENNE_API_VERSION) + strlen(c->info_c->user) + strlen(c->info_c->id) + 11));
LWESP_ASSERT(topic_str_len
> (strlen(LWESP_CAYENNE_API_VERSION) + strlen(c->info_c->user) + strlen(c->info_c->id) + 11));
topic_str[0] = 0;

/* Base part */
Expand All @@ -296,8 +295,7 @@ lwesp_cayenne_build_topic(lwesp_cayenne_t* c, char* topic_str, size_t topic_str_
/* Topic string */
for (size_t i = 0; i < LWESP_ARRAYSIZE(topic_cmd_str_pairs); ++i) {
if (topic == topic_cmd_str_pairs[i].topic) {
LWESP_ASSERT("strlen(topic_cmd_str_pairs[i].str) <= rem_len",
strlen(topic_cmd_str_pairs[i].str) <= rem_len);
LWESP_ASSERT(strlen(topic_cmd_str_pairs[i].str) <= rem_len);
strcat(topic_str, topic_cmd_str_pairs[i].str);
break;
}
Expand All @@ -307,13 +305,13 @@ lwesp_cayenne_build_topic(lwesp_cayenne_t* c, char* topic_str, size_t topic_str_
/* Append channel if necessary */
if (channel != LWESP_CAYENNE_NO_CHANNEL) {
if (channel == LWESP_CAYENNE_ALL_CHANNELS) {
LWESP_ASSERT("rem_len >= 2", rem_len >= 2);
LWESP_ASSERT(rem_len >= 2);
strcat(topic_str, "/+");
} else {
LWESP_ASSERT("rem_len >= 1", rem_len >= 1);
LWESP_ASSERT(rem_len >= 1);
lwesp_u16_to_str(channel, ch_token);
strcat(topic_str, "/");
LWESP_ASSERT("strlen(ch_token) <= rem_len", strlen(ch_token) <= rem_len - 1);
LWESP_ASSERT(strlen(ch_token) <= rem_len - 1);
strcat(topic_str, ch_token);
}
}
Expand Down Expand Up @@ -617,9 +615,9 @@ lwesp_cayenne_init(void) {
*/
lwespr_t
lwesp_cayenne_create(lwesp_cayenne_t* c, const lwesp_mqtt_client_info_t* client_info, lwesp_cayenne_evt_fn evt_fn) {
LWESP_ASSERT("c != NULL", c != NULL);
LWESP_ASSERT("client_info != NULL", client_info != NULL);
LWESP_ASSERT("evt_fn != NULL", evt_fn != NULL);
LWESP_ASSERT(c != NULL);
LWESP_ASSERT(client_info != NULL);
LWESP_ASSERT(evt_fn != NULL);

c->next = NULL;
c->info_c = client_info;
Expand Down Expand Up @@ -672,7 +670,7 @@ lwesp_cayenne_create(lwesp_cayenne_t* c, const lwesp_mqtt_client_info_t* client_
lwespr_t
lwesp_cayenne_connect(lwesp_cayenne_t* c) {
lwespr_t res;
LWESP_ASSERT("c != NULL", c != NULL);
LWESP_ASSERT(c != NULL);

lwesp_sys_protect();
if (lwesp_mqtt_client_is_connected(c->mqtt_client)) {
Expand All @@ -697,8 +695,8 @@ lwespr_t
lwesp_cayenne_publish_ex(lwesp_cayenne_t* c, const lwesp_cayenne_tx_msg_t* tx_msg) {
lwespr_t res = lwespOK;

LWESP_ASSERT("c != NULL", c != NULL);
LWESP_ASSERT("tx_msg != NULL", tx_msg != NULL);
LWESP_ASSERT(c != NULL);
LWESP_ASSERT(tx_msg != NULL);

lwesp_sys_protect();
if (lwesp_buff_get_free(&c->tx_buff) >= sizeof(*tx_msg)) {
Expand Down Expand Up @@ -726,8 +724,8 @@ lwesp_cayenne_publish_response(lwesp_cayenne_t* c, lwesp_cayenne_msg_t* msg, lwe
const char* message) {
lwespr_t res;

LWESP_ASSERT("c != NULL", c != NULL);
LWESP_ASSERT("msg != NULL && msg->seq != NULL", msg != NULL && msg->seq != NULL);
LWESP_ASSERT(c != NULL);
LWESP_ASSERT(msg != NULL && msg->seq != NULL);

lwesp_sys_protect();
if ((res = lwesp_cayenne_build_topic(c, topic_name, sizeof(topic_name), LWESP_CAYENNE_TOPIC_RESPONSE,
Expand Down
12 changes: 6 additions & 6 deletions lwesp/src/apps/mqtt/lwesp_mqtt_client.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ prv_sub_unsub(lwesp_mqtt_client_p client, const char* topic, lwesp_mqtt_qos_t qo
uint16_t len_topic, pkt_id;
uint8_t ret = 0;

LWESP_ASSERT("client != NULL", client != NULL);
LWESP_ASSERT(client != NULL);

if ((len_topic = LWESP_U16(strlen(topic))) == 0) {
return 0;
Expand Down Expand Up @@ -1145,10 +1145,10 @@ lwesp_mqtt_client_connect(lwesp_mqtt_client_p client, const char* host, lwesp_po
const lwesp_mqtt_client_info_t* info) {
lwespr_t res = lwespERR;

LWESP_ASSERT("client != NULL", client != NULL); /* t input parameters */
LWESP_ASSERT("host != NULL", host != NULL);
LWESP_ASSERT("port > 0", port > 0);
LWESP_ASSERT("info != NULL", info != NULL);
LWESP_ASSERT(client != NULL); /* t input parameters */
LWESP_ASSERT(host != NULL);
LWESP_ASSERT(port > 0);
LWESP_ASSERT(info != NULL);

lwesp_core_lock();
if (lwesp_sta_is_joined() && client->conn_state == LWESP_MQTT_CONN_DISCONNECTED) {
Expand Down Expand Up @@ -1229,7 +1229,7 @@ lwesp_mqtt_client_publish(lwesp_mqtt_client_p client, const char* topic, const v
uint16_t len_topic, pkt_id;
uint8_t qos_u8 = LWESP_U8(qos);

LWESP_ASSERT("client != NULL", client != NULL);
LWESP_ASSERT(client != NULL);
if ((len_topic = LWESP_U16(strlen(topic))) == 0) { /* Topic length */
return lwespERR;
}
Expand Down
22 changes: 11 additions & 11 deletions lwesp/src/apps/mqtt/lwesp_mqtt_client_api.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ lwespr_t
lwesp_mqtt_client_api_close(lwesp_mqtt_client_api_p client) {
lwespr_t res = lwespERR;

LWESP_ASSERT("client != NULL", client != NULL);
LWESP_ASSERT(client != NULL);

lwesp_sys_mutex_lock(&client->mutex);
lwesp_sys_sem_wait(&client->sync_sem, 0);
Expand Down Expand Up @@ -335,8 +335,8 @@ lwespr_t
lwesp_mqtt_client_api_subscribe(lwesp_mqtt_client_api_p client, const char* topic, lwesp_mqtt_qos_t qos) {
lwespr_t res = lwespERR;

LWESP_ASSERT("client != NULL", client != NULL);
LWESP_ASSERT("topic != NULL", topic != NULL);
LWESP_ASSERT(client != NULL);
LWESP_ASSERT(topic != NULL);

lwesp_sys_mutex_lock(&client->mutex);
lwesp_sys_sem_wait(&client->sync_sem, 0);
Expand Down Expand Up @@ -364,8 +364,8 @@ lwespr_t
lwesp_mqtt_client_api_unsubscribe(lwesp_mqtt_client_api_p client, const char* topic) {
lwespr_t res = lwespERR;

LWESP_ASSERT("client != NULL", client != NULL);
LWESP_ASSERT("topic != NULL", topic != NULL);
LWESP_ASSERT(client != NULL);
LWESP_ASSERT(topic != NULL);

lwesp_sys_mutex_lock(&client->mutex);
lwesp_sys_sem_wait(&client->sync_sem, 0);
Expand Down Expand Up @@ -398,10 +398,10 @@ lwesp_mqtt_client_api_publish(lwesp_mqtt_client_api_p client, const char* topic,
lwesp_mqtt_qos_t qos, uint8_t retain) {
lwespr_t res = lwespERR;

LWESP_ASSERT("client != NULL", client != NULL);
LWESP_ASSERT("topic != NULL", topic != NULL);
LWESP_ASSERT("data != NULL", data != NULL);
LWESP_ASSERT("btw > 0", btw > 0);
LWESP_ASSERT(client != NULL);
LWESP_ASSERT(topic != NULL);
LWESP_ASSERT(data != NULL);
LWESP_ASSERT(btw > 0);

lwesp_sys_mutex_lock(&client->mutex);
lwesp_sys_sem_wait(&client->sync_sem, 0);
Expand Down Expand Up @@ -449,8 +449,8 @@ lwesp_mqtt_client_api_is_connected(lwesp_mqtt_client_api_p client) {
*/
lwespr_t
lwesp_mqtt_client_api_receive(lwesp_mqtt_client_api_p client, lwesp_mqtt_client_api_buf_p* p, uint32_t timeout) {
LWESP_ASSERT("client != NULL", client != NULL);
LWESP_ASSERT("p != NULL", p != NULL);
LWESP_ASSERT(client != NULL);
LWESP_ASSERT(p != NULL);

*p = NULL;

Expand Down
7 changes: 3 additions & 4 deletions lwesp/src/include/lwesp/lwesp_utils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,13 @@ extern "C" {
/**
* \brief Assert an input parameter if in valid range
* \note Since this is a macro, it may only be used on a functions where return status is of type \ref lwespr_t enumeration
* \param[in] msg: message to print to debug if test fails
* \param[in] c: Condition to test
*/
#define LWESP_ASSERT(msg, c) \
#define LWESP_ASSERT(c) \
do { \
if (!(c)) { \
LWESP_DEBUGF(LWESP_CFG_DBG_ASSERT, "Wrong parameters on file %s and line %d: %s\r\n", __FILE__, \
(int)__LINE__, msg); \
LWESP_DEBUGF(LWESP_CFG_DBG_ASSERT, "Assert failed in file %s on line %d: %s\r\n", __FILE__, (int)__LINE__, \
#c); \
return lwespPARERR; \
} \
} while (0)
Expand Down

0 comments on commit 005146d

Please sign in to comment.