Unify coding style

@sjaeckel integrated clang-format with formal coding style. Run his script and commit changes. There are pros and cons of this commit. Mixed coding style is a "broken window". A good single style simplifies reading and writing code. On the other hand, this is a big change which will lead to conflicts.
strophe · Jan 30, 2020 · 562a064 · 562a064
1 parent eef07ce
commit 562a064
Show file tree

Hide file tree

Showing 62 changed files with 4,129 additions and 3,903 deletions.
diff --git a/examples/active.c b/examples/active.c
@@ -19,23 +19,23 @@
 
 #include <strophe.h>
 
-int handle_reply(xmpp_conn_t * const conn,
-		 xmpp_stanza_t * const stanza,
-		 void * const userdata)
+int handle_reply(xmpp_conn_t *const conn,
+                 xmpp_stanza_t *const stanza,
+                 void *const userdata)
 {
     xmpp_stanza_t *query, *item;
     const char *type;
 
     type = xmpp_stanza_get_type(stanza);
     if (strcmp(type, "error") == 0)
-	fprintf(stderr, "ERROR: query failed\n");
+        fprintf(stderr, "ERROR: query failed\n");
     else {
-	query = xmpp_stanza_get_child_by_name(stanza, "query");
-	printf("Active Sessions:\n");
-	for (item = xmpp_stanza_get_children(query); item;
-	     item = xmpp_stanza_get_next(item))
-	    printf("\t %s\n", xmpp_stanza_get_attribute(item, "jid"));
-	printf("END OF LIST\n");
+        query = xmpp_stanza_get_child_by_name(stanza, "query");
+        printf("Active Sessions:\n");
+        for (item = xmpp_stanza_get_children(query); item;
+             item = xmpp_stanza_get_next(item))
+            printf("\t %s\n", xmpp_stanza_get_attribute(item, "jid"));
+        printf("END OF LIST\n");
     }
 
     /* disconnect */
@@ -44,41 +44,43 @@ int handle_reply(xmpp_conn_t * const conn,
     return 0;
 }
 
-void conn_handler(xmpp_conn_t * const conn, const xmpp_conn_event_t status,
-		  const int error, xmpp_stream_error_t * const stream_error,
-		  void * const userdata)
+void conn_handler(xmpp_conn_t *const conn,
+                  const xmpp_conn_event_t status,
+                  const int error,
+                  xmpp_stream_error_t *const stream_error,
+                  void *const userdata)
 {
     xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;
     xmpp_stanza_t *iq, *query;
 
     if (status == XMPP_CONN_CONNECT) {
-	fprintf(stderr, "DEBUG: connected\n");
+        fprintf(stderr, "DEBUG: connected\n");
 
-	/* create iq stanza for request */
-	iq = xmpp_iq_new(ctx, "get", "active1");
-	xmpp_stanza_set_to(iq, "xxxxxxxxx.com");
+        /* create iq stanza for request */
+        iq = xmpp_iq_new(ctx, "get", "active1");
+        xmpp_stanza_set_to(iq, "xxxxxxxxx.com");
 
-	query = xmpp_stanza_new(ctx);
-	xmpp_stanza_set_name(query, "query");
-	xmpp_stanza_set_ns(query, XMPP_NS_DISCO_ITEMS);
-	xmpp_stanza_set_attribute(query, "node", "sessions");
+        query = xmpp_stanza_new(ctx);
+        xmpp_stanza_set_name(query, "query");
+        xmpp_stanza_set_ns(query, XMPP_NS_DISCO_ITEMS);
+        xmpp_stanza_set_attribute(query, "node", "sessions");
 
-	xmpp_stanza_add_child(iq, query);
+        xmpp_stanza_add_child(iq, query);
 
-	/* we can release the stanza since it belongs to iq now */
-	xmpp_stanza_release(query);
+        /* we can release the stanza since it belongs to iq now */
+        xmpp_stanza_release(query);
 
-	/* set up reply handler */
-	xmpp_id_handler_add(conn, handle_reply, "active1", ctx);
+        /* set up reply handler */
+        xmpp_id_handler_add(conn, handle_reply, "active1", ctx);
 
-	/* send out the stanza */
-	xmpp_send(conn, iq);
+        /* send out the stanza */
+        xmpp_send(conn, iq);
 
-	/* release the stanza */
-	xmpp_stanza_release(iq);
+        /* release the stanza */
+        xmpp_stanza_release(iq);
     } else {
-	fprintf(stderr, "DEBUG: disconnected\n");
-	xmpp_stop(ctx);
+        fprintf(stderr, "DEBUG: disconnected\n");
+        xmpp_stop(ctx);
     }
 }
 
@@ -88,8 +90,8 @@ int main(int argc, char **argv)
     xmpp_conn_t *conn;
 
     if (argc != 3) {
-	fprintf(stderr, "Usage: active <jid> <pass>\n\n");
-	return 1;
+        fprintf(stderr, "Usage: active <jid> <pass>\n\n");
+        return 1;
     }
 
     /* initialize lib */

diff --git a/examples/basic.c b/examples/basic.c
@@ -19,9 +19,11 @@
 #define KA_INTERVAL 1
 
 /* define a handler for connection events */
-void conn_handler(xmpp_conn_t * const conn, const xmpp_conn_event_t status,
-                  const int error, xmpp_stream_error_t * const stream_error,
-                  void * const userdata)
+void conn_handler(xmpp_conn_t *const conn,
+                  const xmpp_conn_event_t status,
+                  const int error,
+                  xmpp_stream_error_t *const stream_error,
+                  void *const userdata)
 {
     xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;
     int secured;
@@ -32,8 +34,7 @@ void conn_handler(xmpp_conn_t * const conn, const xmpp_conn_event_t status,
         fprintf(stderr, "DEBUG: connection is %s.\n",
                 secured ? "secured" : "NOT secured");
         xmpp_disconnect(conn);
-    }
-    else {
+    } else {
         fprintf(stderr, "DEBUG: disconnected\n");
         xmpp_stop(ctx);
     }
@@ -70,7 +71,7 @@ int main(int argc, char **argv)
                         "  --legacy-ssl         Use old style SSL.\n"
                         "  --tcp-keepalive      Configure TCP keepalive.\n\n"
                         "Note: --disable-tls conflicts with --mandatory-tls or "
-                              "--legacy-ssl\n");
+                        "--legacy-ssl\n");
         return 1;
     }
 
