Add modelines and retab! all files

diff --git a/src/config.c b/src/config.c
index da1e5d198538aea34ff3da8ba35c7717ceec3b5d..99e3e075119b018f19877101d15afc146775c233 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -1,3 +1,4 @@
+// vim:ts=8:expandtab
 #include <sys/stat.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/src/general.c b/src/general.c
index 4c110e47831be54872795d468e3bf025cde94366..62d242db6fa387c5bb7f9feb81a61298a865065d 100644 (file)
--- a/src/general.c
+++ b/src/general.c
@@ -1,3 +1,4 @@
+// vim:ts=8:expandtab
 #include <sys/types.h>
 #include <string.h>
 #include <stdarg.h>
@@ -13,13 +14,13 @@
  *
  */
 void slurp(char *filename, char *destination, int size) {
-       int fd;
+        int fd;
 
-       if ((fd = open(filename, O_RDONLY)) == -1)
-               die("Could not open \"%s\"\n", filename);
+        if ((fd = open(filename, O_RDONLY)) == -1)
+                die("Could not open \"%s\"\n", filename);
 
-       (void)read(fd, destination, size);
-       (void)close(fd);
+        (void)read(fd, destination, size);
+        (void)close(fd);
 }
 
 /*

diff --git a/src/get_battery_info.c b/src/get_battery_info.c
index b81eb8e96681debec36346eb6f12f2fabb4877d1..707afdec0f1af5b46ce15173fc46536ab4783aee 100644 (file)
--- a/src/get_battery_info.c
+++ b/src/get_battery_info.c
@@ -1,3 +1,4 @@
+// vim:ts=8:expandtab
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -19,7 +20,7 @@ const char *get_battery_info(struct battery *bat) {
             present_rate = -1;
         charging_status_t status = CS_DISCHARGING;
 
-       slurp(bat->path, buf, sizeof(buf));
+        slurp(bat->path, buf, sizeof(buf));
 
         for (walk = buf, last = buf; (walk-buf) < 1024; walk++) {
                 if (*walk == '\n') {

diff --git a/src/get_cpu_temperature.c b/src/get_cpu_temperature.c
index 56a559c5596c8108df3d7eb4220f33d7cdafcdd0..d000d2dc069516eef57a69781af2a296447de3c8 100644 (file)
--- a/src/get_cpu_temperature.c
+++ b/src/get_cpu_temperature.c
@@ -1,3 +1,4 @@
+// vim:ts=8:expandtab
 #include <stdlib.h>
 #include <limits.h>
 #include <stdio.h>
@@ -13,8 +14,8 @@ const char *get_cpu_temperature_info() {
         static char buf[16];
         long int temp;
 
-       slurp(thermal_zone, buf, sizeof(buf));
-       temp = strtol(buf, NULL, 10);
+        slurp(thermal_zone, buf, sizeof(buf));
+        temp = strtol(buf, NULL, 10);
 
         if (temp == LONG_MIN || temp == LONG_MAX || temp <= 0)
                 (void)snprintf(buf, sizeof(buf), "T: ? C");

diff --git a/src/get_eth_info.c b/src/get_eth_info.c
index 7561421d0a572488a4e65f011e8c35cd4ad9bc60..5e9ab542f151f304b4263204cc6d871f51ba6e5f 100644 (file)
--- a/src/get_eth_info.c
+++ b/src/get_eth_info.c
@@ -1,3 +1,4 @@
+// vim:ts=8:expandtab
 #include <string.h>
 #include <limits.h>
 #include <stdio.h>

diff --git a/src/get_ip_addr.c b/src/get_ip_addr.c
index de03d8c2ba846d65efc155046642304d622585a0..ba39a3d4bc1152867e797b6bc6459d59f1d58af8 100644 (file)
--- a/src/get_ip_addr.c
+++ b/src/get_ip_addr.c
@@ -1,3 +1,4 @@
+// vim:ts=8:expandtab
 #include <net/if.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
@@ -32,11 +33,11 @@ const char *get_ip_addr(const char *interface) {
         if (ioctl(general_socket, SIOCGIFADDR, &ifr) < 0)
                 return "no IP";
 
-       int ret;
-       if ((ret = getnameinfo(&ifr.ifr_addr, len, part, sizeof(part), NULL, 0, NI_NUMERICHOST)) != 0) {
-               fprintf(stderr, "getnameinfo(): %s\n", gai_strerror(ret));
-               return "no IP";
-       }
+        int ret;
+        if ((ret = getnameinfo(&ifr.ifr_addr, len, part, sizeof(part), NULL, 0, NI_NUMERICHOST)) != 0) {
+                fprintf(stderr, "getnameinfo(): %s\n", gai_strerror(ret));
+                return "no IP";
+        }
 
         return part;
 }

diff --git a/src/get_ipv6_addr.c b/src/get_ipv6_addr.c
index 44edc7add472a335700514f2d5a9eb9f7d385adf..95a06a6ec6163a3754a36da47f3cf495768fc6f2 100644 (file)
--- a/src/get_ipv6_addr.c
+++ b/src/get_ipv6_addr.c
@@ -1,3 +1,4 @@
+// vim:ts=8:expandtab
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -12,50 +13,50 @@
  *
  */
 const char *get_ipv6_addr() {
-       static char buf[INET6_ADDRSTRLEN+1];
-       struct addrinfo hints;
-       struct addrinfo *result, *resp;
-       int fd;
-
-       memset(&hints, 0, sizeof(struct addrinfo));
-       hints.ai_family = AF_INET6;
-
-       if (getaddrinfo("k.root-servers.net", "domain", &hints, &result) != 0) {
-               perror("getaddrinfo()");
-               return "no IP";
-       }
-
-       for (resp = result; resp != NULL; resp = resp->ai_next) {
-               if ((fd = socket(resp->ai_family, SOCK_STREAM, 0)) == -1) {
-                       perror("socket()");
-                       continue;
-               }
-
-               if (connect(fd, resp->ai_addr, resp->ai_addrlen) == -1) {
-                       perror("connect()");
-                       continue;
-               }
-
-               struct sockaddr_storage local;
-               socklen_t local_len = sizeof(struct sockaddr_storage);
-               if (getsockname(fd, (struct sockaddr*)&local, &local_len) == -1) {
-                       perror("getsockname()");
-                       return "no IP";
-               }
-
-               memset(buf, 0, INET6_ADDRSTRLEN + 1);
-               int ret;
-               if ((ret = getnameinfo((struct sockaddr*)&local, local_len, buf, sizeof(buf), NULL, 0, NI_NUMERICHOST)) != 0) {
-                       fprintf(stderr, "getnameinfo(): %s\n", gai_strerror(ret));
-                       return "no IP";
-               }
-
-               (void)close(fd);
-
-               free(result);
-               return buf;
-       }
-
-       free(result);
-       return "no IP";
+        static char buf[INET6_ADDRSTRLEN+1];
+        struct addrinfo hints;
+        struct addrinfo *result, *resp;
+        int fd;
+
+        memset(&hints, 0, sizeof(struct addrinfo));
+        hints.ai_family = AF_INET6;
+
+        if (getaddrinfo("k.root-servers.net", "domain", &hints, &result) != 0) {
+                perror("getaddrinfo()");
+                return "no IP";
+        }
+
+        for (resp = result; resp != NULL; resp = resp->ai_next) {
+                if ((fd = socket(resp->ai_family, SOCK_STREAM, 0)) == -1) {
+                        perror("socket()");
+                        continue;
+                }
+
+                if (connect(fd, resp->ai_addr, resp->ai_addrlen) == -1) {
+                        perror("connect()");
+                        continue;
+                }
+
+                struct sockaddr_storage local;
+                socklen_t local_len = sizeof(struct sockaddr_storage);
+                if (getsockname(fd, (struct sockaddr*)&local, &local_len) == -1) {
+                        perror("getsockname()");
+                        return "no IP";
+                }
+
+                memset(buf, 0, INET6_ADDRSTRLEN + 1);
+                int ret;
+                if ((ret = getnameinfo((struct sockaddr*)&local, local_len, buf, sizeof(buf), NULL, 0, NI_NUMERICHOST)) != 0) {
+                        fprintf(stderr, "getnameinfo(): %s\n", gai_strerror(ret));
+                        return "no IP";
+                }
+
+                (void)close(fd);
+
+                free(result);
+                return buf;
+        }
+
+        free(result);
+        return "no IP";
 }

