debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-22 17:34:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor style fixups for the previous fix.

Browse source 
Use consistent whitespace, a slightly less abbreviated identifier, and
avoid a C99 declaration after statement.
This commit is contained in:
Carl Worth 2009-11-18 22:27:32 +01:00
parent a45ff8c361
commit 22759fb279
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
notmuch-new.c
View file

@ -75,7 +75,7 @@ add_files_print_progress (add_files_state_t *state)
static int ino_cmp(const struct dirent **a, const struct dirent **b)
{
return ((*a)->d_ino < (*b)->d_ino)? -1: 1;
return ((*a)->d_ino < (*b)->d_ino) ? -1 : 1;
}
/* Examine 'path' recursively as follows:
@ -111,6 +111,7 @@ add_files_recursive (notmuch_database_t *notmuch,
notmuch_status_t status, ret = NOTMUCH_STATUS_SUCCESS;
notmuch_message_t *message = NULL;
struct dirent **namelist = NULL;
int num_entries;
/* If we're told to, we bail out on encountering a read-only
* directory, (with this being a clear clue from the user to
@ -126,9 +127,9 @@ add_files_recursive (notmuch_database_t *notmuch,
path_mtime = st->st_mtime;
path_dbtime = notmuch_database_get_timestamp (notmuch, path);
int n_entries= scandir(path, &namelist, 0, ino_cmp);
num_entries = scandir (path, &namelist, 0, ino_cmp);
if (n_entries == -1) {
if (num_entries == -1) {
fprintf (stderr, "Error opening directory %s: %s\n",
path, strerror (errno));
ret = NOTMUCH_STATUS_FILE_ERROR;
@ -138,7 +139,7 @@ add_files_recursive (notmuch_database_t *notmuch,
int i=0;
while (!interrupted) {
if (i == n_entries)
if (i == num_entries)
break;
entry= namelist[i++];