auto-format c sources

2 files changed, 110 insertions, 105 deletions

diff --git a/censor.c b/censor.c
index ab6c5ba..64e936b 100644
--- a/censor.c
+++ b/censor.c
@@ -13,63 +13,64 @@
  * 0. You just DO WHAT THE FUCK YOU WANT TO.
  */
 
-#include <stdint.h>
-#include <stdio.h>
-#include <wchar.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
+#include <locale.h>
+#include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <locale.h>
-#include <unistd.h>
 #include <sys/time.h>
+#include <unistd.h>
+#include <wchar.h>
 
-int main(int argc, char **argv){
-    char **inputs = argv+1;
-    char **inputs_end = argv+argc;
-    if(inputs == inputs_end){
-        char *foo[] = {"-"};
+int main(int argc, char** argv)
+{
+    char** inputs = argv + 1;
+    char** inputs_end = argv + argc;
+    if (inputs == inputs_end) {
+        char* foo[] = { "-" };
         inputs = foo;
-        inputs_end = inputs+1;
+        inputs_end = inputs + 1;
     }
 
     setlocale(LC_ALL, "");
 
     int escape_state = 0;
-    for(char **filename=inputs; filename<inputs_end; filename++){
-        FILE *f = stdin;
+    for (char** filename = inputs; filename < inputs_end; filename++) {
+        FILE* f = stdin;
 
-        if(strcmp(*filename, "-"))
+        if (strcmp(*filename, "-"))
             f = fopen(*filename, "r");
-        
-        if(!f){
+
+        if (!f) {
             fprintf(stderr, "Cannot open input file \"%s\": %s\n", *filename, strerror(errno));
             return 2;
-        } 
+        }
 
         int c;
-        while((c = fgetwc(f)) > 0){
-            if(!escape_state){
-                if(c == '\e'){
+        while ((c = fgetwc(f)) > 0) {
+            if (!escape_state) {
+                if (c == '\e') {
                     printf("%lc", c);
                     escape_state = 1;
-                }else if(strchr("acegmnopqrsuvwxyz", c))
+                } else if (strchr("acegmnopqrsuvwxyz", c))
                     printf("▄");
-                else if(strchr(".,:; \t\r\n", c))
+                else if (strchr(".,:; \t\r\n", c))
                     printf("%lc", c);
                 else
                     printf("█");
-            }else{
+            } else {
                 printf("%lc", c);
-                if(!strchr("[0123456789;", c))
+                if (!strchr("[0123456789;", c))
                     escape_state = 0;
             }
         }
 
         fclose(f);
 
-        if(c != WEOF && c != 0){
+        if (c != WEOF && c != 0) {
             fprintf(stderr, "Error reading input file \"%s\": %s\n", *filename, strerror(errno));
             return 2;
         }
diff --git a/lolcat.c b/lolcat.c
index 6e6ffba..f1587dd 100644
--- a/lolcat.c
+++ b/lolcat.c
@@ -15,157 +15,161 @@
 
 #define _XOPEN_SOURCE
 
-#include <stdint.h>
-#include <stdio.h>
-#include <wchar.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
+#include <locale.h>
+#include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <locale.h>
-#include <unistd.h>
 #include <sys/time.h>
+#include <unistd.h>
+#include <wchar.h>
 
 static char helpstr[] = "\n"
-"Usage: lolcat [-h horizontal_speed] [-v vertical_speed] [--] [FILES...]\n"
-"\n"
-"Concatenate FILE(s), or standard input, to standard output.\n"
-"With no FILE, or when FILE is -, read standard input.\n"
-"\n"
-"              -h <d>:   Horizontal rainbow frequency (default: 0.23)\n"
-"              -v <d>:   Vertical rainbow frequency (default: 0.1)\n"
-"                  -f:   Force color even when stdout is not a tty\n"
-"           --version:   Print version and exit\n"
-"              --help:   Show this message\n"
-"\n"
-"Examples:\n"
-"  lolcat f - g      Output f's contents, then stdin, then g's contents.\n"
-"  lolcat            Copy standard input to standard output.\n"
-"  fortune | lolcat  Display a rainbow cookie.\n"
-"\n"
-"Report lolcat bugs to <http://www.github.org/jaseg/lolcat/issues>\n"
-"lolcat home page: <http://www.github.org/jaseg/lolcat/>\n"
-"Original idea: <http://www.github.org/busyloop/lolcat/>\n";
-
-#define ARRAY_SIZE(foo) (sizeof(foo)/sizeof(foo[0]))
-const char codes[] = {39,38,44,43,49,48,84,83,119,118,154,148,184,178,214,208,209,203,204,198,199,163,164,128,129,93,99,63,69,33};
-
-void find_escape_sequences(int c, int *state){
-    if(c == '\033'){ /* Escape sequence YAY */
+                        "Usage: lolcat [-h horizontal_speed] [-v vertical_speed] [--] [FILES...]\n"
+                        "\n"
+                        "Concatenate FILE(s), or standard input, to standard output.\n"
+                        "With no FILE, or when FILE is -, read standard input.\n"
+                        "\n"
+                        "              -h <d>:   Horizontal rainbow frequency (default: 0.23)\n"
+                        "              -v <d>:   Vertical rainbow frequency (default: 0.1)\n"
+                        "                  -f:   Force color even when stdout is not a tty\n"
+                        "           --version:   Print version and exit\n"
+                        "              --help:   Show this message\n"
+                        "\n"
+                        "Examples:\n"
+                        "  lolcat f - g      Output f's contents, then stdin, then g's contents.\n"
+                        "  lolcat            Copy standard input to standard output.\n"
+                        "  fortune | lolcat  Display a rainbow cookie.\n"
+                        "\n"
+                        "Report lolcat bugs to <http://www.github.org/jaseg/lolcat/issues>\n"
+                        "lolcat home page: <http://www.github.org/jaseg/lolcat/>\n"
+                        "Original idea: <http://www.github.org/busyloop/lolcat/>\n";
+
+#define ARRAY_SIZE(foo) (sizeof(foo) / sizeof(foo[0]))
+const char codes[] = { 39, 38, 44, 43, 49, 48, 84, 83, 119, 118, 154, 148, 184, 178, 214, 208, 209, 203, 204, 198, 199, 163, 164, 128, 129, 93, 99, 63, 69, 33 };
+
+void find_escape_sequences(int c, int* state)
+{
+    if (c == '\033') { /* Escape sequence YAY */
         *state = 1;
-    }else if(*state == 1){
-        if(('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z'))
+    } else if (*state == 1) {
+        if (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z'))
             *state = 2;
-    }else{
+    } else {
         *state = 0;
     }
 }
 
-
-void usage(){
+void usage()
+{
     printf("Usage: lolcat [-h horizontal_speed] [-v vertical_speed] [--] [FILES...]\n");
     exit(1);
 }
 
-void version(){
+void version()
+{
     printf("lolcat version 0.1, (c) 2014 jaseg\n");
     exit(0);
 }
 
-int main(int argc, char **argv){
-    char *default_argv[] = {"-"};
-    int cc=-1, i, l=0;
+int main(int argc, char** argv)
+{
+    char* default_argv[] = { "-" };
+    int cc = -1, i, l = 0;
     wint_t c;
-    int colors=1;
+    int colors = 1;
     double freq_h = 0.23, freq_v = 0.1;
 
     struct timeval tv;
     gettimeofday(&tv, NULL);
-    double offx = (tv.tv_sec%300)/300.0;
+    double offx = (tv.tv_sec % 300) / 300.0;
 
-    for(i=1;i<argc;i++){
-        char *endptr;
-        if(!strcmp(argv[i], "-h")){
-            if((++i)<argc){
+    for (i = 1; i < argc; i++) {
+        char* endptr;
+        if (!strcmp(argv[i], "-h")) {
+            if ((++i) < argc) {
                 freq_h = strtod(argv[i], &endptr);
-                if(*endptr)
+                if (*endptr)
                     usage();
-            }else{
+            } else {
                 usage();
             }
-        }else if(!strcmp(argv[i], "-v")){
-            if((++i)<argc){
+        } else if (!strcmp(argv[i], "-v")) {
+            if ((++i) < argc) {
                 freq_v = strtod(argv[i], &endptr);
-                if(*endptr)
+                if (*endptr)
                     usage();
-            }else{
+            } else {
                 usage();
             }
-        }else if(!strcmp(argv[i], "-f")){
+        } else if (!strcmp(argv[i], "-f")) {
             colors = 1;
-        }else if(!strcmp(argv[i], "--version")){
+        } else if (!strcmp(argv[i], "--version")) {
             version();
-        }else{
-            if(!strcmp(argv[i], "--"))
+        } else {
+            if (!strcmp(argv[i], "--"))
                 i++;
             break;
         }
     }
 
-    char **inputs = argv+i;
-    char **inputs_end = argv+argc;
-    if(inputs == inputs_end){
+    char** inputs = argv + i;
+    char** inputs_end = argv + argc;
+    if (inputs == inputs_end) {
         inputs = default_argv;
-        inputs_end = inputs+1;
+        inputs_end = inputs + 1;
     }
 
     setlocale(LC_ALL, "");
 
-    i=0;
-    for(char **filename=inputs; filename<inputs_end; filename++){
-        wint_t (*this_file_read_wchar)(FILE *); /* Used for --help because fmemopen is universally broken when used with fgetwc */
-        FILE *f;
+    i = 0;
+    for (char** filename = inputs; filename < inputs_end; filename++) {
+        wint_t (*this_file_read_wchar)(FILE*); /* Used for --help because fmemopen is universally broken when used with fgetwc */
+        FILE* f;
         int escape_state = 0;
 
-        wint_t helpstr_hack(FILE * _ignored) {
-            (void) _ignored;
+        wint_t helpstr_hack(FILE * _ignored)
+        {
+            (void)_ignored;
             static size_t idx = 0;
-            char c =  helpstr[idx++];
+            char c = helpstr[idx++];
             if (c)
                 return c;
             idx = 0;
             return WEOF;
         }
 
-        if(!strcmp(*filename, "--help")) {
+        if (!strcmp(*filename, "--help")) {
             this_file_read_wchar = &helpstr_hack;
             f = 0;
 
-        } else if(!strcmp(*filename, "-")) {
+        } else if (!strcmp(*filename, "-")) {
             this_file_read_wchar = &fgetwc;
             f = stdin;
 
         } else {
             this_file_read_wchar = &fgetwc;
             f = fopen(*filename, "r");
-            if(!f){
+            if (!f) {
                 fprintf(stderr, "Cannot open input file \"%s\": %s\n", *filename, strerror(errno));
                 return 2;
-            } 
+            }
         }
-        
-        while((c = this_file_read_wchar(f)) != WEOF) {
-            if(colors){
+
+        while ((c = this_file_read_wchar(f)) != WEOF) {
+            if (colors) {
                 find_escape_sequences(c, &escape_state);
 
-                if(!escape_state){
-                    if(c == '\n'){
+                if (!escape_state) {
+                    if (c == '\n') {
                         l++;
                         i = 0;
-                    }else{
-                        int ncc = offx*ARRAY_SIZE(codes) + (int)((i+=wcwidth(c))*freq_h + l*freq_v);
-                        if(cc != ncc)
+                    } else {
+                        int ncc = offx * ARRAY_SIZE(codes) + (int)((i += wcwidth(c)) * freq_h + l * freq_v);
+                        if (cc != ncc)
                             printf("\033[38;5;%hhum", codes[(cc = ncc) % ARRAY_SIZE(codes)]);
                     }
                 }
@@ -173,7 +177,7 @@ int main(int argc, char **argv){
 
             printf("%lc", c);
 
-            if(escape_state == 2)
+            if (escape_state == 2)
                 printf("\033[38;5;%hhum", codes[cc % ARRAY_SIZE(codes)]);
         }
         printf("\n\033[0m");
@@ -182,7 +186,7 @@ int main(int argc, char **argv){
         if (f) {
             fclose(f);
 
-            if(ferror(f)){
+            if (ferror(f)) {
                 fprintf(stderr, "Error reading input file \"%s\": %s\n", *filename, strerror(errno));
                 return 2;
             }