X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/3bd5ce286fa6983f3f3f9fda4ff7f2f96c2a22a2..94187a80bd60baab4b9c4b949ad820d730578123:/sbr/crawl_folders.c diff --git a/sbr/crawl_folders.c b/sbr/crawl_folders.c index 67de2a50..ab90a4ca 100644 --- 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 @@ -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 total; /* how many `folders' actually has */ 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) { - register int i, j; + int i, j; /* 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; } - crawl->total++; crawl->folders[crawl->foldp++] = fold; } @@ -68,7 +64,7 @@ add_children (char *name, struct crawl_context *crawl) if (strcmp (name, ".") == 0) { prefix = mh_xstrdup(""); } else { - prefix = concat (name, "/", (void *)NULL); + prefix = concat(name, "/", NULL); } 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; } - 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) { @@ -138,7 +134,7 @@ crawl_folders (char *dir, crawl_callback_t *callback, void *baton) struct crawl_context *crawl; NEW(crawl); 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);