diff --git a/src/get_load.c b/src/get_load.c
index 7d5349f20280b4040b7b461bede64b14464775e6..4f828135130668a8c5d6646eed2e398eaa169ae9 100644 (file)
--- a/src/get_load.c
+++ b/src/get_load.c
@@ -1,25 +1,26 @@
+// vim:ts=8:expandtab
 #include "i3status.h"
 
 const char *get_load() {
-       static char part[512];
+        static char part[512];
 
 /* Get load */
 #ifdef LINUX
-       slurp("/proc/loadavg", part, sizeof(part));
-       *skip_character(part, ' ', 3) = '\0';
+        slurp("/proc/loadavg", part, sizeof(part));
+        *skip_character(part, ' ', 3) = '\0';
 #else
-       /* TODO: correctly check for NetBSD, check if it works the same on *BSD */
-       struct loadavg load;
-       size_t length = sizeof(struct loadavg);
-       int mib[2] = { CTL_VM, VM_LOADAVG };
-       if (sysctl(mib, 2, &load, &length, NULL, 0) < 0)
-               die("Could not sysctl({ CTL_VM, VM_LOADAVG })\n");
-       double scale = load.fscale;
-       (void)snprintf(part, sizeof(part), "%.02f %.02f %.02f",
-                       (double)load.ldavg[0] / scale,
-                       (double)load.ldavg[1] / scale,
-                       (double)load.ldavg[2] / scale);
+        /* TODO: correctly check for NetBSD, check if it works the same on *BSD */
+        struct loadavg load;
+        size_t length = sizeof(struct loadavg);
+        int mib[2] = { CTL_VM, VM_LOADAVG };
+        if (sysctl(mib, 2, &load, &length, NULL, 0) < 0)
+                die("Could not sysctl({ CTL_VM, VM_LOADAVG })\n");
+        double scale = load.fscale;
+        (void)snprintf(part, sizeof(part), "%.02f %.02f %.02f",
+                        (double)load.ldavg[0] / scale,
+                        (double)load.ldavg[1] / scale,
+                        (double)load.ldavg[2] / scale);
 #endif
 
-       return part;
+        return part;
 }

