X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=notmuch-new.c;h=f6d9c3a4508f52cbb2da594a030acee8acdb06b2;hb=f849b371cc78fac73d9a8e0467bc0e6232ced18b;hp=e6ca8414a939bcb5915a55c060640766ccc5c441;hpb=0b247cb411fa7530003bad920bd2c85ed46187b5;p=notmuch

diff --git a/notmuch-new.c b/notmuch-new.c
index e6ca8414..f6d9c3a4 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -704,8 +704,7 @@ count_files (const char *path, int *count, add_files_state_t *state)
     char *next;
     struct dirent **fs_entries = NULL;
     int num_fs_entries = scandir (path, &fs_entries, 0, dirent_sort_inode);
-    int entry_type;
-    int i = 0;
+    int entry_type, i;
 
     if (num_fs_entries == -1) {
 	fprintf (stderr, "Warning: failed to open directory %s: %s\n",
@@ -713,11 +712,8 @@ count_files (const char *path, int *count, add_files_state_t *state)
 	goto DONE;
     }
 
-    while (!interrupted) {
-        if (i == num_fs_entries)
-	    break;
-
-        entry = fs_entries[i++];
+    for (i = 0; i < num_fs_entries && ! interrupted; i++) {
+        entry = fs_entries[i];
 
 	/* Ignore special directories to avoid infinite recursion.
 	 * Also ignore the .notmuch directory and files/directories