Using standard constant for exit(3) and return

According to ISO/IEC 9899:2011, section 7.22.4.4 (The exit function),
"the constant EXIT_FAILURE is the implementation independent way to
issue failures to exit(3)." Whereas EXIT_SUCCESS is the standard way
to return success. Favor this platform independent constants than the
literal numbers.
Signed-off-by: 's avatarGuilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
parent 529926e9
...@@ -77,7 +77,7 @@ void onSend(void* context, MQTTAsync_successData* response) ...@@ -77,7 +77,7 @@ void onSend(void* context, MQTTAsync_successData* response)
if ((rc = MQTTAsync_disconnect(client, &opts)) != MQTTASYNC_SUCCESS) if ((rc = MQTTAsync_disconnect(client, &opts)) != MQTTASYNC_SUCCESS)
{ {
printf("Failed to start sendMessage, return code %d\n", rc); printf("Failed to start sendMessage, return code %d\n", rc);
exit(-1); exit(EXIT_FAILURE);
} }
} }
...@@ -110,7 +110,7 @@ void onConnect(void* context, MQTTAsync_successData* response) ...@@ -110,7 +110,7 @@ void onConnect(void* context, MQTTAsync_successData* response)
if ((rc = MQTTAsync_sendMessage(client, TOPIC, &pubmsg, &opts)) != MQTTASYNC_SUCCESS) if ((rc = MQTTAsync_sendMessage(client, TOPIC, &pubmsg, &opts)) != MQTTASYNC_SUCCESS)
{ {
printf("Failed to start sendMessage, return code %d\n", rc); printf("Failed to start sendMessage, return code %d\n", rc);
exit(-1); exit(EXIT_FAILURE);
} }
} }
...@@ -135,7 +135,7 @@ int main(int argc, char* argv[]) ...@@ -135,7 +135,7 @@ int main(int argc, char* argv[])
if ((rc = MQTTAsync_connect(client, &conn_opts)) != MQTTASYNC_SUCCESS) if ((rc = MQTTAsync_connect(client, &conn_opts)) != MQTTASYNC_SUCCESS)
{ {
printf("Failed to start connect, return code %d\n", rc); printf("Failed to start connect, return code %d\n", rc);
exit(-1); exit(EXIT_FAILURE);
} }
printf("Waiting for publication of %s\n" printf("Waiting for publication of %s\n"
......
...@@ -126,7 +126,7 @@ void onConnect(void* context, MQTTAsync_successData* response) ...@@ -126,7 +126,7 @@ void onConnect(void* context, MQTTAsync_successData* response)
if ((rc = MQTTAsync_subscribe(client, TOPIC, QOS, &opts)) != MQTTASYNC_SUCCESS) if ((rc = MQTTAsync_subscribe(client, TOPIC, QOS, &opts)) != MQTTASYNC_SUCCESS)
{ {
printf("Failed to start subscribe, return code %d\n", rc); printf("Failed to start subscribe, return code %d\n", rc);
exit(-1); exit(EXIT_FAILURE);
} }
} }
...@@ -153,7 +153,7 @@ int main(int argc, char* argv[]) ...@@ -153,7 +153,7 @@ int main(int argc, char* argv[])
if ((rc = MQTTAsync_connect(client, &conn_opts)) != MQTTASYNC_SUCCESS) if ((rc = MQTTAsync_connect(client, &conn_opts)) != MQTTASYNC_SUCCESS)
{ {
printf("Failed to start connect, return code %d\n", rc); printf("Failed to start connect, return code %d\n", rc);
exit(-1); exit(EXIT_FAILURE);
} }
while (!subscribed) while (!subscribed)
...@@ -175,7 +175,7 @@ int main(int argc, char* argv[]) ...@@ -175,7 +175,7 @@ int main(int argc, char* argv[])
if ((rc = MQTTAsync_disconnect(client, &disc_opts)) != MQTTASYNC_SUCCESS) if ((rc = MQTTAsync_disconnect(client, &disc_opts)) != MQTTASYNC_SUCCESS)
{ {
printf("Failed to start disconnect, return code %d\n", rc); printf("Failed to start disconnect, return code %d\n", rc);
exit(-1); exit(EXIT_FAILURE);
} }
while (!disc_finished) while (!disc_finished)
#if defined(WIN32) #if defined(WIN32)
......
...@@ -68,7 +68,7 @@ void usage(void) ...@@ -68,7 +68,7 @@ void usage(void)
printf(" --maxdatalen 100\n"); printf(" --maxdatalen 100\n");
printf(" --username none\n"); printf(" --username none\n");
printf(" --password none\n"); printf(" --password none\n");
exit(-1); exit(EXIT_FAILURE);
} }
...@@ -78,7 +78,7 @@ void myconnect(MQTTClient* client, MQTTClient_connectOptions* opts) ...@@ -78,7 +78,7 @@ void myconnect(MQTTClient* client, MQTTClient_connectOptions* opts)
if (MQTTClient_connect(*client, opts) != 0) if (MQTTClient_connect(*client, opts) != 0)
{ {
printf("Failed to connect\n"); printf("Failed to connect\n");
exit(-1); exit(EXIT_FAILURE);
} }
printf("Connected\n"); printf("Connected\n");
} }
...@@ -194,7 +194,7 @@ int main(int argc, char** argv) ...@@ -194,7 +194,7 @@ int main(int argc, char** argv)
MQTTClient_destroy(&client); MQTTClient_destroy(&client);
return 0; return EXIT_SUCCESS;
} }
void getopts(int argc, char** argv) void getopts(int argc, char** argv)
......
...@@ -78,7 +78,7 @@ int main(int argc, char* argv[]) ...@@ -78,7 +78,7 @@ int main(int argc, char* argv[])
if ((rc = MQTTClient_connect(client, &conn_opts)) != MQTTCLIENT_SUCCESS) if ((rc = MQTTClient_connect(client, &conn_opts)) != MQTTCLIENT_SUCCESS)
{ {
printf("Failed to connect, return code %d\n", rc); printf("Failed to connect, return code %d\n", rc);
exit(-1); exit(EXIT_FAILURE);
} }
pubmsg.payload = PAYLOAD; pubmsg.payload = PAYLOAD;
pubmsg.payloadlen = strlen(PAYLOAD); pubmsg.payloadlen = strlen(PAYLOAD);
......
...@@ -42,7 +42,7 @@ int main(int argc, char* argv[]) ...@@ -42,7 +42,7 @@ int main(int argc, char* argv[])
if ((rc = MQTTClient_connect(client, &conn_opts)) != MQTTCLIENT_SUCCESS) if ((rc = MQTTClient_connect(client, &conn_opts)) != MQTTCLIENT_SUCCESS)
{ {
printf("Failed to connect, return code %d\n", rc); printf("Failed to connect, return code %d\n", rc);
exit(-1); exit(EXIT_FAILURE);
} }
pubmsg.payload = PAYLOAD; pubmsg.payload = PAYLOAD;
pubmsg.payloadlen = strlen(PAYLOAD); pubmsg.payloadlen = strlen(PAYLOAD);
......
...@@ -90,7 +90,7 @@ void usage(void) ...@@ -90,7 +90,7 @@ void usage(void)
printf(" --username none\n"); printf(" --username none\n");
printf(" --password none\n"); printf(" --password none\n");
printf(" --keepalive <seconds> (default is %d seconds)\n", opts.keepalive); printf(" --keepalive <seconds> (default is %d seconds)\n", opts.keepalive);
exit(-1); exit(EXIT_FAILURE);
} }
...@@ -100,7 +100,7 @@ void myconnect(MQTTClient* client, MQTTClient_connectOptions* opts) ...@@ -100,7 +100,7 @@ void myconnect(MQTTClient* client, MQTTClient_connectOptions* opts)
if (MQTTClient_connect(*client, opts) != 0) if (MQTTClient_connect(*client, opts) != 0)
{ {
printf("Failed to connect\n"); printf("Failed to connect\n");
exit(-1); exit(EXIT_FAILURE);
} }
} }
...@@ -194,7 +194,7 @@ int main(int argc, char** argv) ...@@ -194,7 +194,7 @@ int main(int argc, char** argv)
MQTTClient_destroy(&client); MQTTClient_destroy(&client);
return 0; return EXIT_SUCCESS;
} }
void getopts(int argc, char** argv) void getopts(int argc, char** argv)
......
...@@ -89,7 +89,7 @@ void usage(void) ...@@ -89,7 +89,7 @@ void usage(void)
printf(" --username none\n"); printf(" --username none\n");
printf(" --password none\n"); printf(" --password none\n");
printf(" --keepalive <seconds> (default is 10 seconds)\n"); printf(" --keepalive <seconds> (default is 10 seconds)\n");
exit(-1); exit(EXIT_FAILURE);
} }
...@@ -156,7 +156,7 @@ void myconnect(MQTTAsync* client) ...@@ -156,7 +156,7 @@ void myconnect(MQTTAsync* client)
if ((rc = MQTTAsync_connect(*client, &conn_opts)) != MQTTASYNC_SUCCESS) if ((rc = MQTTAsync_connect(*client, &conn_opts)) != MQTTASYNC_SUCCESS)
{ {
printf("Failed to start connect, return code %d\n", rc); printf("Failed to start connect, return code %d\n", rc);
exit(-1); exit(EXIT_FAILURE);
} }
while (connected == 0) while (connected == 0)
#if defined(WIN32) #if defined(WIN32)
...@@ -205,7 +205,7 @@ void connectionLost(void* context, char* cause) ...@@ -205,7 +205,7 @@ void connectionLost(void* context, char* cause)
if ((rc = MQTTAsync_connect(client, &conn_opts)) != MQTTASYNC_SUCCESS) if ((rc = MQTTAsync_connect(client, &conn_opts)) != MQTTASYNC_SUCCESS)
{ {
printf("Failed to start connect, return code %d\n", rc); printf("Failed to start connect, return code %d\n", rc);
exit(-1); exit(EXIT_FAILURE);
} }
} }
...@@ -398,7 +398,7 @@ int main(int argc, char** argv) ...@@ -398,7 +398,7 @@ int main(int argc, char** argv)
if ((rc = MQTTAsync_disconnect(client, &disc_opts)) != MQTTASYNC_SUCCESS) if ((rc = MQTTAsync_disconnect(client, &disc_opts)) != MQTTASYNC_SUCCESS)
{ {
printf("Failed to start disconnect, return code %d\n", rc); printf("Failed to start disconnect, return code %d\n", rc);
exit(-1); exit(EXIT_FAILURE);
} }
while (!disconnected) while (!disconnected)
...@@ -410,7 +410,7 @@ int main(int argc, char** argv) ...@@ -410,7 +410,7 @@ int main(int argc, char** argv)
MQTTAsync_destroy(&client); MQTTAsync_destroy(&client);
return 0; return EXIT_SUCCESS;
} }
void getopts(int argc, char** argv) void getopts(int argc, char** argv)
......
...@@ -89,7 +89,7 @@ void usage(void) ...@@ -89,7 +89,7 @@ void usage(void)
printf(" --password none\n"); printf(" --password none\n");
printf(" --showtopics <on or off> (default is on if the topic has a wildcard, else off)\n"); printf(" --showtopics <on or off> (default is on if the topic has a wildcard, else off)\n");
printf(" --keepalive <seconds> (default is %d seconds)\n", opts.keepalive); printf(" --keepalive <seconds> (default is %d seconds)\n", opts.keepalive);
exit(-1); exit(EXIT_FAILURE);
} }
...@@ -99,7 +99,7 @@ void myconnect(MQTTClient* client, MQTTClient_connectOptions* opts) ...@@ -99,7 +99,7 @@ void myconnect(MQTTClient* client, MQTTClient_connectOptions* opts)
if ((rc = MQTTClient_connect(*client, opts)) != 0) if ((rc = MQTTClient_connect(*client, opts)) != 0)
{ {
printf("Failed to connect, return code %d\n", rc); printf("Failed to connect, return code %d\n", rc);
exit(-1); exit(EXIT_FAILURE);
} }
} }
...@@ -177,7 +177,7 @@ int main(int argc, char** argv) ...@@ -177,7 +177,7 @@ int main(int argc, char** argv)
MQTTClient_destroy(&client); MQTTClient_destroy(&client);
return 0; return EXIT_SUCCESS;
} }
void getopts(int argc, char** argv) void getopts(int argc, char** argv)
......
...@@ -101,7 +101,7 @@ void usage(void) ...@@ -101,7 +101,7 @@ void usage(void)
printf(" --password none\n"); printf(" --password none\n");
printf(" --showtopics <on or off> (default is on if the topic has a wildcard, else off)\n"); printf(" --showtopics <on or off> (default is on if the topic has a wildcard, else off)\n");
printf(" --keepalive <seconds> (default is 10 seconds)\n"); printf(" --keepalive <seconds> (default is 10 seconds)\n");
exit(-1); exit(EXIT_FAILURE);
} }
...@@ -318,7 +318,7 @@ int main(int argc, char** argv) ...@@ -318,7 +318,7 @@ int main(int argc, char** argv)
if ((rc = MQTTAsync_connect(client, &conn_opts)) != MQTTASYNC_SUCCESS) if ((rc = MQTTAsync_connect(client, &conn_opts)) != MQTTASYNC_SUCCESS)
{ {
printf("Failed to start connect, return code %d\n", rc); printf("Failed to start connect, return code %d\n", rc);
exit(-1); exit(EXIT_FAILURE);
} }
while (!subscribed) while (!subscribed)
...@@ -342,7 +342,7 @@ int main(int argc, char** argv) ...@@ -342,7 +342,7 @@ int main(int argc, char** argv)
if ((rc = MQTTAsync_disconnect(client, &disc_opts)) != MQTTASYNC_SUCCESS) if ((rc = MQTTAsync_disconnect(client, &disc_opts)) != MQTTASYNC_SUCCESS)
{ {
printf("Failed to start disconnect, return code %d\n", rc); printf("Failed to start disconnect, return code %d\n", rc);
exit(-1); exit(EXIT_FAILURE);
} }
while (!disconnected) while (!disconnected)
...@@ -355,7 +355,7 @@ int main(int argc, char** argv) ...@@ -355,7 +355,7 @@ int main(int argc, char** argv)
exit: exit:
MQTTAsync_destroy(&client); MQTTAsync_destroy(&client);
return 0; return EXIT_SUCCESS;
} }
...@@ -77,7 +77,7 @@ int main(int argc, char* argv[]) ...@@ -77,7 +77,7 @@ int main(int argc, char* argv[])
if ((rc = MQTTClient_connect(client, &conn_opts)) != MQTTCLIENT_SUCCESS) if ((rc = MQTTClient_connect(client, &conn_opts)) != MQTTCLIENT_SUCCESS)
{ {
printf("Failed to connect, return code %d\n", rc); printf("Failed to connect, return code %d\n", rc);
exit(-1); exit(EXIT_FAILURE);
} }
printf("Subscribing to topic %s\nfor client %s using QoS%d\n\n" printf("Subscribing to topic %s\nfor client %s using QoS%d\n\n"
"Press Q<Enter> to quit\n\n", TOPIC, CLIENTID, QOS); "Press Q<Enter> to quit\n\n", TOPIC, CLIENTID, QOS);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment