Problem: formatting inconsistent

Solution: applied clang-format
disguise-one · Feb 2, 2018 · 41f459e · 41f459e
1 parent 6d8baea
commit 41f459e
Show file tree

Hide file tree

Showing 331 changed files with 13,278 additions and 13,761 deletions.
diff --git a/include/zmq.h b/include/zmq.h
diff --git a/include/zmq_utils.h b/include/zmq_utils.h
@@ -34,14 +34,16 @@
     compilers even have an equivalent concept.
     So in the worst case, this include file is treated as silently empty. */
 
-#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__) || defined(_MSC_VER)
+#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)               \
+  || defined(_MSC_VER)
 #if defined(__GNUC__) || defined(__GNUG__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic warning "-Wcpp"
 #pragma GCC diagnostic ignored "-Werror"
 #pragma GCC diagnostic ignored "-Wall"
 #endif
-#pragma message("Warning: zmq_utils.h is deprecated. All its functionality is provided by zmq.h.")
+#pragma message(                                                               \
+  "Warning: zmq_utils.h is deprecated. All its functionality is provided by zmq.h.")
 #if defined(__GNUC__) || defined(__GNUG__)
 #pragma GCC diagnostic pop
 #endif

diff --git a/perf/inproc_lat.cpp b/perf/inproc_lat.cpp
@@ -106,7 +106,7 @@ static void *worker (void *ctx_)
 #endif
 }
 
-int main (int argc, char *argv [])
+int main (int argc, char *argv[])
 {
 #if defined ZMQ_HAVE_WINDOWS
     HANDLE local_thread;
@@ -127,8 +127,8 @@ int main (int argc, char *argv [])
         return 1;
     }
 
-    message_size = atoi (argv [1]);
-    roundtrip_count = atoi (argv [2]);
+    message_size = atoi (argv[1]);
+    roundtrip_count = atoi (argv[2]);
 
     ctx = zmq_init (1);
     if (!ctx) {
@@ -149,8 +149,7 @@ int main (int argc, char *argv [])
     }
 
 #if defined ZMQ_HAVE_WINDOWS
-    local_thread = (HANDLE) _beginthreadex (NULL, 0,
-        worker, ctx, 0 , NULL);
+    local_thread = (HANDLE) _beginthreadex (NULL, 0, worker, ctx, 0, NULL);
     if (local_thread == 0) {
         printf ("error in _beginthreadex\n");
         return -1;
@@ -237,4 +236,3 @@ int main (int argc, char *argv [])
 
     return 0;
 }
-
diff --git a/perf/inproc_thr.cpp b/perf/inproc_thr.cpp
@@ -71,7 +71,6 @@ static void *worker (void *ctx_)
     }
 
     for (i = 0; i != message_count; i++) {
-
         rc = zmq_msg_init_size (&msg, message_size);
         if (rc != 0) {
             printf ("error in zmq_msg_init_size: %s\n", zmq_strerror (errno));
@@ -106,7 +105,7 @@ static void *worker (void *ctx_)
 #endif
 }
 
-int main (int argc, char *argv [])
+int main (int argc, char *argv[])
 {
 #if defined ZMQ_HAVE_WINDOWS
     HANDLE local_thread;
@@ -128,8 +127,8 @@ int main (int argc, char *argv [])
         return 1;
     }
 
-    message_size = atoi (argv [1]);
-    message_count = atoi (argv [2]);
+    message_size = atoi (argv[1]);
+    message_count = atoi (argv[2]);
 
     ctx = zmq_init (1);
     if (!ctx) {
@@ -150,8 +149,7 @@ int main (int argc, char *argv [])
     }
 
 #if defined ZMQ_HAVE_WINDOWS
-    local_thread = (HANDLE) _beginthreadex (NULL, 0,
-        worker, ctx, 0 , NULL);
+    local_thread = (HANDLE) _beginthreadex (NULL, 0, worker, ctx, 0, NULL);
     if (local_thread == 0) {
         printf ("error in _beginthreadex\n");
         return -1;
@@ -238,13 +236,12 @@ int main (int argc, char *argv [])
         return -1;
     }
 
-    throughput = (unsigned long)
-        ((double) message_count / (double) elapsed * 1000000);
+    throughput =
+      (unsigned long) ((double) message_count / (double) elapsed * 1000000);
     megabits = (double) (throughput * message_size * 8) / 1000000;
 
     printf ("mean throughput: %d [msg/s]\n", (int) throughput);
     printf ("mean throughput: %.3f [Mb/s]\n", (double) megabits);
 
     return 0;
 }
-
diff --git a/perf/local_lat.cpp b/perf/local_lat.cpp
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-int main (int argc, char *argv [])
+int main (int argc, char *argv[])
 {
     const char *bind_to;
     int roundtrip_count;
@@ -44,12 +44,12 @@ int main (int argc, char *argv [])
 
     if (argc != 4) {
         printf ("usage: local_lat <bind-to> <message-size> "
-            "<roundtrip-count>\n");
+                "<roundtrip-count>\n");
         return 1;
     }
-    bind_to = argv [1];
-    message_size = atoi (argv [2]);
-    roundtrip_count = atoi (argv [3]);
+    bind_to = argv[1];
+    message_size = atoi (argv[2]);
+    roundtrip_count = atoi (argv[3]);
 
     ctx = zmq_init (1);
     if (!ctx) {

diff --git a/perf/local_thr.cpp b/perf/local_thr.cpp
@@ -34,7 +34,7 @@
 // keys are arbitrary but must match remote_lat.cpp
 const char server_prvkey[] = "{X}#>t#jRGaQ}gMhv=30r(Mw+87YGs+5%kh=i@f8";
 
-int main (int argc, char *argv [])
+int main (int argc, char *argv[])
 {
     const char *bind_to;
     int message_count;
@@ -51,13 +51,14 @@ int main (int argc, char *argv [])
     int curve = 0;
 
     if (argc != 4 && argc != 5) {
-        printf ("usage: local_thr <bind-to> <message-size> <message-count> [<enable_curve>]\n");
+        printf ("usage: local_thr <bind-to> <message-size> <message-count> "
+                "[<enable_curve>]\n");
         return 1;
     }
-    bind_to = argv [1];
-    message_size = atoi (argv [2]);
-    message_count = atoi (argv [3]);
-    if (argc >= 5 && atoi (argv [4])) {
+    bind_to = argv[1];
+    message_size = atoi (argv[2]);
+    message_count = atoi (argv[3]);
+    if (argc >= 5 && atoi (argv[4])) {
         curve = 1;
     }
 
@@ -76,13 +77,14 @@ int main (int argc, char *argv [])
     //  Add your socket options here.
     //  For example ZMQ_RATE, ZMQ_RECOVERY_IVL and ZMQ_MCAST_LOOP for PGM.
     if (curve) {
-        rc = zmq_setsockopt (s, ZMQ_CURVE_SECRETKEY, server_prvkey, sizeof(server_prvkey));
+        rc = zmq_setsockopt (s, ZMQ_CURVE_SECRETKEY, server_prvkey,
+                             sizeof (server_prvkey));
         if (rc != 0) {
             printf ("error in zmq_setsockoopt: %s\n", zmq_strerror (errno));
             return -1;
         }
         int server = 1;
-        rc = zmq_setsockopt (s, ZMQ_CURVE_SERVER, &server, sizeof(int));
+        rc = zmq_setsockopt (s, ZMQ_CURVE_SERVER, &server, sizeof (int));
         if (rc != 0) {
             printf ("error in zmq_setsockoopt: %s\n", zmq_strerror (errno));
             return -1;
@@ -135,8 +137,7 @@ int main (int argc, char *argv [])
         return -1;
     }
 
-    throughput = 
-        ((double) message_count / (double) elapsed * 1000000);
+    throughput = ((double) message_count / (double) elapsed * 1000000);
     megabits = ((double) throughput * message_size * 8) / 1000000;
 
     printf ("message size: %d [B]\n", (int) message_size);

diff --git a/perf/remote_lat.cpp b/perf/remote_lat.cpp
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-int main (int argc, char *argv [])
+int main (int argc, char *argv[])
 {
     const char *connect_to;
     int roundtrip_count;
@@ -48,12 +48,12 @@ int main (int argc, char *argv [])
 
     if (argc != 4) {
         printf ("usage: remote_lat <connect-to> <message-size> "
-            "<roundtrip-count>\n");
+                "<roundtrip-count>\n");
         return 1;
     }
-    connect_to = argv [1];
-    message_size = atoi (argv [2]);
-    roundtrip_count = atoi (argv [3]);
+    connect_to = argv[1];
+    message_size = atoi (argv[2]);
+    roundtrip_count = atoi (argv[3]);
 
     ctx = zmq_init (1);
     if (!ctx) {

diff --git a/perf/remote_thr.cpp b/perf/remote_thr.cpp
@@ -37,7 +37,7 @@ const char server_pubkey[] = "DX4nh=yUn{-9ugra0X3Src4SU-4xTgqxcYY.+<SH";
 const char client_pubkey[] = "<n^oA}I:66W+*ds3tAmi1+KJzv-}k&fC2aA5Bj0K";
 const char client_prvkey[] = "9R9bV}[6z6DC-%$!jTVTKvWc=LEL{4i4gzUe$@Zx";
 
-int main (int argc, char *argv [])
+int main (int argc, char *argv[])
 {
     const char *connect_to;
     int message_count;
@@ -51,13 +51,13 @@ int main (int argc, char *argv [])
 
     if (argc != 4 && argc != 5) {
         printf ("usage: remote_thr <connect-to> <message-size> "
-            "<message-count> [<enable_curve>]\n");
+                "<message-count> [<enable_curve>]\n");
         return 1;
     }
-    connect_to = argv [1];
-    message_size = atoi (argv [2]);
-    message_count = atoi (argv [3]);
-    if (argc >= 5 && atoi (argv [4])) {
+    connect_to = argv[1];
+    message_size = atoi (argv[2]);
+    message_count = atoi (argv[3]);
+    if (argc >= 5 && atoi (argv[4])) {
         curve = 1;
     }
 
@@ -76,19 +76,22 @@ int main (int argc, char *argv [])
     //  Add your socket options here.
     //  For example ZMQ_RATE, ZMQ_RECOVERY_IVL and ZMQ_MCAST_LOOP for PGM.
     if (curve) {
-        rc = zmq_setsockopt (s, ZMQ_CURVE_SECRETKEY, client_prvkey, sizeof (client_prvkey));
+        rc = zmq_setsockopt (s, ZMQ_CURVE_SECRETKEY, client_prvkey,
+                             sizeof (client_prvkey));
         if (rc != 0) {
             printf ("error in zmq_setsockoopt: %s\n", zmq_strerror (errno));
             return -1;
         }
-
-        rc = zmq_setsockopt (s, ZMQ_CURVE_PUBLICKEY, client_pubkey, sizeof (client_pubkey));
+
+        rc = zmq_setsockopt (s, ZMQ_CURVE_PUBLICKEY, client_pubkey,
+                             sizeof (client_pubkey));
         if (rc != 0) {
             printf ("error in zmq_setsockoopt: %s\n", zmq_strerror (errno));
             return -1;
         }
-
-        rc = zmq_setsockopt (s, ZMQ_CURVE_SERVERKEY, server_pubkey, sizeof (server_pubkey));
+
+        rc = zmq_setsockopt (s, ZMQ_CURVE_SERVERKEY, server_pubkey,
+                             sizeof (server_pubkey));
         if (rc != 0) {
             printf ("error in zmq_setsockoopt: %s\n", zmq_strerror (errno));
             return -1;

diff --git a/src/address.cpp b/src/address.cpp
@@ -44,11 +44,12 @@
 #include <string>
 #include <sstream>
 
-zmq::address_t::address_t (
-    const std::string &protocol_, const std::string &address_, ctx_t *parent_)
-    : protocol (protocol_),
-      address (address_),
-      parent (parent_)
+zmq::address_t::address_t (const std::string &protocol_,
+                           const std::string &address_,
+                           ctx_t *parent_) :
+    protocol (protocol_),
+    address (address_),
+    parent (parent_)
 {
     memset (&resolved, 0, sizeof resolved);
 }
@@ -57,35 +58,32 @@ zmq::address_t::~address_t ()
 {
     if (protocol == "tcp") {
         if (resolved.tcp_addr) {
-            LIBZMQ_DELETE(resolved.tcp_addr);
+            LIBZMQ_DELETE (resolved.tcp_addr);
         }
     }
     if (protocol == "udp") {
         if (resolved.udp_addr) {
-            LIBZMQ_DELETE(resolved.udp_addr);
+            LIBZMQ_DELETE (resolved.udp_addr);
         }
     }
 #if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
-    else
-    if (protocol == "ipc") {
+    else if (protocol == "ipc") {
         if (resolved.ipc_addr) {
-            LIBZMQ_DELETE(resolved.ipc_addr);
+            LIBZMQ_DELETE (resolved.ipc_addr);
         }
     }
 #endif
 #if defined ZMQ_HAVE_TIPC
-    else
-    if (protocol == "tipc") {
+    else if (protocol == "tipc") {
         if (resolved.tipc_addr) {
-            LIBZMQ_DELETE(resolved.tipc_addr);
+            LIBZMQ_DELETE (resolved.tipc_addr);
         }
     }
 #endif
 #if defined ZMQ_HAVE_VMCI
-    else
-    if (protocol == "vmci") {
+    else if (protocol == "vmci") {
         if (resolved.vmci_addr) {
-            LIBZMQ_DELETE(resolved.vmci_addr);
+            LIBZMQ_DELETE (resolved.vmci_addr);
         }
     }
 #endif
@@ -102,22 +100,19 @@ int zmq::address_t::to_string (std::string &addr_) const
             return resolved.udp_addr->to_string (addr_);
     }
 #if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
-    else
-    if (protocol == "ipc") {
+    else if (protocol == "ipc") {
         if (resolved.ipc_addr)
             return resolved.ipc_addr->to_string (addr_);
     }
 #endif
 #if defined ZMQ_HAVE_TIPC
-    else
-    if (protocol == "tipc") {
+    else if (protocol == "tipc") {
         if (resolved.tipc_addr)
             return resolved.tipc_addr->to_string (addr_);
     }
 #endif
 #if defined ZMQ_HAVE_VMCI
-    else
-    if (protocol == "vmci") {
+    else if (protocol == "vmci") {
         if (resolved.vmci_addr)
             return resolved.vmci_addr->to_string (addr_);
     }