@@ -87,8 +88,9 @@ int main(int argc, char **argv)
     /* init library */
     xmpp_initialize();
 
+    /* pass NULL instead to silence output */
+    log = xmpp_get_default_logger(XMPP_LEVEL_DEBUG);
     /* create a context */
-    log = xmpp_get_default_logger(XMPP_LEVEL_DEBUG); /* pass NULL instead to silence output */
     ctx = xmpp_ctx_new(NULL, log);
 
     /* create a connection */
@@ -97,7 +99,8 @@ int main(int argc, char **argv)
     /* configure connection properties (optional) */
     xmpp_conn_set_flags(conn, flags);
     /* configure TCP keepalive (optional) */
-    if (tcp_keepalive) xmpp_conn_set_keepalive(conn, KA_TIMEOUT, KA_INTERVAL);
+    if (tcp_keepalive)
+        xmpp_conn_set_keepalive(conn, KA_TIMEOUT, KA_INTERVAL);
 
     /* setup authentication information */
     xmpp_conn_set_jid(conn, jid);

diff --git a/examples/bot.c b/examples/bot.c
@@ -22,12 +22,13 @@
 
 #include <strophe.h>
 
-
-int version_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void * const userdata)
+int version_handler(xmpp_conn_t *const conn,
+                    xmpp_stanza_t *const stanza,
+                    void *const userdata)
 {
     xmpp_stanza_t *reply, *query, *name, *version, *text;
     const char *ns;
-    xmpp_ctx_t *ctx = (xmpp_ctx_t*)userdata;
+    xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;
 
     printf("Received version request from %s\n", xmpp_stanza_get_from(stanza));
 
@@ -69,10 +70,11 @@ int version_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void
     return 1;
 }
 
