From a08adccfd57beee7d86704a60f3219b9c2a49038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Sj=C3=B6din?= Date: Tue, 11 Apr 2017 17:19:43 +0200 Subject: [PATCH] Untabify mqtt.c --- apps/mqtt/mqtt.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/apps/mqtt/mqtt.c b/apps/mqtt/mqtt.c index 9cf372fe6bc..43fac9db48c 100644 --- a/apps/mqtt/mqtt.c +++ b/apps/mqtt/mqtt.c @@ -130,7 +130,7 @@ typedef enum { /*---------------------------------------------------------------------------*/ /* Protothread send macros */ #define PT_MQTT_WRITE_BYTES(conn, data, len) \ - conn->out_write_pos = 0; \ + conn->out_write_pos = 0; \ while(write_bytes(conn, data, len)) { \ PT_WAIT_UNTIL(pt, (conn)->out_buffer_sent); \ } @@ -148,19 +148,19 @@ typedef enum { */ #define PT_MQTT_WAIT_SEND() \ do { \ - if (PROCESS_ERR_OK == \ + if (PROCESS_ERR_OK == \ process_post(PROCESS_CURRENT(), mqtt_continue_send_event, NULL)) { \ - do { \ - PROCESS_WAIT_EVENT(); \ - if(ev == mqtt_abort_now_event) { \ - conn->state = MQTT_CONN_STATE_ABORT_IMMEDIATE; \ - PT_INIT(&conn->out_proto_thread); \ - process_post(PROCESS_CURRENT(), ev, data); \ - } else if(ev >= mqtt_event_min && ev <= mqtt_event_max) { \ - process_post(PROCESS_CURRENT(), ev, data); \ - } \ - } while (ev != mqtt_continue_send_event); \ - } \ + do { \ + PROCESS_WAIT_EVENT(); \ + if(ev == mqtt_abort_now_event) { \ + conn->state = MQTT_CONN_STATE_ABORT_IMMEDIATE; \ + PT_INIT(&conn->out_proto_thread); \ + process_post(PROCESS_CURRENT(), ev, data); \ + } else if(ev >= mqtt_event_min && ev <= mqtt_event_max) { \ + process_post(PROCESS_CURRENT(), ev, data); \ + } \ + } while (ev != mqtt_continue_send_event); \ + } \ } while(0) /*---------------------------------------------------------------------------*/ static process_event_t mqtt_do_connect_tcp_event; @@ -1194,7 +1194,7 @@ PROCESS_THREAD(mqtt_process, ev, data) if(conn->out_buffer_sent == 1) { PT_INIT(&conn->out_proto_thread); while(conn->state != MQTT_CONN_STATE_ABORT_IMMEDIATE && - disconnect_pt(&conn->out_proto_thread, conn) < PT_EXITED) { + disconnect_pt(&conn->out_proto_thread, conn) < PT_EXITED) { PT_MQTT_WAIT_SEND(); } abort_connection(conn); @@ -1212,7 +1212,7 @@ PROCESS_THREAD(mqtt_process, ev, data) conn->state == MQTT_CONN_STATE_CONNECTED_TO_BROKER) { PT_INIT(&conn->out_proto_thread); while(conn->state == MQTT_CONN_STATE_CONNECTED_TO_BROKER && - pingreq_pt(&conn->out_proto_thread, conn) < PT_EXITED) { + pingreq_pt(&conn->out_proto_thread, conn) < PT_EXITED) { PT_MQTT_WAIT_SEND(); } } @@ -1225,7 +1225,7 @@ PROCESS_THREAD(mqtt_process, ev, data) conn->state == MQTT_CONN_STATE_CONNECTED_TO_BROKER) { PT_INIT(&conn->out_proto_thread); while(conn->state == MQTT_CONN_STATE_CONNECTED_TO_BROKER && - subscribe_pt(&conn->out_proto_thread, conn) < PT_EXITED) { + subscribe_pt(&conn->out_proto_thread, conn) < PT_EXITED) { PT_MQTT_WAIT_SEND(); } } @@ -1238,7 +1238,7 @@ PROCESS_THREAD(mqtt_process, ev, data) conn->state == MQTT_CONN_STATE_CONNECTED_TO_BROKER) { PT_INIT(&conn->out_proto_thread); while(conn->state == MQTT_CONN_STATE_CONNECTED_TO_BROKER && - unsubscribe_pt(&conn->out_proto_thread, conn) < PT_EXITED) { + unsubscribe_pt(&conn->out_proto_thread, conn) < PT_EXITED) { PT_MQTT_WAIT_SEND(); } } @@ -1251,7 +1251,7 @@ PROCESS_THREAD(mqtt_process, ev, data) conn->state == MQTT_CONN_STATE_CONNECTED_TO_BROKER) { PT_INIT(&conn->out_proto_thread); while(conn->state == MQTT_CONN_STATE_CONNECTED_TO_BROKER && - publish_pt(&conn->out_proto_thread, conn) < PT_EXITED) { + publish_pt(&conn->out_proto_thread, conn) < PT_EXITED) { PT_MQTT_WAIT_SEND(); } }