new.c: Order two return statements to match comment.

[nmh] / sbr / crawl_folders.c

diff --git a/sbr/crawl_folders.c b/sbr/crawl_folders.c
index d8bcdba317052484edc8c8b4ee4f0aef3766ef5d..ab90a4caa1477b5a289a38d9941c983ed101d9e5 100644 (file)
--- a/sbr/crawl_folders.c
+++ b/sbr/crawl_folders.c
@@ -1,6 +1,4 @@
-
-/*
- * crawl_folders.c -- crawl folder hierarchy
+/* crawl_folders.c -- crawl folder hierarchy

  *
  * This code is Copyright (c) 2008, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  *
  * This code is Copyright (c) 2008, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -15,7 +13,6 @@ struct crawl_context {
     int max;                   /* how many folders we currently can hold in
                                 * the array `folders', increased by
                                 * CRAWL_NUMFOLDERS at a time */
     int max;                   /* how many folders we currently can hold in
                                 * the array `folders', increased by
                                 * CRAWL_NUMFOLDERS at a time */

-    int total;                 /* how many `folders' actually has */

     char **folders;            /* the array of folders */
     int start;
     int foldp;
     char **folders;            /* the array of folders */
     int start;
     int foldp;


@@ -29,7 +26,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) {


@@ -47,7 +44,6 @@ add_folder (char *fold, struct crawl_context *crawl)
            return;
        }
 
            return;
        }
 

-    crawl->total++;

     crawl->folders[crawl->foldp++] = fold;
 }
 
     crawl->folders[crawl->foldp++] = fold;
 }
 


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

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

     } else {
     } else {

-       prefix = concat (name, "/", (void *)NULL);
+       prefix = concat(name, "/", NULL);

     }
 
     while ((dp = readdir (dd))) {
     }
 
     while ((dp = readdir (dd))) {


@@ -85,7 +81,7 @@ add_children (char *name, struct crawl_context *crawl)
        if (!strcmp (dp->d_name, ".") || !strcmp (dp->d_name, "..")) {
            continue;
        }
        if (!strcmp (dp->d_name, ".") || !strcmp (dp->d_name, "..")) {
            continue;
        }

-       child = concat (prefix, dp->d_name, (void *)NULL);
+       child = concat(prefix, dp->d_name, NULL);

        /* If we have no d_type or d_type is DT_LNK or DT_UNKNOWN, stat the
         * child to see what it is. */
        if (child_is_folder == -1) {
        /* If we have no d_type or d_type is DT_LNK or DT_UNKNOWN, stat the
         * child to see what it is. */
        if (child_is_folder == -1) {


@@ -135,9 +131,10 @@ 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->max = CRAWL_NUMFOLDERS;

-    crawl->total = crawl->start = crawl->foldp = 0;
+    crawl->start = crawl->foldp = 0;

     crawl->folders = mh_xmalloc (crawl->max * sizeof(*crawl->folders));
 
     crawl_folders_body (crawl, dir, callback, baton);
     crawl->folders = mh_xmalloc (crawl->max * sizeof(*crawl->folders));
 
     crawl_folders_body (crawl, dir, callback, baton);