From b96ab2bbd7dbab4fe6fd15f6d1a7e8bbc79c44dc Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Mon, 26 Feb 2024 00:19:49 +0000 Subject: [PATCH] Fix test build warnings --- test/lib/cpp/01-con-discon-success-v5.cpp | 2 +- test/lib/cpp/01-con-discon-success.cpp | 2 +- test/lib/cpp/01-con-discon-will-clear.cpp | 2 +- test/lib/cpp/01-con-discon-will-v5.cpp | 2 +- test/lib/cpp/01-con-discon-will.cpp | 2 +- test/lib/cpp/01-keepalive-pingreq.cpp | 2 +- test/lib/cpp/01-no-clean-session.cpp | 2 +- test/lib/cpp/01-pre-connect-callback.cpp | 2 +- test/lib/cpp/01-server-keepalive-pingreq.cpp | 2 +- test/lib/cpp/01-unpwd-set.cpp | 2 +- test/lib/cpp/01-will-set.cpp | 2 +- test/lib/cpp/01-will-unpwd-set.cpp | 2 +- test/lib/cpp/02-subscribe-qos0.cpp | 2 +- test/lib/cpp/02-subscribe-qos1-async1.cpp | 2 +- test/lib/cpp/02-subscribe-qos1-async2.cpp | 2 +- test/lib/cpp/02-subscribe-qos1.cpp | 2 +- test/lib/cpp/02-subscribe-qos2.cpp | 2 +- test/lib/cpp/02-unsubscribe-v5.cpp | 2 +- test/lib/cpp/02-unsubscribe.cpp | 2 +- test/lib/cpp/03-publish-b2c-qos1-unexpected-puback.cpp | 2 +- test/lib/cpp/03-publish-b2c-qos1.cpp | 2 +- test/lib/cpp/03-publish-b2c-qos2-len.cpp | 2 +- test/lib/cpp/03-publish-b2c-qos2-unexpected-pubcomp.cpp | 2 +- test/lib/cpp/03-publish-b2c-qos2-unexpected-pubrel.cpp | 2 +- test/lib/cpp/03-publish-b2c-qos2.cpp | 2 +- test/lib/cpp/03-publish-c2b-qos1-disconnect.cpp | 2 +- test/lib/cpp/03-publish-c2b-qos1-len.cpp | 2 +- test/lib/cpp/03-publish-c2b-qos1-receive-maximum.cpp | 2 +- test/lib/cpp/03-publish-c2b-qos2-disconnect.cpp | 2 +- test/lib/cpp/03-publish-c2b-qos2-len.cpp | 2 +- test/lib/cpp/03-publish-c2b-qos2-maximum-qos-0.cpp | 2 +- test/lib/cpp/03-publish-c2b-qos2-maximum-qos-1.cpp | 2 +- test/lib/cpp/03-publish-c2b-qos2-pubrec-error.cpp | 2 +- test/lib/cpp/03-publish-c2b-qos2-receive-maximum.cpp | 2 +- test/lib/cpp/03-publish-c2b-qos2.cpp | 2 +- test/lib/cpp/03-publish-loop-forever.cpp | 2 +- test/lib/cpp/03-publish-loop-start.cpp | 2 +- test/lib/cpp/03-publish-loop.cpp | 2 +- test/lib/cpp/03-publish-qos0-no-payload.cpp | 2 +- test/lib/cpp/03-publish-qos0.cpp | 2 +- test/lib/cpp/03-request-response-1.cpp | 2 +- test/lib/cpp/03-request-response-2.cpp | 2 +- test/lib/cpp/03-request-response-correlation-1.cpp | 2 +- test/lib/cpp/04-retain-qos0.cpp | 2 +- test/lib/cpp/08-ssl-bad-cacert.cpp | 2 +- .../lib/cpp/08-ssl-connect-cert-auth-custom-ssl-ctx-default.cpp | 2 +- test/lib/cpp/08-ssl-connect-cert-auth-custom-ssl-ctx.cpp | 2 +- test/lib/cpp/08-ssl-connect-cert-auth-enc.cpp | 2 +- test/lib/cpp/08-ssl-connect-cert-auth.cpp | 2 +- test/lib/cpp/08-ssl-connect-no-auth.cpp | 2 +- test/lib/cpp/08-ssl-connect-san.cpp | 2 +- test/lib/cpp/08-ssl-fake-cacert.cpp | 2 +- test/lib/cpp/11-prop-oversize-packet.cpp | 2 +- test/lib/cpp/11-prop-recv.cpp | 2 +- test/lib/cpp/11-prop-send-content-type.cpp | 2 +- test/lib/cpp/11-prop-send-payload-format.cpp | 2 +- 56 files changed, 56 insertions(+), 56 deletions(-) diff --git a/test/lib/cpp/01-con-discon-success-v5.cpp b/test/lib/cpp/01-con-discon-success-v5.cpp index 7949e40e..ffb20bb0 100644 --- a/test/lib/cpp/01-con-discon-success-v5.cpp +++ b/test/lib/cpp/01-con-discon-success-v5.cpp @@ -38,7 +38,7 @@ void mosquittopp_test::on_disconnect_v5(int rc, const mosquitto_property *props) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; mosquitto_property *props = NULL; int rc; diff --git a/test/lib/cpp/01-con-discon-success.cpp b/test/lib/cpp/01-con-discon-success.cpp index 59288d78..c85b6781 100644 --- a/test/lib/cpp/01-con-discon-success.cpp +++ b/test/lib/cpp/01-con-discon-success.cpp @@ -34,7 +34,7 @@ void mosquittopp_test::on_disconnect(int rc) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/01-con-discon-will-clear.cpp b/test/lib/cpp/01-con-discon-will-clear.cpp index a12b9d0f..b8fd0d92 100644 --- a/test/lib/cpp/01-con-discon-will-clear.cpp +++ b/test/lib/cpp/01-con-discon-will-clear.cpp @@ -34,7 +34,7 @@ void mosquittopp_test::on_disconnect(int rc) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); diff --git a/test/lib/cpp/01-con-discon-will-v5.cpp b/test/lib/cpp/01-con-discon-will-v5.cpp index 42b31c2d..13c54114 100644 --- a/test/lib/cpp/01-con-discon-will-v5.cpp +++ b/test/lib/cpp/01-con-discon-will-v5.cpp @@ -33,7 +33,7 @@ void mosquittopp_test::on_disconnect(int rc) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; mosquitto_property *proplist = NULL; int rc; diff --git a/test/lib/cpp/01-con-discon-will.cpp b/test/lib/cpp/01-con-discon-will.cpp index ea807a03..33335906 100644 --- a/test/lib/cpp/01-con-discon-will.cpp +++ b/test/lib/cpp/01-con-discon-will.cpp @@ -34,7 +34,7 @@ void mosquittopp_test::on_disconnect(int rc) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/01-keepalive-pingreq.cpp b/test/lib/cpp/01-keepalive-pingreq.cpp index 867b8c81..fd0f0b36 100644 --- a/test/lib/cpp/01-keepalive-pingreq.cpp +++ b/test/lib/cpp/01-keepalive-pingreq.cpp @@ -24,7 +24,7 @@ void mosquittopp_test::on_connect(int rc) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/01-no-clean-session.cpp b/test/lib/cpp/01-no-clean-session.cpp index 799703ef..65306031 100644 --- a/test/lib/cpp/01-no-clean-session.cpp +++ b/test/lib/cpp/01-no-clean-session.cpp @@ -34,7 +34,7 @@ void mosquittopp_test::on_disconnect(int rc) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/01-pre-connect-callback.cpp b/test/lib/cpp/01-pre-connect-callback.cpp index 9519efbb..f2f0a84b 100644 --- a/test/lib/cpp/01-pre-connect-callback.cpp +++ b/test/lib/cpp/01-pre-connect-callback.cpp @@ -39,7 +39,7 @@ void mosquittopp_test::on_disconnect(int rc) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/01-server-keepalive-pingreq.cpp b/test/lib/cpp/01-server-keepalive-pingreq.cpp index f66ca7a8..108b5d62 100644 --- a/test/lib/cpp/01-server-keepalive-pingreq.cpp +++ b/test/lib/cpp/01-server-keepalive-pingreq.cpp @@ -24,7 +24,7 @@ void mosquittopp_test::on_connect(int rc) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/01-unpwd-set.cpp b/test/lib/cpp/01-unpwd-set.cpp index 95af1ad7..005d5f62 100644 --- a/test/lib/cpp/01-unpwd-set.cpp +++ b/test/lib/cpp/01-unpwd-set.cpp @@ -34,7 +34,7 @@ void mosquittopp_test::on_disconnect(int rc) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/01-will-set.cpp b/test/lib/cpp/01-will-set.cpp index df4f0c14..e38202ba 100644 --- a/test/lib/cpp/01-will-set.cpp +++ b/test/lib/cpp/01-will-set.cpp @@ -33,7 +33,7 @@ void mosquittopp_test::on_disconnect(int rc) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/01-will-unpwd-set.cpp b/test/lib/cpp/01-will-unpwd-set.cpp index 3b58f615..59e0172a 100644 --- a/test/lib/cpp/01-will-unpwd-set.cpp +++ b/test/lib/cpp/01-will-unpwd-set.cpp @@ -33,7 +33,7 @@ void mosquittopp_test::on_disconnect(int rc) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/02-subscribe-qos0.cpp b/test/lib/cpp/02-subscribe-qos0.cpp index bbbc59ff..22377506 100644 --- a/test/lib/cpp/02-subscribe-qos0.cpp +++ b/test/lib/cpp/02-subscribe-qos0.cpp @@ -41,7 +41,7 @@ void mosquittopp_test::on_subscribe(int mid, int qos_count, const int *granted_q int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/02-subscribe-qos1-async1.cpp b/test/lib/cpp/02-subscribe-qos1-async1.cpp index 6fa4c57f..14d6a6de 100644 --- a/test/lib/cpp/02-subscribe-qos1-async1.cpp +++ b/test/lib/cpp/02-subscribe-qos1-async1.cpp @@ -49,7 +49,7 @@ void mosquittopp_test::on_subscribe(int mid, int qos_count, const int *granted_q int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; int rc; assert(argc == 2); diff --git a/test/lib/cpp/02-subscribe-qos1-async2.cpp b/test/lib/cpp/02-subscribe-qos1-async2.cpp index f691e201..24701339 100644 --- a/test/lib/cpp/02-subscribe-qos1-async2.cpp +++ b/test/lib/cpp/02-subscribe-qos1-async2.cpp @@ -49,7 +49,7 @@ void mosquittopp_test::on_subscribe(int mid, int qos_count, const int *granted_q int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; int rc; struct timespec tv = { 0, (long)100e6 }; diff --git a/test/lib/cpp/02-subscribe-qos1.cpp b/test/lib/cpp/02-subscribe-qos1.cpp index 94747e3e..ada0663f 100644 --- a/test/lib/cpp/02-subscribe-qos1.cpp +++ b/test/lib/cpp/02-subscribe-qos1.cpp @@ -42,7 +42,7 @@ void mosquittopp_test::on_subscribe(int mid, int qos_count, const int *granted_q int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/02-subscribe-qos2.cpp b/test/lib/cpp/02-subscribe-qos2.cpp index 16295672..65500803 100644 --- a/test/lib/cpp/02-subscribe-qos2.cpp +++ b/test/lib/cpp/02-subscribe-qos2.cpp @@ -42,7 +42,7 @@ void mosquittopp_test::on_subscribe(int mid, int qos_count, const int *granted_q int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/02-unsubscribe-v5.cpp b/test/lib/cpp/02-unsubscribe-v5.cpp index 7c52c0f3..aa3f37cf 100644 --- a/test/lib/cpp/02-unsubscribe-v5.cpp +++ b/test/lib/cpp/02-unsubscribe-v5.cpp @@ -48,7 +48,7 @@ void mosquittopp_test::on_unsubscribe_v5(int mid, const mosquitto_property *prop int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/02-unsubscribe.cpp b/test/lib/cpp/02-unsubscribe.cpp index 9ce41a44..ec038893 100644 --- a/test/lib/cpp/02-unsubscribe.cpp +++ b/test/lib/cpp/02-unsubscribe.cpp @@ -39,7 +39,7 @@ void mosquittopp_test::on_unsubscribe(int mid) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/03-publish-b2c-qos1-unexpected-puback.cpp b/test/lib/cpp/03-publish-b2c-qos1-unexpected-puback.cpp index bff8fc50..d56badb3 100644 --- a/test/lib/cpp/03-publish-b2c-qos1-unexpected-puback.cpp +++ b/test/lib/cpp/03-publish-b2c-qos1-unexpected-puback.cpp @@ -26,7 +26,7 @@ void mosquittopp_test::on_connect(int rc) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/03-publish-b2c-qos1.cpp b/test/lib/cpp/03-publish-b2c-qos1.cpp index 1e4c8fb7..cf79a78b 100644 --- a/test/lib/cpp/03-publish-b2c-qos1.cpp +++ b/test/lib/cpp/03-publish-b2c-qos1.cpp @@ -57,7 +57,7 @@ void mosquittopp_test::on_message(const struct mosquitto_message *msg) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/03-publish-b2c-qos2-len.cpp b/test/lib/cpp/03-publish-b2c-qos2-len.cpp index 226d5303..39a7348b 100644 --- a/test/lib/cpp/03-publish-b2c-qos2-len.cpp +++ b/test/lib/cpp/03-publish-b2c-qos2-len.cpp @@ -65,7 +65,7 @@ void mosquittopp_test::on_message(const struct mosquitto_message *msg) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/03-publish-b2c-qos2-unexpected-pubcomp.cpp b/test/lib/cpp/03-publish-b2c-qos2-unexpected-pubcomp.cpp index 66fca997..639dcd3c 100644 --- a/test/lib/cpp/03-publish-b2c-qos2-unexpected-pubcomp.cpp +++ b/test/lib/cpp/03-publish-b2c-qos2-unexpected-pubcomp.cpp @@ -28,7 +28,7 @@ void mosquittopp_test::on_connect(int rc) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/03-publish-b2c-qos2-unexpected-pubrel.cpp b/test/lib/cpp/03-publish-b2c-qos2-unexpected-pubrel.cpp index 7f5a435d..6f93bb2f 100644 --- a/test/lib/cpp/03-publish-b2c-qos2-unexpected-pubrel.cpp +++ b/test/lib/cpp/03-publish-b2c-qos2-unexpected-pubrel.cpp @@ -61,7 +61,7 @@ void mosquittopp_test::on_message(const struct mosquitto_message *msg) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/03-publish-b2c-qos2.cpp b/test/lib/cpp/03-publish-b2c-qos2.cpp index c047a8df..72032333 100644 --- a/test/lib/cpp/03-publish-b2c-qos2.cpp +++ b/test/lib/cpp/03-publish-b2c-qos2.cpp @@ -59,7 +59,7 @@ void mosquittopp_test::on_message(const struct mosquitto_message *msg) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/03-publish-c2b-qos1-disconnect.cpp b/test/lib/cpp/03-publish-c2b-qos1-disconnect.cpp index 790ea901..6c57713e 100644 --- a/test/lib/cpp/03-publish-c2b-qos1-disconnect.cpp +++ b/test/lib/cpp/03-publish-c2b-qos1-disconnect.cpp @@ -50,7 +50,7 @@ void mosquittopp_test::on_publish(int mid) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/03-publish-c2b-qos1-len.cpp b/test/lib/cpp/03-publish-c2b-qos1-len.cpp index 5878320d..5102170d 100644 --- a/test/lib/cpp/03-publish-c2b-qos1-len.cpp +++ b/test/lib/cpp/03-publish-c2b-qos1-len.cpp @@ -42,7 +42,7 @@ void mosquittopp_test::on_publish(int mid) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/03-publish-c2b-qos1-receive-maximum.cpp b/test/lib/cpp/03-publish-c2b-qos1-receive-maximum.cpp index 15404b65..f773f321 100644 --- a/test/lib/cpp/03-publish-c2b-qos1-receive-maximum.cpp +++ b/test/lib/cpp/03-publish-c2b-qos1-receive-maximum.cpp @@ -41,7 +41,7 @@ void mosquittopp_test::on_publish_v5(int mid, int reason_code, const mosquitto_p int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/03-publish-c2b-qos2-disconnect.cpp b/test/lib/cpp/03-publish-c2b-qos2-disconnect.cpp index a0e85181..cb42c73c 100644 --- a/test/lib/cpp/03-publish-c2b-qos2-disconnect.cpp +++ b/test/lib/cpp/03-publish-c2b-qos2-disconnect.cpp @@ -51,7 +51,7 @@ void mosquittopp_test::on_publish(int mid) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/03-publish-c2b-qos2-len.cpp b/test/lib/cpp/03-publish-c2b-qos2-len.cpp index 5ae6617b..de80f003 100644 --- a/test/lib/cpp/03-publish-c2b-qos2-len.cpp +++ b/test/lib/cpp/03-publish-c2b-qos2-len.cpp @@ -43,7 +43,7 @@ void mosquittopp_test::on_publish(int mid) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/03-publish-c2b-qos2-maximum-qos-0.cpp b/test/lib/cpp/03-publish-c2b-qos2-maximum-qos-0.cpp index 54d77cc9..c461b70d 100644 --- a/test/lib/cpp/03-publish-c2b-qos2-maximum-qos-0.cpp +++ b/test/lib/cpp/03-publish-c2b-qos2-maximum-qos-0.cpp @@ -48,7 +48,7 @@ void mosquittopp_test::on_publish(int mid) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/03-publish-c2b-qos2-maximum-qos-1.cpp b/test/lib/cpp/03-publish-c2b-qos2-maximum-qos-1.cpp index 941d617b..1b2497d4 100644 --- a/test/lib/cpp/03-publish-c2b-qos2-maximum-qos-1.cpp +++ b/test/lib/cpp/03-publish-c2b-qos2-maximum-qos-1.cpp @@ -48,7 +48,7 @@ void mosquittopp_test::on_publish(int mid) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/03-publish-c2b-qos2-pubrec-error.cpp b/test/lib/cpp/03-publish-c2b-qos2-pubrec-error.cpp index 550cede0..1bea6d33 100644 --- a/test/lib/cpp/03-publish-c2b-qos2-pubrec-error.cpp +++ b/test/lib/cpp/03-publish-c2b-qos2-pubrec-error.cpp @@ -44,7 +44,7 @@ void mosquittopp_test::on_publish(int mid) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/03-publish-c2b-qos2-receive-maximum.cpp b/test/lib/cpp/03-publish-c2b-qos2-receive-maximum.cpp index 87f56fae..af1a8eeb 100644 --- a/test/lib/cpp/03-publish-c2b-qos2-receive-maximum.cpp +++ b/test/lib/cpp/03-publish-c2b-qos2-receive-maximum.cpp @@ -45,7 +45,7 @@ void mosquittopp_test::on_publish(int mid) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/03-publish-c2b-qos2.cpp b/test/lib/cpp/03-publish-c2b-qos2.cpp index 82078002..0f83febd 100644 --- a/test/lib/cpp/03-publish-c2b-qos2.cpp +++ b/test/lib/cpp/03-publish-c2b-qos2.cpp @@ -43,7 +43,7 @@ void mosquittopp_test::on_publish(int mid) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/03-publish-loop-forever.cpp b/test/lib/cpp/03-publish-loop-forever.cpp index 0eb413c2..6471104d 100644 --- a/test/lib/cpp/03-publish-loop-forever.cpp +++ b/test/lib/cpp/03-publish-loop-forever.cpp @@ -60,7 +60,7 @@ void mosquittopp_test::on_message_v5(const struct mosquitto_message *msg, const int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/03-publish-loop-start.cpp b/test/lib/cpp/03-publish-loop-start.cpp index dd698c88..29d70680 100644 --- a/test/lib/cpp/03-publish-loop-start.cpp +++ b/test/lib/cpp/03-publish-loop-start.cpp @@ -61,7 +61,7 @@ void mosquittopp_test::on_message_v5(const struct mosquitto_message *msg, const int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/03-publish-loop.cpp b/test/lib/cpp/03-publish-loop.cpp index 89bd3467..e3da2a68 100644 --- a/test/lib/cpp/03-publish-loop.cpp +++ b/test/lib/cpp/03-publish-loop.cpp @@ -60,7 +60,7 @@ void mosquittopp_test::on_message_v5(const struct mosquitto_message *msg, const int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/03-publish-qos0-no-payload.cpp b/test/lib/cpp/03-publish-qos0-no-payload.cpp index a65abc8f..63f34294 100644 --- a/test/lib/cpp/03-publish-qos0-no-payload.cpp +++ b/test/lib/cpp/03-publish-qos0-no-payload.cpp @@ -45,7 +45,7 @@ void mosquittopp_test::on_disconnect(int rc) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/03-publish-qos0.cpp b/test/lib/cpp/03-publish-qos0.cpp index b42b3bc4..4ac615bd 100644 --- a/test/lib/cpp/03-publish-qos0.cpp +++ b/test/lib/cpp/03-publish-qos0.cpp @@ -38,7 +38,7 @@ void mosquittopp_test::on_publish(int mid) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; int rc; assert(argc == 2); diff --git a/test/lib/cpp/03-request-response-1.cpp b/test/lib/cpp/03-request-response-1.cpp index 4b8574b6..1b31d65a 100644 --- a/test/lib/cpp/03-request-response-1.cpp +++ b/test/lib/cpp/03-request-response-1.cpp @@ -59,7 +59,7 @@ void mosquittopp_test::on_message(const struct mosquitto_message *msg) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/03-request-response-2.cpp b/test/lib/cpp/03-request-response-2.cpp index 3432c24d..fec28b32 100644 --- a/test/lib/cpp/03-request-response-2.cpp +++ b/test/lib/cpp/03-request-response-2.cpp @@ -60,7 +60,7 @@ void mosquittopp_test::on_message_v5(const struct mosquitto_message *msg, const int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/03-request-response-correlation-1.cpp b/test/lib/cpp/03-request-response-correlation-1.cpp index acd64309..df5da604 100644 --- a/test/lib/cpp/03-request-response-correlation-1.cpp +++ b/test/lib/cpp/03-request-response-correlation-1.cpp @@ -65,7 +65,7 @@ void mosquittopp_test::on_message(const struct mosquitto_message *msg) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/04-retain-qos0.cpp b/test/lib/cpp/04-retain-qos0.cpp index 14148e28..5e3f5d5e 100644 --- a/test/lib/cpp/04-retain-qos0.cpp +++ b/test/lib/cpp/04-retain-qos0.cpp @@ -36,7 +36,7 @@ void mosquittopp_test::on_publish(int mid) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/08-ssl-bad-cacert.cpp b/test/lib/cpp/08-ssl-bad-cacert.cpp index 0522e75c..ff48d50b 100644 --- a/test/lib/cpp/08-ssl-bad-cacert.cpp +++ b/test/lib/cpp/08-ssl-bad-cacert.cpp @@ -14,7 +14,7 @@ mosquittopp_test::mosquittopp_test(const char *id) : mosqpp::mosquittopp(id) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; int rc = 1; assert(argc == 2); diff --git a/test/lib/cpp/08-ssl-connect-cert-auth-custom-ssl-ctx-default.cpp b/test/lib/cpp/08-ssl-connect-cert-auth-custom-ssl-ctx-default.cpp index 6c2a1790..273c6354 100644 --- a/test/lib/cpp/08-ssl-connect-cert-auth-custom-ssl-ctx-default.cpp +++ b/test/lib/cpp/08-ssl-connect-cert-auth-custom-ssl-ctx-default.cpp @@ -42,7 +42,7 @@ void mosquittopp_test::on_disconnect(int rc) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; SSL_CTX *ssl_ctx; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/08-ssl-connect-cert-auth-custom-ssl-ctx.cpp b/test/lib/cpp/08-ssl-connect-cert-auth-custom-ssl-ctx.cpp index b59d43cb..0a3aca87 100644 --- a/test/lib/cpp/08-ssl-connect-cert-auth-custom-ssl-ctx.cpp +++ b/test/lib/cpp/08-ssl-connect-cert-auth-custom-ssl-ctx.cpp @@ -43,7 +43,7 @@ void mosquittopp_test::on_disconnect(int rc) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; SSL_CTX *ssl_ctx; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/08-ssl-connect-cert-auth-enc.cpp b/test/lib/cpp/08-ssl-connect-cert-auth-enc.cpp index 4ee68343..9cab5b33 100644 --- a/test/lib/cpp/08-ssl-connect-cert-auth-enc.cpp +++ b/test/lib/cpp/08-ssl-connect-cert-auth-enc.cpp @@ -46,7 +46,7 @@ void mosquittopp_test::on_disconnect(int rc) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/08-ssl-connect-cert-auth.cpp b/test/lib/cpp/08-ssl-connect-cert-auth.cpp index b635f6ed..7e0f6a85 100644 --- a/test/lib/cpp/08-ssl-connect-cert-auth.cpp +++ b/test/lib/cpp/08-ssl-connect-cert-auth.cpp @@ -34,7 +34,7 @@ void mosquittopp_test::on_disconnect(int rc) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/08-ssl-connect-no-auth.cpp b/test/lib/cpp/08-ssl-connect-no-auth.cpp index c398a988..bb1b3a7c 100644 --- a/test/lib/cpp/08-ssl-connect-no-auth.cpp +++ b/test/lib/cpp/08-ssl-connect-no-auth.cpp @@ -34,7 +34,7 @@ void mosquittopp_test::on_disconnect(int rc) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/08-ssl-connect-san.cpp b/test/lib/cpp/08-ssl-connect-san.cpp index f466a4e7..3f43edc1 100644 --- a/test/lib/cpp/08-ssl-connect-san.cpp +++ b/test/lib/cpp/08-ssl-connect-san.cpp @@ -35,7 +35,7 @@ void mosquittopp_test::on_disconnect(int rc) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; int rc; char cafile[4096]; assert(argc == 3); diff --git a/test/lib/cpp/08-ssl-fake-cacert.cpp b/test/lib/cpp/08-ssl-fake-cacert.cpp index 667f9639..f2d3c9c1 100644 --- a/test/lib/cpp/08-ssl-fake-cacert.cpp +++ b/test/lib/cpp/08-ssl-fake-cacert.cpp @@ -23,7 +23,7 @@ void mosquittopp_test::on_connect(int rc) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; int rc; assert(argc == 2); diff --git a/test/lib/cpp/11-prop-oversize-packet.cpp b/test/lib/cpp/11-prop-oversize-packet.cpp index 4c2e32d7..226ff42b 100644 --- a/test/lib/cpp/11-prop-oversize-packet.cpp +++ b/test/lib/cpp/11-prop-oversize-packet.cpp @@ -62,7 +62,7 @@ void mosquittopp_test::on_publish(int mid) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/11-prop-recv.cpp b/test/lib/cpp/11-prop-recv.cpp index 27fac64b..4b92d1ae 100644 --- a/test/lib/cpp/11-prop-recv.cpp +++ b/test/lib/cpp/11-prop-recv.cpp @@ -58,7 +58,7 @@ void mosquittopp_test::on_message_v5(const struct mosquitto_message *msg, const int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; int rc; assert(argc == 3); diff --git a/test/lib/cpp/11-prop-send-content-type.cpp b/test/lib/cpp/11-prop-send-content-type.cpp index 03cdfe08..ba9d940d 100644 --- a/test/lib/cpp/11-prop-send-content-type.cpp +++ b/test/lib/cpp/11-prop-send-content-type.cpp @@ -47,7 +47,7 @@ void mosquittopp_test::on_publish(int mid) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]); diff --git a/test/lib/cpp/11-prop-send-payload-format.cpp b/test/lib/cpp/11-prop-send-payload-format.cpp index 598840e9..31f701fa 100644 --- a/test/lib/cpp/11-prop-send-payload-format.cpp +++ b/test/lib/cpp/11-prop-send-payload-format.cpp @@ -47,7 +47,7 @@ void mosquittopp_test::on_publish(int mid) int main(int argc, char *argv[]) { - struct mosquittopp_test *mosq; + mosquittopp_test *mosq; assert(argc == 2); int port = atoi(argv[1]);