diff --git a/src/get_wireless_info.c b/src/get_wireless_info.c
index fd0c60b67cd78774d5ca1ec7d61f7e8b17e1aa46..4d8d0b25a7c38f62a5f32ec4c2b22d8ae5172a84 100644 (file)
--- a/src/get_wireless_info.c
+++ b/src/get_wireless_info.c
@@ -1,3 +1,4 @@
+// vim:ts=8:expandtab
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -19,7 +20,7 @@ const char *get_wireless_info() {
         memset(buf, 0, sizeof(buf));
         memset(part, 0, sizeof(part));
 
-       slurp("/proc/net/wireless", buf, sizeof(buf));
+        slurp("/proc/net/wireless", buf, sizeof(buf));
 
         interfaces = skip_character(buf, '\n', 1) + 1;
         while ((interfaces = skip_character(interfaces, '\n', 1)+1) < buf+strlen(buf)) {

diff --git a/src/output.c b/src/output.c
index 7fc24f5c4d624a5176cf0563810d59082c2da9d9..901a940be04bc40648e81c33550ee027c33562bd 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -1,3 +1,4 @@
+// vim:ts=8:expandtab
 #include <stdbool.h>
 #include <string.h>
 #include <stdio.h>

diff --git a/src/process_runs.c b/src/process_runs.c
index 5e13de7f62f686ac9923db7818346a3e414dde00..bf4e919097c1f63a7f50c237d9f7c0028a6d7298 100644 (file)
--- a/src/process_runs.c
+++ b/src/process_runs.c
@@ -1,3 +1,4 @@
+// vim:ts=8:expandtab
 #include <stdbool.h>
 #include <glob.h>
 #include <string.h>