Don't `else' after goto. Simplify control flow.

[nmh] / sbr / crawl_folders.c

diff --git a/sbr/crawl_folders.c b/sbr/crawl_folders.c
index d8bcdba317052484edc8c8b4ee4f0aef3766ef5d..ec025be55cdc59a9626eb32d951d7cae24ebf4b4 100644 (file)
--- a/sbr/crawl_folders.c
+++ b/sbr/crawl_folders.c
@@ -29,7 +29,7 @@ struct crawl_context {
 static void
 add_folder (char *fold, struct crawl_context *crawl)
 {
 static void
 add_folder (char *fold, struct crawl_context *crawl)
 {

-    register int i, j;
+    int i, j;

 
     /* if necessary, reallocate the space for folder names */
     if (crawl->foldp >= crawl->max) {
 
     /* if necessary, reallocate the space for folder names */
     if (crawl->foldp >= crawl->max) {


@@ -66,7 +66,7 @@ add_children (char *name, struct crawl_context *crawl)
     }
 
     if (strcmp (name, ".") == 0) {
     }
 
     if (strcmp (name, ".") == 0) {

-       prefix = getcpy ("");
+       prefix = mh_xstrdup("");

     } else {
        prefix = concat (name, "/", (void *)NULL);
     }
     } else {
        prefix = concat (name, "/", (void *)NULL);
     }


@@ -135,7 +135,8 @@ crawl_folders_body (struct crawl_context *crawl,
 void
 crawl_folders (char *dir, crawl_callback_t *callback, void *baton)
 {
 void
 crawl_folders (char *dir, crawl_callback_t *callback, void *baton)
 {

-    struct crawl_context *crawl = mh_xmalloc (sizeof(*crawl));
+    struct crawl_context *crawl;
+    NEW(crawl);

     crawl->max = CRAWL_NUMFOLDERS;
     crawl->total = crawl->start = crawl->foldp = 0;
     crawl->folders = mh_xmalloc (crawl->max * sizeof(*crawl->folders));
     crawl->max = CRAWL_NUMFOLDERS;
     crawl->total = crawl->start = crawl->foldp = 0;
     crawl->folders = mh_xmalloc (crawl->max * sizeof(*crawl->folders));