Adjust coding style from nmh to mmh

diff --git a/sbr/utils.c b/sbr/utils.c
index b0e8274..fa4cfdb 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -29,12 +29,14 @@ mh_xmalloc(size_t size)
 {
        void *memory;
 
-       if (size == 0)
+       if (size == 0) {
                adios(EX_SOFTWARE, NULL, "Tried to malloc 0 bytes");
+       }
 
        memory = malloc(size);
-       if (!memory)
+       if (!memory) {
                adios(EX_OSERR, NULL, "Malloc failed");
+       }
 
        return memory;
 }
@@ -51,33 +53,35 @@ mh_xrealloc(void *ptr, size_t size)
        if (!ptr) {
                return mh_xcalloc((size_t) 1, size);
        }
-
-       if (size == 0)
+       if (size == 0) {
                adios(EX_SOFTWARE, NULL, "Tried to realloc 0 bytes");
+       }
 
        memory = realloc(ptr, size);
-       if (!memory)
+       if (!memory) {
                adios(EX_OSERR, NULL, "Realloc failed");
+       }
 
        return memory;
 }
 
 /*
- * Safely call calloc
- */
+** Safely call calloc
+*/
 void *
 mh_xcalloc(size_t nmemb, size_t size)
 {
-    void *memory;
+       void *memory;
 
-    if (nmemb == 0  ||  size == 0)
-        adios(EX_SOFTWARE, NULL, "Tried to calloc 0 bytes");
+       if (nmemb == 0  ||  size == 0) {
+               adios(EX_SOFTWARE, NULL, "Tried to calloc 0 bytes");
+       }
 
-    if ((memory = calloc(nmemb, size))) {
-        return memory;
-    } else {
-        adios(EX_OSERR, NULL, "calloc failed");
-    }
+       if ((memory = calloc(nmemb, size))) {
+               return memory;
+       } else {
+               adios(EX_OSERR, NULL, "calloc failed");
+       }
 }
 
 /*
@@ -123,10 +127,12 @@ add(char *s2, char *s1)
        char *cp;
        size_t len1 = 0, len2 = 0;
 
-       if (s1)
+       if (s1) {
                len1 = strlen(s1);
-       if (s2)
+       }
+       if (s2) {
                len2 = strlen(s2);
+       }
 
        cp = mh_xmalloc(len1 + len2 + 1);
 
@@ -137,8 +143,9 @@ add(char *s2, char *s1)
        }
 
        /* Copy s2 */
-       if (s2)
+       if (s2) {
                memcpy(cp + len1, s2, len2);
+       }
 
        /* Now NULL terminate the string */
        cp[len1 + len2] = '\0';
@@ -159,20 +166,23 @@ create_folder(char *folder, int autocreate, void (*done_callback)(int))
        char *cp;
 
        if (stat(folder, &st) == -1) {
-               if (errno != ENOENT)
+               if (errno != ENOENT) {
                        adios(EX_IOERR, folder, "error on folder");
+               }
                if (autocreate == 0) {
                        /* ask before creating folder */
                        cp = concat("Create folder \"", folder, "\"? ", NULL);
-                       if (!getanswer(cp))
+                       if (!getanswer(cp)) {
                                done_callback(EX_CANTCREAT);
+                       }
                        free(cp);
                } else if (autocreate == -1) {
                        /* do not create, so exit */
                        done_callback(EX_CANTCREAT);
                }
-               if (!makedir(folder))
+               if (!makedir(folder)) {
                        adios(EX_CANTCREAT, NULL, "unable to create folder %s", folder);
+               }
        }
 }
 
@@ -186,11 +196,13 @@ num_digits(int n)
        int ndigits = 0;
 
        /* Sanity check */
-       if (n < 0)
+       if (n < 0) {
                adios(EX_SOFTWARE, NULL, "oops, num_digits called with negative value");
+       }
 
-       if (n == 0)
+       if (n == 0) {
                return 1;
+       }
 
        while (n) {
                n /= 10;
@@ -208,8 +220,9 @@ num_digits(int n)
 void
 app_msgarg(struct msgs_array *msgs, char *cp)
 {
-       if(msgs->size >= msgs->max)
+       if(msgs->size >= msgs->max) {
                msgs->msgs = mh_xrealloc(msgs->msgs,
                                (msgs->max+=MAXMSGS)*sizeof(*msgs->msgs));
+       }
        msgs->msgs[msgs->size++] = cp;
 }