--- a/th_string.c	Tue Jun 28 21:46:18 2011 +0300
+++ b/th_string.c	Mon Oct 03 00:04:33 2011 +0300
@@ -36,13 +36,15 @@
 
     /* Copy to the destination */
     i = n;
-    while (*s && i > 0) {
+    while (*s && i > 0)
+    {
         *(d++) = *(s++);
         i--;
     }
 
     /* Fill rest of space with zeros */
-    while (i > 0) {
+    while (i > 0)
+    {
         *(d++) = 0;
         i--;
     }
@@ -64,7 +66,8 @@
     if ((buf = th_malloc(size)) == NULL)
         return NULL;
     
-    while (1) {
+    while (1)
+    {
         int n;
         va_list ap;
         va_copy(ap, args);
@@ -78,7 +81,8 @@
         else
             size *= 2;
 
-        if ((nbuf = th_realloc(nbuf, size)) == NULL) {
+        if ((nbuf = th_realloc(nbuf, size)) == NULL)
+        {
             th_free(buf);
             return NULL;
         }
@@ -133,7 +137,8 @@
     if (str1 == str2)
         return 0;
 
-    while (*s1 && *s2 && th_tolower(*s1) == th_tolower(*s2)) {
+    while (*s1 && *s2 && th_tolower(*s1) == th_tolower(*s2))
+    {
         s1++;
         s2++;
     }
@@ -151,7 +156,8 @@
     if (str1 == str2)
         return 0;
 
-    while (n > 0 && *s1 && *s2 && th_tolower(*s1) == th_tolower(*s2)) {
+    while (n > 0 && *s1 && *s2 && th_tolower(*s1) == th_tolower(*s2))
+    {
         s1++;
         s2++;
         n--;
@@ -171,7 +177,8 @@
 
     i = str;
     j = str;
-    while (*i) {
+    while (*i)
+    {
         if (!th_iscntrl(*i))
             *(j++) = *i;
         i++;
@@ -208,13 +215,16 @@
     if (str == NULL)
         return -1;
 
-    if (*result != NULL) {
+    if (*result != NULL)
+    {
         *result = th_realloc(*result, strlen(*result) + strlen(str) + 1);
         if (*result == NULL)
             return -1;
 
         strcat(*result, str);
-    } else {
+    }
+    else
+    {
         *result = th_malloc(strlen(str) + 1);
         if (*result == NULL)
             return -1;
@@ -237,6 +247,7 @@
     /* Terminating NULL-character is not whitespace! */
     while (th_isspace(str[*pos]))
         (*pos)++;
+
     return &str[*pos];
 }
 
@@ -284,10 +295,12 @@
     /* Start comparision */
     do {
         didMatch = FALSE;
-        switch (*pattern) {
+        switch (*pattern)
+        {
         case '?':
             /* Any single character matches */
-            if (*str) {
+            if (*str)
+            {
                 didMatch = TRUE;
                 pattern++;
                 str++;
@@ -304,42 +317,59 @@
             break;
 
         case 0:
-            if (isAnyMode) {
+            if (isAnyMode)
+            {
                 if (*str)
                     str++;
                 else
                     isEnd = TRUE;
-            } else {
-                if (*str) {
-                    if (tmpPattern) {
+            }
+            else
+            {
+                if (*str)
+                {
+                    if (tmpPattern)
+                    {
                         isAnyMode = TRUE;
                         pattern = tmpPattern;
-                    } else
+                    }
+                    else
                         didMatch = FALSE;
                 } else
                     isEnd = TRUE;
             }
             break;
         default:
-            if (isAnyMode) {
-                if (*pattern == *str) {
+            if (isAnyMode)
+            {
+                if (*pattern == *str)
+                {
                     isAnyMode = FALSE;
                     didMatch = TRUE;
-                } else {
-                    if (*str) {
+                }
+                else
+                {
+                    if (*str)
+                    {
                         didMatch = TRUE;
                         str++;
                     }
                 }
-            } else {
-                if (*pattern == *str) {
+            }
+            else
+            {
+                if (*pattern == *str)
+                {
                     didMatch = TRUE;
                     if (*pattern)
                         pattern++;
                     if (*str)
                         str++;
-                } else {
-                    if (tmpPattern) {
+                }
+                else
+                {
+                    if (tmpPattern)
+                    {
                         didMatch = TRUE;
                         isAnyMode = TRUE;
                         pattern = tmpPattern;
@@ -375,7 +405,8 @@
         switch (*pattern) {
         case '?':
             /* Any single character matches */
-            if (*str) {
+            if (*str)
+            {
                 pattern++;
                 str++;
             } else
@@ -391,17 +422,23 @@
             break;
 
         case 0:
-            if (isAnyMode) {
+            if (isAnyMode)
+            {
                 if (*str)
                     str++;
                 else
                     isEnd = TRUE;
-            } else {
-                if (*str) {
-                    if (tmpPattern) {
+            }
+            else
+            {
+                if (*str)
+                {
+                    if (tmpPattern)
+                    {
                         isAnyMode = TRUE;
                         pattern = tmpPattern;
-                    } else
+                    }
+                    else
                         didMatch = FALSE;
                 } else
                     isEnd = TRUE;
@@ -409,32 +446,44 @@
             break;
 
         default:
-            if (isAnyMode) {
-                if (th_tolower(*pattern) == th_tolower(*str)) {
+            if (isAnyMode)
+            {
+                if (th_tolower(*pattern) == th_tolower(*str))
+                {
                     isAnyMode = FALSE;
-                } else {
+                }
+                else
+                {
                     if (*str)
                         str++;
                     else
                         didMatch = FALSE;
                 }
-            } else {
-                if (th_tolower(*pattern) == th_tolower(*str)) {
+            }
+            else
+            {
+                if (th_tolower(*pattern) == th_tolower(*str))
+                {
                     if (*pattern)
                         pattern++;
                     if (*str)
                         str++;
-                } else {
-                    if (tmpPattern) {
+                }
+                else
+                {
+                    if (tmpPattern)
+                    {
                         isAnyMode = TRUE;
                         pattern = tmpPattern;
-                    } else
+                    }
+                    else
                         didMatch = FALSE;
                 }
             }
 
             if (!*str && !*pattern)
                 isEnd = TRUE;
+
             break;
 
         }        /* switch */
@@ -450,14 +499,24 @@
     const char *p = str;
     int len, val = 0;
     
-    for (len = 0; *p && len < 6; p++, len++) {
-        if (*p >= '0' && *p <= '9') {
-            val *= 16; val += (*p - '0');
-        } else if (*p >= 'A' && *p <= 'F') {
-            val *= 16; val += (*p - 'A') + 10;
-        } else if (*p >= 'a' && *p <= 'f') {
-            val *= 16; val += (*p - 'a') + 10;
-        } else
+    for (len = 0; *p && len < 6; p++, len++)
+    {
+        if (*p >= '0' && *p <= '9')
+        {
+            val *= 16;
+            val += (*p - '0');
+        }
+        else if (*p >= 'A' && *p <= 'F')
+        {
+            val *= 16;
+            val += (*p - 'A') + 10;
+        }
+        else if (*p >= 'a' && *p <= 'f')
+        {
+            val *= 16;
+            val += (*p - 'a') + 10;
+        }
+        else
             return -1;
     }
     
@@ -470,7 +529,8 @@
     if (*buf == NULL)
         *bufsize = *len = 0;
     
-    if (*buf == NULL || *len + grow >= *bufsize) {
+    if (*buf == NULL || *len + grow >= *bufsize)
+    {
         *bufsize += grow + TH_BUFGROW;
         *buf = (char *) th_realloc(*buf, *bufsize);
         if (*buf == NULL)