Fix several whitespace errors

* Remove whitespace at the end of lines.
* Replace space indentation by tabs.
* Add whitespace before/after several operators ("+", "-", "*", ...)
* Add whitespace to assignments ("foo = bar;").
* Fix whitespace in parameter lists ("foobar(foo, bar, 42)").

Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>

14 files changed, 99 insertions, 99 deletions

diff --git a/cache.c b/cache.c
index d7a8d5a..6427b69 100644
--- a/cache.c
+++ b/cache.c
@@ -105,7 +105,7 @@ static int is_expired(struct cache_slot *slot)
         if (slot->ttl < 0)
                 return 0;
         else
-                return slot->cache_st.st_mtime + slot->ttl*60 < time(NULL);
+                return slot->cache_st.st_mtime + slot->ttl * 60 < time(NULL);
 }
 
 /* Check if the slot has been modified since we opened it.
@@ -141,8 +141,8 @@ static int close_lock(struct cache_slot *slot)
  */
 static int lock_slot(struct cache_slot *slot)
 {
-        slot->lock_fd = open(slot->lock_name, O_RDWR|O_CREAT|O_EXCL,
-                             S_IRUSR|S_IWUSR);
+        slot->lock_fd = open(slot->lock_name, O_RDWR | O_CREAT | O_EXCL,
+                             S_IRUSR | S_IWUSR);
         if (slot->lock_fd == -1)
                 return errno;
         if (xwrite(slot->lock_fd, slot->key, slot->keylen + 1) < 0)
diff --git a/cgit.c b/cgit.c
index d615315..0807258 100644
--- a/cgit.c
+++ b/cgit.c
@@ -741,7 +741,7 @@ static void cgit_parse_args(int argc, const char **argv)
 
         for (i = 1; i < argc; i++) {
                 if (!strncmp(argv[i], "--cache=", 8)) {
-                        ctx.cfg.cache_root = xstrdup(argv[i]+8);
+                        ctx.cfg.cache_root = xstrdup(argv[i] + 8);
                 }
                 if (!strcmp(argv[i], "--nocache")) {
                         ctx.cfg.nocache = 1;
@@ -750,24 +750,24 @@ static void cgit_parse_args(int argc, const char **argv)
                         ctx.env.no_http = "1";
                 }
                 if (!strncmp(argv[i], "--query=", 8)) {
-                        ctx.qry.raw = xstrdup(argv[i]+8);
+                        ctx.qry.raw = xstrdup(argv[i] + 8);
                 }
                 if (!strncmp(argv[i], "--repo=", 7)) {
-                        ctx.qry.repo = xstrdup(argv[i]+7);
+                        ctx.qry.repo = xstrdup(argv[i] + 7);
                 }
                 if (!strncmp(argv[i], "--page=", 7)) {
-                        ctx.qry.page = xstrdup(argv[i]+7);
+                        ctx.qry.page = xstrdup(argv[i] + 7);
                 }
                 if (!strncmp(argv[i], "--head=", 7)) {
-                        ctx.qry.head = xstrdup(argv[i]+7);
+                        ctx.qry.head = xstrdup(argv[i] + 7);
                         ctx.qry.has_symref = 1;
                 }
                 if (!strncmp(argv[i], "--sha1=", 7)) {
-                        ctx.qry.sha1 = xstrdup(argv[i]+7);
+                        ctx.qry.sha1 = xstrdup(argv[i] + 7);
                         ctx.qry.has_sha1 = 1;
                 }
                 if (!strncmp(argv[i], "--ofs=", 6)) {
-                        ctx.qry.ofs = atoi(argv[i]+6);
+                        ctx.qry.ofs = atoi(argv[i] + 6);
                 }
                 if (!strncmp(argv[i], "--scan-tree=", 12) ||
                     !strncmp(argv[i], "--scan-path=", 12)) {
@@ -834,7 +834,7 @@ int main(int argc, const char **argv)
                 ctx.cfg.virtual_root = trim_end(ctx.cfg.script_name, '/');
                 if (!ctx.cfg.virtual_root)
                         ctx.cfg.virtual_root = "";
-        }
+        }
 
         /* If no url parameter is specified on the querystring, lets
          * use PATH_INFO as url. This allows cgit to work with virtual
@@ -856,7 +856,7 @@ int main(int argc, const char **argv)
         }
 
         ttl = calc_ttl();
-        ctx.page.expires += ttl*60;
+        ctx.page.expires += ttl * 60;
         if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD"))
                 ctx.cfg.nocache = 1;
         if (ctx.cfg.nocache)
diff --git a/configfile.c b/configfile.c
index 4908058..fe5f9c5 100644
--- a/configfile.c
+++ b/configfile.c
@@ -13,9 +13,9 @@
 int next_char(FILE *f)
 {
         int c = fgetc(f);
-        if (c=='\r') {
+        if (c == '\r') {
                 c = fgetc(f);
-                if (c!='\n') {
+                if (c != '\n') {
                         ungetc(c, f);
                         c = '\r';
                 }
@@ -27,7 +27,7 @@ void skip_line(FILE *f)
 {
         int c;
 
-        while((c=next_char(f)) && c!='\n' && c!=EOF)
+        while((c = next_char(f)) && c != '\n' && c != EOF)
                 ;
 }
 
@@ -36,31 +36,31 @@ int read_config_line(FILE *f, char *line, const char **value, int bufsize)
         int i = 0, isname = 0;
 
         *value = NULL;
-        while(i<bufsize-1) {
+        while(i < bufsize - 1) {
                 int c = next_char(f);
-                if (!isname && (c=='#' || c==';')) {
+                if (!isname && (c == '#' || c == ';')) {
                         skip_line(f);
                         continue;
                 }
                 if (!isname && isspace(c))
                         continue;
 
-                if (c=='=' && !*value) {
+                if (c == '=' && !*value) {
                         line[i] = 0;
-                        *value = &line[i+1];
-                } else if (c=='\n' && !isname) {
+                        *value = &line[i + 1];
+                } else if (c == '\n' && !isname) {
                         i = 0;
                         continue;
-                } else if (c=='\n' || c==EOF) {
+                } else if (c == '\n' || c == EOF) {
                         line[i] = 0;
                         break;
                 } else {
-                        line[i]=c;
+                        line[i] = c;
                 }
                 isname = 1;
                 i++;
         }
-        line[i+1] = 0;
+        line[i + 1] = 0;
         return i;
 }
 
diff --git a/html.c b/html.c
index 8f6e4f6..ed6cefc 100644
--- a/html.c
+++ b/html.c
@@ -54,7 +54,7 @@ char *fmt(const char *format, ...)
         va_start(args, format);
         len = vsnprintf(buf[bufidx], sizeof(buf[bufidx]), format, args);
         va_end(args);
-        if (len>sizeof(buf[bufidx])) {
+        if (len > sizeof(buf[bufidx])) {
                 fprintf(stderr, "[html.c] string truncated: %s\n", format);
                 exit(1);
         }
@@ -94,19 +94,19 @@ void html_txt(const char *txt)
         const char *t = txt;
         while(t && *t){
                 int c = *t;
-                if (c=='<' || c=='>' || c=='&') {
+                if (c == '<' || c == '>' || c == '&') {
                         html_raw(txt, t - txt);
-                        if (c=='>')
+                        if (c == '>')
                                 html("&gt;");
-                        else if (c=='<')
+                        else if (c == '<')
                                 html("&lt;");
-                        else if (c=='&')
+                        else if (c == '&')
                                 html("&amp;");
-                        txt = t+1;
+                        txt = t + 1;
                 }
                 t++;
         }
-        if (t!=txt)
+        if (t != txt)
                 html(txt);
 }
 
@@ -115,21 +115,21 @@ void html_ntxt(int len, const char *txt)
         const char *t = txt;
         while(t && *t && len--){
                 int c = *t;
-                if (c=='<' || c=='>' || c=='&') {
+                if (c == '<' || c == '>' || c == '&') {
                         html_raw(txt, t - txt);
-                        if (c=='>')
+                        if (c == '>')
                                 html("&gt;");
-                        else if (c=='<')
+                        else if (c == '<')
                                 html("&lt;");
-                        else if (c=='&')
+                        else if (c == '&')
                                 html("&amp;");
-                        txt = t+1;
+                        txt = t + 1;
                 }
                 t++;
         }
-        if (t!=txt)
+        if (t != txt)
                 html_raw(txt, t - txt);
-        if (len<0)
+        if (len < 0)
                 html("...");
 }
 
@@ -138,23 +138,23 @@ void html_attr(const char *txt)
         const char *t = txt;
         while(t && *t){
                 int c = *t;
-                if (c=='<' || c=='>' || c=='\'' || c=='\"' || c=='&') {
+                if (c == '<' || c == '>' || c == '\'' || c == '\"' || c == '&') {
                         html_raw(txt, t - txt);
-                        if (c=='>')
+                        if (c == '>')
                                 html("&gt;");
-                        else if (c=='<')
+                        else if (c == '<')
                                 html("&lt;");
-                        else if (c=='\'')
+                        else if (c == '\'')
                                 html("&#x27;");
-                        else if (c=='"')
+                        else if (c == '"')
                                 html("&quot;");
-                        else if (c=='&')
+                        else if (c == '&')
                                 html("&amp;");
-                        txt = t+1;
+                        txt = t + 1;
                 }
                 t++;
         }
-        if (t!=txt)
+        if (t != txt)
                 html(txt);
 }
 
@@ -164,14 +164,14 @@ void html_url_path(const char *txt)
         while(t && *t){
                 unsigned char c = *t;
                 const char *e = url_escape_table[c];
-                if (e && c!='+' && c!='&') {
+                if (e && c != '+' && c != '&') {
                         html_raw(txt, t - txt);
                         html(e);
-                        txt = t+1;
+                        txt = t + 1;
                 }
                 t++;
         }
-        if (t!=txt)
+        if (t != txt)
                 html(txt);
 }
 
@@ -186,11 +186,11 @@ void html_url_arg(const char *txt)
                 if (e) {