clang-format-3.5 -i **/*.[ch], update modeline

From here on, we’ll use clang-format to automatically format the source.

This has worked well in i3, so we are introducing it for i3status.

1 files changed, 88 insertions, 87 deletions

diff --git a/src/print_eth_info.c b/src/print_eth_info.c
index c446da4..af5a757 100644
--- a/src/print_eth_info.c
+++ b/src/print_eth_info.c
@@ -1,4 +1,4 @@
-// vim:ts=8:expandtab
+// vim:ts=4:sw=4:expandtab
 #include <string.h>
 #include <limits.h>
 #include <stdio.h>
@@ -16,15 +16,15 @@
 #if defined(LINUX)
 #include <linux/ethtool.h>
 #include <linux/sockios.h>
-#define PART_ETHSPEED  "E: %s (%d Mbit/s)"
+#define PART_ETHSPEED "E: %s (%d Mbit/s)"
 #endif
 
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 #include <net/if_media.h>
-#define IFM_TYPE_MATCH(dt, t)                       \
-        (IFM_TYPE((dt)) == 0 || IFM_TYPE((dt)) == IFM_TYPE((t)))
+#define IFM_TYPE_MATCH(dt, t) \
+    (IFM_TYPE((dt)) == 0 || IFM_TYPE((dt)) == IFM_TYPE((t)))
 
-#define PART_ETHSPEED  "E: %s (%s)"
+#define PART_ETHSPEED "E: %s (%s)"
 #endif
 
 #if defined(__OpenBSD__) || defined(__NetBSD__)
@@ -34,75 +34,76 @@
 
 static int print_eth_speed(char *outwalk, const char *interface) {
 #if defined(LINUX)
-        /* This code path requires root privileges */
-        int ethspeed = 0;
-        struct ifreq ifr;
-        struct ethtool_cmd ecmd;
-
-        ecmd.cmd = ETHTOOL_GSET;
-        (void)memset(&ifr, 0, sizeof(ifr));
-        ifr.ifr_data = (caddr_t)&ecmd;
-        (void)strcpy(ifr.ifr_name, interface);
-        if (ioctl(general_socket, SIOCETHTOOL, &ifr) == 0) {
-                ethspeed = (ecmd.speed == USHRT_MAX ? 0 : ecmd.speed);
-                return sprintf(outwalk, "%d Mbit/s", ethspeed);
-        } else return sprintf(outwalk, "?");
+    /* This code path requires root privileges */
+    int ethspeed = 0;
+    struct ifreq ifr;
+    struct ethtool_cmd ecmd;
+
+    ecmd.cmd = ETHTOOL_GSET;
+    (void)memset(&ifr, 0, sizeof(ifr));
+    ifr.ifr_data = (caddr_t)&ecmd;
+    (void)strcpy(ifr.ifr_name, interface);
+    if (ioctl(general_socket, SIOCETHTOOL, &ifr) == 0) {
+        ethspeed = (ecmd.speed == USHRT_MAX ? 0 : ecmd.speed);
+        return sprintf(outwalk, "%d Mbit/s", ethspeed);
+    } else
+        return sprintf(outwalk, "?");
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-        char *ethspeed;
-        struct ifmediareq ifm;
-        (void)memset(&ifm, 0, sizeof(ifm));
-        (void)strncpy(ifm.ifm_name, interface, sizeof(ifm.ifm_name));
-        int ret = ioctl(general_socket, SIOCGIFMEDIA, (caddr_t)&ifm);
-
-        /* Get the description of the media type, partially taken from
-         * FreeBSD's ifconfig */
-        const struct ifmedia_description *desc;
-        struct ifmedia_description ifm_subtype_descriptions[] =
-                IFM_SUBTYPE_ETHERNET_DESCRIPTIONS;
-
-        for (desc = ifm_subtype_descriptions;
-             desc->ifmt_string != NULL;
-             desc++) {
-            if (IFM_TYPE_MATCH(desc->ifmt_word, ifm.ifm_active) &&
-                IFM_SUBTYPE(desc->ifmt_word) == IFM_SUBTYPE(ifm.ifm_active))
-                break;
-        }
-        ethspeed = (desc->ifmt_string != NULL ? desc->ifmt_string : "?");
-        return sprintf(outwalk, "%s", ethspeed);
+    char *ethspeed;
+    struct ifmediareq ifm;
+    (void)memset(&ifm, 0, sizeof(ifm));
+    (void)strncpy(ifm.ifm_name, interface, sizeof(ifm.ifm_name));
+    int ret = ioctl(general_socket, SIOCGIFMEDIA, (caddr_t)&ifm);
+
+    /* Get the description of the media type, partially taken from
+     * FreeBSD's ifconfig */
+    const struct ifmedia_description *desc;
+    struct ifmedia_description ifm_subtype_descriptions[] =
+        IFM_SUBTYPE_ETHERNET_DESCRIPTIONS;
+
+    for (desc = ifm_subtype_descriptions;
+         desc->ifmt_string != NULL;
+         desc++) {
+        if (IFM_TYPE_MATCH(desc->ifmt_word, ifm.ifm_active) &&
+            IFM_SUBTYPE(desc->ifmt_word) == IFM_SUBTYPE(ifm.ifm_active))
+            break;
+    }
+    ethspeed = (desc->ifmt_string != NULL ? desc->ifmt_string : "?");
+    return sprintf(outwalk, "%s", ethspeed);
 #elif defined(__OpenBSD__) || defined(__NetBSD__)
