diff options
| author |  Austin Clements <amdragon@MIT.EDU> | 2012-05-24 18:01:13 -0400 |
|---|---|---|
| committer |  David Bremner <bremner@debian.org> | 2012-05-24 21:53:38 -0300 |
| commit | 4ca36441a84155571ca2e572f3f6a96af55685b1 (patch) | |
| tree | 0c9f8cf03558be11e9a63583bf236fa6d5d77795 /notmuch-new.c | |
| parent | da170ee6573ca8a04f01ebf789250f6b4b4d3cf0 (diff) | |
new: Unify add_files and add_files_recursive
Since starting at the top of a directory tree and recursing within
that tree are now identical operations, there's no need for both
add_files and add_files_recursive. This eliminates add_files (which
did nothing more than call add_files_recursive after the previous
patch) and renames add_files_recursive to add_files.
Diffstat (limited to 'notmuch-new.c')
| -rw-r--r-- | notmuch-new.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/notmuch-new.c b/notmuch-new.c index 2b056050..938ae296 100644 --- a/notmuch-new.c +++ b/notmuch-new.c @@ -281,9 +281,9 @@ _entry_in_ignore_list (const char *entry, add_files_state_t *state) * if fs_mtime isn't the current wall-clock time. */ static notmuch_status_t -add_files_recursive (notmuch_database_t *notmuch, - const char *path, - add_files_state_t *state) +add_files (notmuch_database_t *notmuch, + const char *path, + add_files_state_t *state) { DIR *dir = NULL; struct dirent *entry = NULL; @@ -377,7 +377,7 @@ add_files_recursive (notmuch_database_t *notmuch, } next = talloc_asprintf (notmuch, "%s/%s", path, entry->d_name); - status = add_files_recursive (notmuch, next, state); + status = add_files (notmuch, next, state); if (status) { ret = status; goto DONE; @@ -647,16 +647,6 @@ stop_progress_printing_timer (void) } -/* This is the top-level entry point for add_files. It does a couple - * of error checks and then calls into the recursive function. */ -static notmuch_status_t -add_files (notmuch_database_t *notmuch, - const char *path, - add_files_state_t *state) -{ - return add_files_recursive (notmuch, path, state); -} - /* XXX: This should be merged with the add_files function since it * shares a lot of logic with it. */ /* Recursively count all regular files in path and all sub-directories |