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

notmuch new: Rename the various timestamp variables to be more clear.

Browse source 
The previous name of "path_mtime" was very ambiguous. The new names
are much more obvious (fs_mtime is the mtime from the filesystem and
db_mtime is the mtime from the database).
This commit is contained in:
Carl Worth 2010-01-05 15:31:56 -08:00
parent 29908b9f13
commit 3fb7ee7754
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
notmuch-new.c
View file

@ -121,20 +121,20 @@ is_maildir (struct dirent **entries, int count)
/* Examine 'path' recursively as follows: /* Examine 'path' recursively as follows:
* *
* o Ask the filesystem for the mtime of 'path' (path_mtime) * o Ask the filesystem for the mtime of 'path' (fs_mtime)
* *
* o Ask the database for its timestamp of 'path' (path_dbtime) * o Ask the database for its timestamp of 'path' (db_mtime)
* *
* o If 'path_mtime' > 'path_dbtime' * o If 'fs_mtime' > 'db_mtime'
* *
* o For each regular file in 'path' with mtime newer than the * o For each regular file in 'path' with mtime newer than the
* 'path_dbtime' call add_message to add the file to the * 'db_mtime' call add_message to add the file to the
* database. * database.
* *
* o For each sub-directory of path, recursively call into this * o For each sub-directory of path, recursively call into this
* same function. * same function.
* *
* o Tell the database to update its time of 'path' to 'path_mtime' * o Tell the database to update its time of 'path' to 'fs_mtime'
* *
* The 'struct stat *st' must point to a structure that has already * The 'struct stat *st' must point to a structure that has already
* been initialized for 'path' by calling stat(). * been initialized for 'path' by calling stat().
@ -148,17 +148,17 @@ add_files_recursive (notmuch_database_t *notmuch,
DIR *dir = NULL; DIR *dir = NULL;
struct dirent *entry = NULL; struct dirent *entry = NULL;
char *next = NULL; char *next = NULL;
time_t path_mtime, path_dbtime; time_t fs_mtime, db_mtime;
notmuch_status_t status, ret = NOTMUCH_STATUS_SUCCESS; notmuch_status_t status, ret = NOTMUCH_STATUS_SUCCESS;
notmuch_message_t *message = NULL; notmuch_message_t *message = NULL;
struct dirent **namelist = NULL; struct dirent **namelist = NULL;
int num_entries; int num_entries;
notmuch_directory_t *directory; notmuch_directory_t *directory;
path_mtime = st->st_mtime; fs_mtime = st->st_mtime;
directory = notmuch_database_get_directory (notmuch, path); directory = notmuch_database_get_directory (notmuch, path);
path_dbtime = notmuch_directory_get_mtime (directory); db_mtime = notmuch_directory_get_mtime (directory);
num_entries = scandir (path, &namelist, 0, ino_cmp); num_entries = scandir (path, &namelist, 0, ino_cmp);
@ -180,7 +180,7 @@ add_files_recursive (notmuch_database_t *notmuch,
/* If this directory hasn't been modified since the last /* If this directory hasn't been modified since the last
* add_files, then we only need to look further for * add_files, then we only need to look further for
* sub-directories. */ * sub-directories. */
if (path_mtime <= path_dbtime && entry->d_type == DT_REG) if (fs_mtime <= db_mtime && entry->d_type == DT_REG)
continue; continue;
/* Ignore special directories to avoid infinite recursion. /* Ignore special directories to avoid infinite recursion.
@ -221,7 +221,7 @@ add_files_recursive (notmuch_database_t *notmuch,
if (S_ISREG (st->st_mode)) { if (S_ISREG (st->st_mode)) {
/* If the file hasn't been modified since the last /* If the file hasn't been modified since the last
* add_files, then we need not look at it. */ * add_files, then we need not look at it. */
if (path_dbtime == 0 || st->st_mtime > path_dbtime) { if (db_mtime == 0 || st->st_mtime > db_mtime) {
state->processed_files++; state->processed_files++;
if (state->verbose) { if (state->verbose) {
@ -291,7 +291,7 @@ add_files_recursive (notmuch_database_t *notmuch,
} }
if (! interrupted) { if (! interrupted) {
status = notmuch_directory_set_mtime (directory, path_mtime); status = notmuch_directory_set_mtime (directory, fs_mtime);
if (status && ret == NOTMUCH_STATUS_SUCCESS) if (status && ret == NOTMUCH_STATUS_SUCCESS)
ret = status; ret = status;
} }