Fix: reduce amount of flags code.ssl_examples

8 files changed, 58 insertions, 80 deletions

diff --git a/examples/amqps_bind.c b/examples/amqps_bind.c
index d589c9d..c78e0b5 100644
--- a/examples/amqps_bind.c
+++ b/examples/amqps_bind.c
@@ -51,8 +51,6 @@ int main(int argc, char const *const *argv)
 {
   char const *hostname;
   int port, status;
-  int hascacert = 0;
-  int nextarg = 0;
   char const *exchange;
   char const *bindingkey;
   char const *queue;
@@ -82,12 +80,11 @@ int main(int argc, char const *const *argv)
   amqp_ssl_socket_set_verify_hostname(socket, 0);
 
   if (argc > 6) {
+    int nextarg = 7;
     status = amqp_ssl_socket_set_cacert(socket, argv[6]);
     if (status) {
       die("setting CA certificate");
     }
-    hascacert = 1;
-    nextarg = 7;
     if (argc > nextarg && !strcmp("verifypeer", argv[nextarg])) {
       amqp_ssl_socket_set_verify_peer(socket, 1);
       nextarg++;
@@ -96,12 +93,12 @@ int main(int argc, char const *const *argv)
       amqp_ssl_socket_set_verify_hostname(socket, 1);
       nextarg++;
     }
-  }
-
-  if (hascacert && argc > nextarg + 1) {
-    status = amqp_ssl_socket_set_key(socket, argv[nextarg + 1], argv[nextarg]);
-    if (status) {
-      die("setting client cert");
+    if (argc > nextarg + 1) {
+      status =
+          amqp_ssl_socket_set_key(socket, argv[nextarg + 1], argv[nextarg]);
+      if (status) {
+        die("setting client cert");
+      }
     }
   }
 
diff --git a/examples/amqps_consumer.c b/examples/amqps_consumer.c
index 193929e..9a2ba36 100644
--- a/examples/amqps_consumer.c
+++ b/examples/amqps_consumer.c
@@ -151,8 +151,6 @@ int main(int argc, char const *const *argv)
 {
   char const *hostname;
   int port, status;
-  int hascacert = 0;
-  int nextarg = 0;
   char const *exchange;
   char const *bindingkey;
   amqp_socket_t *socket;
@@ -181,12 +179,11 @@ int main(int argc, char const *const *argv)
   amqp_ssl_socket_set_verify_hostname(socket, 0);
 
   if (argc > 3) {
+    int nextarg = 4;
     status = amqp_ssl_socket_set_cacert(socket, argv[3]);
     if (status) {
       die("setting CA certificate");
     }
-    hascacert = 1;
-    nextarg = 4;
     if (argc > nextarg && !strcmp("verifypeer", argv[nextarg])) {
       amqp_ssl_socket_set_verify_peer(socket, 1);
       nextarg++;
@@ -195,12 +192,12 @@ int main(int argc, char const *const *argv)
       amqp_ssl_socket_set_verify_hostname(socket, 1);
       nextarg++;
     }
-  }
-
-  if (hascacert && argc > nextarg + 1) {
-    status = amqp_ssl_socket_set_key(socket, argv[nextarg + 1], argv[nextarg]);
-    if (status) {
-      die("setting client key");
+    if (argc > nextarg + 1) {
+      status =
+          amqp_ssl_socket_set_key(socket, argv[nextarg + 1], argv[nextarg]);
+      if (status) {
+        die("setting client key");
+      }
     }
   }
 
diff --git a/examples/amqps_exchange_declare.c b/examples/amqps_exchange_declare.c
index 5887af2..d13c9c7 100644
--- a/examples/amqps_exchange_declare.c
+++ b/examples/amqps_exchange_declare.c
@@ -51,8 +51,6 @@ int main(int argc, char const *const *argv)
 {
   char const *hostname;
   int port, status;
-  int hascacert = 0;
-  int nextarg = 0;
   char const *exchange;
   char const *exchangetype;
   amqp_socket_t *socket;
@@ -81,12 +79,11 @@ int main(int argc, char const *const *argv)
   amqp_ssl_socket_set_verify_hostname(socket, 0);
 
   if (argc > 5) {
+    int nextarg = 6;
     status = amqp_ssl_socket_set_cacert(socket, argv[5]);
     if (status) {
       die("setting CA certificate");
     }
-    hascacert = 1;
-    nextarg = 6;
     if (argc > nextarg && !strcmp("verifypeer", argv[nextarg])) {
       amqp_ssl_socket_set_verify_peer(socket, 1);
       nextarg++;
@@ -95,12 +92,12 @@ int main(int argc, char const *const *argv)
       amqp_ssl_socket_set_verify_hostname(socket, 1);
       nextarg++;
     }
-  }
-
-  if (hascacert && argc > nextarg + 1) {
-    status = amqp_ssl_socket_set_key(socket, argv[nextarg + 1], argv[nextarg]);
-    if (status) {
-      die("setting client key/cert");
+    if (argc > nextarg + 1) {
+      status =
+          amqp_ssl_socket_set_key(socket, argv[nextarg + 1], argv[nextarg]);
+      if (status) {
+        die("setting client key/cert");
+      }
     }
   }
 
diff --git a/examples/amqps_listen.c b/examples/amqps_listen.c
index c5d21e9..16f6825 100644
--- a/examples/amqps_listen.c
+++ b/examples/amqps_listen.c
@@ -53,8 +53,6 @@ int main(int argc, char const *const *argv)
 {
   char const *hostname;
   int port, status;
-  int hascacert = 0;
-  int nextarg = 0;
   char const *exchange;
   char const *bindingkey;
   amqp_socket_t *socket;
@@ -84,12 +82,11 @@ int main(int argc, char const *const *argv)
   amqp_ssl_socket_set_verify_hostname(socket, 0);
 
   if (argc > 5) {
+    int nextarg = 6;
     status = amqp_ssl_socket_set_cacert(socket, argv[5]);
     if (status) {
       die("setting CA certificate");
     }
-    hascacert = 1;
-    nextarg = 6;
     if (argc > nextarg && !strcmp("verifypeer", argv[nextarg])) {
       amqp_ssl_socket_set_verify_peer(socket, 1);
       nextarg++;
@@ -98,15 +95,16 @@ int main(int argc, char const *const *argv)
       amqp_ssl_socket_set_verify_hostname(socket, 1);
       nextarg++;
     }
-  }
-
-  if (hascacert && argc > nextarg + 1) {
-    status = amqp_ssl_socket_set_key(socket, argv[nextarg + 1], argv[nextarg]);
-    if (status) {
-      die("setting client cert");
+    if (argc > nextarg + 1) {
+      status =
+          amqp_ssl_socket_set_key(socket, argv[nextarg + 1], argv[nextarg]);
+      if (status) {
+        die("setting client cert");
+      }
     }
   }
 
+
   status = amqp_socket_open(socket, hostname, port);
   if (status) {
     die("opening SSL/TLS connection");
diff --git a/examples/amqps_listenq.c b/examples/amqps_listenq.c
index d2e488a..7b26ce1 100644
--- a/examples/amqps_listenq.c
+++ b/examples/amqps_listenq.c
@@ -53,8 +53,6 @@ int main(int argc, char const *const *argv)
 {
   char const *hostname;
   int port, status;
-  int hascacert = 0;
-  int nextarg = 0;
   char const *queuename;
   amqp_socket_t *socket;
   amqp_connection_state_t conn;
@@ -80,12 +78,11 @@ int main(int argc, char const *const *argv)
   amqp_ssl_socket_set_verify_hostname(socket, 0);
 
   if (argc > 4) {
+    int nextarg = 5;
     status = amqp_ssl_socket_set_cacert(socket, argv[4]);
     if (status) {
       die("setting CA certificate");
     }
-    hascacert = 1;
-    nextarg = 5;
     if (argc > nextarg && !strcmp("verifypeer", argv[nextarg])) {
       amqp_ssl_socket_set_verify_peer(socket, 1);
       nextarg++;
@@ -94,15 +91,16 @@ int main(int argc, char const *const *argv)
       amqp_ssl_socket_set_verify_hostname(socket, 1);
       nextarg++;
     }
-  }
-
-  if (hascacert && argc > nextarg + 1) {
-    status = amqp_ssl_socket_set_key(socket, argv[nextarg + 1], argv[nextarg]);
-    if (status) {
-      die("setting client cert");
+    if (argc > nextarg + 1) {
+      status =
+          amqp_ssl_socket_set_key(socket, argv[nextarg + 1], argv[nextarg]);
+      if (status) {
+        die("setting client cert");
+      }
     }
   }
 
+
   status = amqp_socket_open(socket, hostname, port);
   if (status) {
     die("opening SSL/TLS connection");
diff --git a/examples/amqps_producer.c b/examples/amqps_producer.c
index 4c504c8..07e7ad7 100644
--- a/examples/amqps_producer.c
+++ b/examples/amqps_producer.c
@@ -115,8 +115,6 @@ int main(int argc, char const *const *argv)
 {
   char const *hostname;
   int port, status;
-  int hascacert = 0;
-  int nextarg = 0;
   int rate_limit;
   int message_count;
   amqp_socket_t *socket;
@@ -144,12 +142,11 @@ int main(int argc, char const *const *argv)
   amqp_ssl_socket_set_verify_hostname(socket, 0);
 
   if (argc > 5) {
+    int nextarg = 6;
     status = amqp_ssl_socket_set_cacert(socket, argv[5]);
     if (status) {
       die("setting CA certificate");
     }
-    hascacert = 1;
-    nextarg = 6;
     if (argc > nextarg && !strcmp("verifypeer", argv[nextarg])) {
       amqp_ssl_socket_set_verify_peer(socket, 1);
       nextarg++;
@@ -158,12 +155,12 @@ int main(int argc, char const *const *argv)
       amqp_ssl_socket_set_verify_hostname(socket, 1);
       nextarg++;
     }
-  }
-
-  if (hascacert && argc > nextarg + 1) {
-    status = amqp_ssl_socket_set_key(socket, argv[nextarg + 1], argv[nextarg]);
-    if (status) {
-      die("setting client cert");
+    if (argc > nextarg + 1) {
+      status =
+          amqp_ssl_socket_set_key(socket, argv[nextarg + 1], argv[nextarg]);
+      if (status) {
+        die("setting client cert");
+      }
     }
   }
 
diff --git a/examples/amqps_sendstring.c b/examples/amqps_sendstring.c
index 49cc78a..6ef4396 100644
--- a/examples/amqps_sendstring.c
+++ b/examples/amqps_sendstring.c
@@ -51,8 +51,6 @@ int main(int argc, char const *const *argv)
 {
   char const *hostname;
   int port, status;
-  int hascacert = 0;
-  int nextarg = 0;
   char const *exchange;
   char const *routingkey;
   char const *messagebody;
@@ -83,12 +81,11 @@ int main(int argc, char const *const *argv)
   amqp_ssl_socket_set_verify_hostname(socket, 0);
 
   if (argc > 6) {
+    int nextarg = 7;
     status = amqp_ssl_socket_set_cacert(socket, argv[6]);
     if (status) {
       die("setting CA certificate");
     }
-    hascacert = 1;
-    nextarg = 7;
     if (argc > nextarg && !strcmp("verifypeer", argv[nextarg])) {
       amqp_ssl_socket_set_verify_peer(socket, 1);
       nextarg++;
@@ -97,12 +94,12 @@ int main(int argc, char const *const *argv)
       amqp_ssl_socket_set_verify_hostname(socket, 1);
       nextarg++;
     }
-  }
-
-  if (hascacert && argc > nextarg + 1) {
-    status = amqp_ssl_socket_set_key(socket, argv[nextarg + 1], argv[nextarg]);
-    if (status) {
-      die("setting client cert");
+    if (argc > nextarg + 1) {
+      status =
+          amqp_ssl_socket_set_key(socket, argv[nextarg + 1], argv[nextarg]);
+      if (status) {
+        die("setting client cert");
+      }
     }
   }
 
diff --git a/examples/amqps_unbind.c b/examples/amqps_unbind.c
index c20fb6d..29102bb 100644
--- a/examples/amqps_unbind.c
+++ b/examples/amqps_unbind.c
@@ -51,8 +51,6 @@ int main(int argc, char const *const *argv)
 {
   char const *hostname;
   int port, status;
-  int hascacert = 0;
-  int nextarg = 0;
   char const *exchange;
   char const *bindingkey;
   char const *queue;
@@ -82,12 +80,11 @@ int main(int argc, char const *const *argv)
   amqp_ssl_socket_set_verify_hostname(socket, 0);
 
   if (argc > 6) {
+    int nextarg = 7;
     status = amqp_ssl_socket_set_cacert(socket, argv[6]);
     if (status) {
       die("setting CA certificate");
     }
-    hascacert = 1;
-    nextarg = 7;
     if (argc > nextarg && !strcmp("verifypeer", argv[nextarg])) {
       amqp_ssl_socket_set_verify_peer(socket, 1);
       nextarg++;
@@ -96,12 +93,12 @@ int main(int argc, char const *const *argv)
       amqp_ssl_socket_set_verify_hostname(socket, 1);
       nextarg++;
     }
-  }
-
-  if (hascacert && argc > nextarg + 1) {
-    status = amqp_ssl_socket_set_key(socket, argv[nextarg + 1], argv[nextarg]);
-    if (status) {
-      die("setting client cert");
+    if (argc > nextarg + 1) {
+      status =
+          amqp_ssl_socket_set_key(socket, argv[nextarg + 1], argv[nextarg]);
+      if (status) {
+        die("setting client cert");
+      }
     }
   }