-	char *ethspeed;
-	struct ifmediareq ifmr;
+    char *ethspeed;
+    struct ifmediareq ifmr;
 
-	(void) memset(&ifmr, 0, sizeof(ifmr));
-	(void) strlcpy(ifmr.ifm_name, interface, sizeof(ifmr.ifm_name));
+    (void)memset(&ifmr, 0, sizeof(ifmr));
+    (void)strlcpy(ifmr.ifm_name, interface, sizeof(ifmr.ifm_name));
 
-	if (ioctl(general_socket, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) {
-                if (errno != E2BIG)
-			return sprintf(outwalk, "?");
-	}
+    if (ioctl(general_socket, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) {
+        if (errno != E2BIG)
+            return sprintf(outwalk, "?");
+    }
 
-	struct ifmedia_description *desc;
-	struct ifmedia_description ifm_subtype_descriptions[] =
-	    IFM_SUBTYPE_DESCRIPTIONS;
+    struct ifmedia_description *desc;
+    struct ifmedia_description ifm_subtype_descriptions[] =
+        IFM_SUBTYPE_DESCRIPTIONS;
 
-        for (desc = ifm_subtype_descriptions; desc->ifmt_string != NULL; desc++) {
-		/*
+    for (desc = ifm_subtype_descriptions; desc->ifmt_string != NULL; desc++) {
+        /*
 		 * Skip these non-informative values and go right ahead to the
 		 * actual speeds.
 		 */
-		if (BEGINS_WITH(desc->ifmt_string, "autoselect") ||
-		    BEGINS_WITH(desc->ifmt_string, "auto"))
-			continue;
+        if (BEGINS_WITH(desc->ifmt_string, "autoselect") ||
+            BEGINS_WITH(desc->ifmt_string, "auto"))
+            continue;
 
-		if (IFM_TYPE_MATCH(desc->ifmt_word, ifmr.ifm_active) &&
-		    IFM_SUBTYPE(desc->ifmt_word) == IFM_SUBTYPE(ifmr.ifm_active))
-			break;
-        }
-        ethspeed = (desc->ifmt_string != NULL ? desc->ifmt_string : "?");
-        return sprintf(outwalk, "%s", ethspeed);
+        if (IFM_TYPE_MATCH(desc->ifmt_word, ifmr.ifm_active) &&
+            IFM_SUBTYPE(desc->ifmt_word) == IFM_SUBTYPE(ifmr.ifm_active))
+            break;
+    }
+    ethspeed = (desc->ifmt_string != NULL ? desc->ifmt_string : "?");
+    return sprintf(outwalk, "%s", ethspeed);
 
 #else
-	return sprintf(outwalk, "?");
+    return sprintf(outwalk, "?");
 #endif
 }
 
@@ -111,36 +112,36 @@ static int print_eth_speed(char *outwalk, const char *interface) {
  *
  */
 void print_eth_info(yajl_gen json_gen, char *buffer, const char *interface, const char *format_up, const char *format_down) {
-        const char *walk;
-        const char *ip_address = get_ip_addr(interface);
-        char *outwalk = buffer;
+    const char *walk;
+    const char *ip_address = get_ip_addr(interface);
+    char *outwalk = buffer;
+
+    INSTANCE(interface);
+
+    if (ip_address == NULL) {
+        START_COLOR("color_bad");
+        outwalk += sprintf(outwalk, "%s", format_down);
+        goto out;
+    }
 
-        INSTANCE(interface);
+    START_COLOR("color_good");
 
-        if (ip_address == NULL) {
-                START_COLOR("color_bad");
-                outwalk += sprintf(outwalk, "%s", format_down);
-                goto out;
+    for (walk = format_up; *walk != '\0'; walk++) {
+        if (*walk != '%') {
+            *(outwalk++) = *walk;
+            continue;
         }
 
-        START_COLOR("color_good");
-
-        for (walk = format_up; *walk != '\0'; walk++) {
-                if (*walk != '%') {
-                        *(outwalk++) = *walk;
-                        continue;
-                }
-
-                if (BEGINS_WITH(walk+1, "ip")) {
-                        outwalk += sprintf(outwalk, "%s", ip_address);
-                        walk += strlen("ip");
-                } else if (BEGINS_WITH(walk+1, "speed")) {
-                        outwalk += print_eth_speed(outwalk, interface);
-                        walk += strlen("speed");
-                }
+        if (BEGINS_WITH(walk + 1, "ip")) {
+            outwalk += sprintf(outwalk, "%s", ip_address);
+            walk += strlen("ip");
+        } else if (BEGINS_WITH(walk + 1, "speed")) {
+            outwalk += print_eth_speed(outwalk, interface);
+            walk += strlen("speed");
         }
+    }
 
 out:
-        END_COLOR;
-        OUTPUT_FULL_TEXT(buffer);
+    END_COLOR;
+    OUTPUT_FULL_TEXT(buffer);
 }