fix formatting

1 files changed, 75 insertions, 66 deletions

diff --git a/src/extstring.c b/src/extstring.c
index fc3cb45..044e368 100644
--- a/src/extstring.c
+++ b/src/extstring.c
@@ -11,102 +11,111 @@
 char *
 strlwr (char *s)
 {
-	unsigned char *p = (unsigned char *) s;
+    unsigned char *p = (unsigned char *) s;
 
-	while (*p) {
-		*p = tolower ((unsigned char)*p);
-		p++;
-	}
+    while (*p)
+    {
+        *p = tolower ((unsigned char) *p);
+        p++;
+    }
 
-	return s;
+    return s;
 }
 
 char *
 strupr (char *s)
 {
-  unsigned char *p = (unsigned char *) s;
+    unsigned char *p = (unsigned char *) s;
 
-  while (*p) {
-		*p = toupper ((unsigned char)*p);
-		p++;
-  }
+    while (*p)
+    {
+        *p = toupper ((unsigned char) *p);
+        p++;
+    }
 
-  return s;
+    return s;
 
 }
 
 char *
 trim (char *s, int *rem_front, int *rem_back)
 {
-  char *result = strdup (s);
-  char *end;
-
-  while (isspace ((unsigned char)*result)) {
-    result++;
-    if (rem_front) *rem_front += 1;
-  }
+    char *result = strdup (s);
+    char *end;
+
+    while (isspace ((unsigned char) *result))
+    {
+        result++;
+        if (rem_front)
+            *rem_front += 1;
+    }
 
-  if (*result == 0)
-    return result;
+    if (*result == 0)
+        return result;
 
-  end = result + strlen (result) - 1;
-  while (end > result && isspace ((unsigned char)*end)) {
-    end--;
-    if (rem_back) *rem_back +=1;
-  }
+    end = result + strlen (result) - 1;
+    while (end > result && isspace ((unsigned char) *end))
+    {
+        end--;
+        if (rem_back)
+            *rem_back += 1;
+    }
 
-  end[1] = '\0';
+    end[1] = '\0';
 
-  return result;
+    return result;
 }
 
 char *
-replace_str (char *s,
-						 char *old,
-						 char *replace)
+replace_str (char *s, char *old, char *replace)
 {
-  char* result;
-  int i, cnt = 0;
-  size_t new_size = strlen (replace);
-  size_t old_size = strlen (old);
-
-  for (i = 0; s[i] != '\0'; i++) {
-    if (strstr (&s[i], old) == &s[i]) {
-      cnt++;
-      i += old_size - 1;
+    char *result;
+    int i, cnt = 0;
+    size_t new_size = strlen (replace);
+    size_t old_size = strlen (old);
+
+    for (i = 0; s[i] != '\0'; i++)
+    {
+        if (strstr (&s[i], old) == &s[i])
+        {
+            cnt++;
+            i += old_size - 1;
+        }
     }
-  }
-
-  result = (char*)malloc_secure (i + cnt * (new_size - old_size) + 1);
 
-  i = 0;
-  while (*s) {
-    if (strstr (s, old) == s) {
-      strcpy (&result[i], replace);
-      i += new_size;
-      s += old_size;
+    result = (char *) malloc_secure (i + cnt * (new_size - old_size) + 1);
+
+    i = 0;
+    while (*s)
+    {
+        if (strstr (s, old) == s)
+        {
+            strcpy (&result[i], replace);
+            i += new_size;
+            s += old_size;
+        }
+        else
+            result[i++] = *s++;
     }
-    else
-      result[i++] = *s++;
-  }
 
-  result[i] = '\0';
-  return result;
+    result[i] = '\0';
+    return result;
 };
 
 char *
 join_str (char **s, size_t len, char delim)
 {
-	char *ret = strdup (s[0]);
-	size_t ret_len = sizeof (char) * len + strlen (ret);
-
-	for (int i = 1; i < len; i++) {
-		char *ret_tmp = realloc (ret, ret_len + strlen (s[i]) + 1);
-		ret_len += strlen (s[i]) + 1;
-		if (ret_tmp != NULL)
-			ret = ret_tmp;
-		sprintf (ret, "%s%c%s", ret, delim, s[i]);
-	}
-
-	return ret;
+    char *ret = strdup (s[0]);
+    size_t ret_len = sizeof (char) * len + strlen (ret);
+
+    for (int i = 1; i < len; i++)
+    {
+        char *ret_tmp = realloc (ret, ret_len + strlen (s[i]) + 1);
+        ret_len += strlen (s[i]) + 1;
+        if (ret_tmp != NULL)
+            ret = ret_tmp;
+        sprintf (ret, "%s%c%s", ret, delim, s[i]);
+    }
+
+    return ret;
 }