debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 04:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

new: Unify add_files and add_files_recursive

Browse source 
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.
This commit is contained in:
Austin Clements 2012-05-24 18:01:13 -04:00 committed by David Bremner
parent da170ee657
commit 4ca36441a8
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
notmuch-new.c
View file

@ -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. * if fs_mtime isn't the current wall-clock time.
*/ */
static notmuch_status_t static notmuch_status_t
add_files_recursive (notmuch_database_t *notmuch, add_files (notmuch_database_t *notmuch,
const char *path, const char *path,
add_files_state_t *state) add_files_state_t *state)
{ {
DIR *dir = NULL; DIR *dir = NULL;
struct dirent *entry = 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); 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) { if (status) {
ret = status; ret = status;
goto DONE; 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 /* XXX: This should be merged with the add_files function since it
* shares a lot of logic with it. */ * shares a lot of logic with it. */
/* Recursively count all regular files in path and all sub-directories /* Recursively count all regular files in path and all sub-directories