avstring: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>

libavutil/avstring.c

@@ -24,10 +24,11 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#include "avstring.h"
+
 #include "config.h"
 #include "common.h"
 #include "mem.h"
+#include "avstring.h"
 
 int av_strstart(const char *str, const char *pfx, const char **ptr)
 {
@@ -56,10 +57,10 @@ char *av_stristr(const char *s1, const char *s2)
     if (!*s2)
         return s1;
 
-    do {
+    do
         if (av_stristart(s1, s2, NULL))
             return s1;
-    } while (*s1++);
+    while (*s1++);
 
     return NULL;
 }
@@ -96,8 +97,9 @@ size_t av_strlcatf(char *dst, size_t size, const char *fmt, ...)
 
 char *av_d2str(double d)
 {
-    char *str= av_malloc(16);
+    char *str = av_malloc(16);
-    if(str) snprintf(str, 16, "%f", d);
+    if (str)
+        snprintf(str, 16, "%f", d);
     return str;
 }
 
@@ -105,32 +107,33 @@ char *av_d2str(double d)
 
 char *av_get_token(const char **buf, const char *term)
 {
-    char *out = av_malloc(strlen(*buf) + 1);
+    char *out     = av_malloc(strlen(*buf) + 1);
-    char *ret= out, *end= out;
+    char *ret     = out, *end = out;
     const char *p = *buf;
-    if (!out) return NULL;
+    if (!out)
+        return NULL;
     p += strspn(p, WHITESPACES);
 
-    while(*p && !strspn(p, term)) {
+    while (*p && !strspn(p, term)) {
         char c = *p++;
-        if(c == '\\' && *p){
+        if (c == '\\' && *p) {
             *out++ = *p++;
-            end= out;
+            end    = out;
-        }else if(c == '\''){
+        } else if (c == '\'') {
-            while(*p && *p != '\'')
+            while (*p && *p != '\'')
                 *out++ = *p++;
-            if(*p){
+            if (*p) {
                 p++;
-                end= out;
+                end = out;
             }
-        }else{
+        } else {
             *out++ = c;
         }
     }
 
-    do{
+    do
         *out-- = 0;
-    }while(out >= end && strspn(out, WHITESPACES));
+    while (out >= end && strspn(out, WHITESPACES));
 
     *buf = p;
 
@@ -196,54 +199,48 @@ const char *av_dirname(char *path)
     return path;
 }
 
-
 #ifdef TEST
 
-#include "common.h"
-
 int main(void)
 {
     int i;
+    const char *strings[] = {
+        "''",
+        "",
+        ":",
+        "\\",
+        "'",
+        "    ''    :",
+        "    ''  ''  :",
+        "foo   '' :",
+        "'foo'",
+        "foo     ",
+        "  '  foo  '  ",
+        "foo\\",
+        "foo':  blah:blah",
+        "foo\\:  blah:blah",
+        "foo\'",
+        "'foo :  '  :blahblah",
+        "\\ :blah",
+        "     foo",
+        "      foo       ",
+        "      foo     \\ ",
+        "foo ':blah",
+        " foo   bar    :   blahblah",
+        "\\f\\o\\o",
+        "'foo : \\ \\  '   : blahblah",
+        "'\\fo\\o:': blahblah",
+        "\\'fo\\o\\:':  foo  '  :blahblah"
+    };
 
     printf("Testing av_get_token()\n");
-    {
+    for (i = 0; i < FF_ARRAY_ELEMS(strings); i++) {
-        const char *strings[] = {
+        const char *p = strings[i], *q;
-            "''",
+        printf("|%s|", p);
-            "",
+        q = av_get_token(&p, ":");
-            ":",
+        printf(" -> |%s|", q);
-            "\\",
+        printf(" + |%s|\n", p);
-            "'",
+        av_free(q);
-            "    ''    :",
-            "    ''  ''  :",
-            "foo   '' :",
-            "'foo'",
-            "foo     ",
-            "  '  foo  '  ",
-            "foo\\",
-            "foo':  blah:blah",
-            "foo\\:  blah:blah",
-            "foo\'",
-            "'foo :  '  :blahblah",
-            "\\ :blah",
-            "     foo",
-            "      foo       ",
-            "      foo     \\ ",
-            "foo ':blah",
-            " foo   bar    :   blahblah",
-            "\\f\\o\\o",
-            "'foo : \\ \\  '   : blahblah",
-            "'\\fo\\o:': blahblah",
-            "\\'fo\\o\\:':  foo  '  :blahblah"
-        };
-
-        for (i=0; i < FF_ARRAY_ELEMS(strings); i++) {
-            const char *p = strings[i], *q;
-            printf("|%s|", p);
-            q = av_get_token(&p, ":");
-            printf(" -> |%s|", q);
-            printf(" + |%s|\n", p);
-            av_free(q);
-        }
     }
 
     return 0;