-
-int message_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void * const userdata)
+int message_handler(xmpp_conn_t *const conn,
+                    xmpp_stanza_t *const stanza,
+                    void *const userdata)
 {
-    xmpp_ctx_t *ctx = (xmpp_ctx_t*)userdata;
+    xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;
     xmpp_stanza_t *body, *reply;
     const char *type;
     char *intext, *replytext;
@@ -87,7 +89,8 @@ int message_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void
 
     intext = xmpp_stanza_get_text(body);
 
-    printf("Incoming message from %s: %s\n", xmpp_stanza_get_from(stanza), intext);
+    printf("Incoming message from %s: %s\n", xmpp_stanza_get_from(stanza),
+           intext);
 
     reply = xmpp_stanza_reply(stanza);
     if (xmpp_stanza_get_type(reply) == NULL)
@@ -97,7 +100,7 @@ int message_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void
         replytext = strdup("bye!");
         quit = 1;
     } else {
-        replytext = (char *) malloc(strlen(" to you too!") + strlen(intext) + 1);
+        replytext = (char *)malloc(strlen(" to you too!") + strlen(intext) + 1);
         strcpy(replytext, intext);
         strcat(replytext, " to you too!");
     }
@@ -115,24 +118,26 @@ int message_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void
 }
 
 /* define a handler for connection events */
-void conn_handler(xmpp_conn_t * const conn, const xmpp_conn_event_t status,
-                  const int error, xmpp_stream_error_t * const stream_error,
-                  void * const userdata)
+void conn_handler(xmpp_conn_t *const conn,
+                  const xmpp_conn_event_t status,
+                  const int error,
+                  xmpp_stream_error_t *const stream_error,
+                  void *const userdata)
 {
     xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;
 
     if (status == XMPP_CONN_CONNECT) {
-        xmpp_stanza_t* pres;
+        xmpp_stanza_t *pres;
         fprintf(stderr, "DEBUG: connected\n");
-        xmpp_handler_add(conn, version_handler, "jabber:iq:version", "iq", NULL, ctx);
+        xmpp_handler_add(conn, version_handler, "jabber:iq:version", "iq", NULL,
+                         ctx);
         xmpp_handler_add(conn, message_handler, NULL, "message", NULL, ctx);
 
         /* Send initial <presence/> so that we appear online to contacts */
         pres = xmpp_presence_new(ctx);
         xmpp_send(conn, pres);
         xmpp_stanza_release(pres);
-    }
-    else {
+    } else {
         fprintf(stderr, "DEBUG: disconnected\n");
         xmpp_stop(ctx);
     }
@@ -157,8 +162,9 @@ int main(int argc, char **argv)
     /* init library */
     xmpp_initialize();
 
+    /* pass NULL instead to silence output */
+    log = xmpp_get_default_logger(XMPP_LEVEL_DEBUG);
     /* create a context */
-    log = xmpp_get_default_logger(XMPP_LEVEL_DEBUG); /* pass NULL instead to silence output */
     ctx = xmpp_ctx_new(NULL, log);
 
     /* create a connection */

diff --git a/examples/component.c b/examples/component.c
@@ -19,19 +19,19 @@
 
 #include <strophe.h>
 
-
 /* define a handler for connection events */
-void conn_handler(xmpp_conn_t * const conn, const xmpp_conn_event_t status,
-                  const int error, xmpp_stream_error_t * const stream_error,
-                  void * const userdata)
+void conn_handler(xmpp_conn_t *const conn,
+                  const xmpp_conn_event_t status,
+                  const int error,
+                  xmpp_stream_error_t *const stream_error,
+                  void *const userdata)
 {
     xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;
 
     if (status == XMPP_CONN_CONNECT) {
         fprintf(stderr, "DEBUG: connected\n");
         xmpp_disconnect(conn);
-    }
-    else {
+    } else {
         fprintf(stderr, "DEBUG: disconnected\n");
         xmpp_stop(ctx);
     }
@@ -56,19 +56,20 @@ int main(int argc, char **argv)
     host = argv[3];
 
     if (argc == 5) {
-        short tmp_port = (short) strtol(argv[4], &port_err, 10);
+        short tmp_port = (short)strtol(argv[4], &port_err, 10);
         if (tmp_port < 0 || *port_err != '\0') {
             fprintf(stderr, "Invalid value of <port> [%s].\n", argv[4]);
             return 1;
         }
-        port = (unsigned short) tmp_port;
+        port = (unsigned short)tmp_port;
     }
 
     /* init library */
     xmpp_initialize();
 
+    /* pass NULL instead to silence output */
+    log = xmpp_get_default_logger(XMPP_LEVEL_DEBUG);
     /* create a context */
-    log = xmpp_get_default_logger(XMPP_LEVEL_DEBUG); /* pass NULL instead to silence output */
     ctx = xmpp_ctx_new(NULL, log);
 
     /* create a connection */
@@ -94,4 +95,3 @@ int main(int argc, char **argv)
 
     return 0;
 }
-