[PATCH] cli: don't call _entry_in_ignore_list twice in count files debug

[PATCH] cli: don't call _entry_in_ignore_list twice in count files debug

[Jani Nikula]

Split file ignores in count_files to fixed and user configured in
order to not have to call _entry_in_ignore_list twice when debugging
is enabled. Minor detail.
---
 notmuch-new.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/notmuch-new.c b/notmuch-new.c
index cc680b412a45..13212639cc8e 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -738,18 +738,20 @@ count_files (const char *path, int *count, add_files_state_t *state)
         entry = fs_entries[i];
 
 	/* Ignore special directories to avoid infinite recursion.
-	 * Also ignore the .notmuch directory and files/directories
-	 * the user has configured to be ignored.
+	 * Also ignore the .notmuch directory.
 	 */
 	if (strcmp (entry->d_name, ".") == 0 ||
 	    strcmp (entry->d_name, "..") == 0 ||
-	    strcmp (entry->d_name, ".notmuch") == 0 ||
-	    _entry_in_ignore_list (entry->d_name, state))
-	{
-	    if (state->debug && _entry_in_ignore_list (entry->d_name, state))
+	    strcmp (entry->d_name, ".notmuch") == 0)
+	    continue;
+
+	/* Ignore any files/directories the user has configured to be
+	 * ignored
+	 */
+	if (_entry_in_ignore_list (entry->d_name, state)) {
+	    if (state->debug)
 		printf ("(D) count_files: explicitly ignoring %s/%s\n",
-			path,
-			entry->d_name);
+			path, entry->d_name);
 	    continue;
 	}
 
-- 
2.10.2

Re: [PATCH] cli: don't call _entry_in_ignore_list twice in count files debug

[Tomi Ollila]

On Sat, Dec 17 2016, Jani Nikula <jani@nikula.org> wrote:

> Split file ignores in count_files to fixed and user configured in
> order to not have to call _entry_in_ignore_list twice when debugging
> is enabled. Minor detail.
> ---

LGTM.

Tomi


>  notmuch-new.c | 18 ++++++++++--------
>  1 file changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/notmuch-new.c b/notmuch-new.c
> index cc680b412a45..13212639cc8e 100644
> --- a/notmuch-new.c
> +++ b/notmuch-new.c
> @@ -738,18 +738,20 @@ count_files (const char *path, int *count, add_files_state_t *state)
>          entry = fs_entries[i];
>  
>  	/* Ignore special directories to avoid infinite recursion.
> -	 * Also ignore the .notmuch directory and files/directories
> -	 * the user has configured to be ignored.
> +	 * Also ignore the .notmuch directory.
>  	 */
>  	if (strcmp (entry->d_name, ".") == 0 ||
>  	    strcmp (entry->d_name, "..") == 0 ||
> -	    strcmp (entry->d_name, ".notmuch") == 0 ||
> -	    _entry_in_ignore_list (entry->d_name, state))
> -	{
> -	    if (state->debug && _entry_in_ignore_list (entry->d_name, state))
> +	    strcmp (entry->d_name, ".notmuch") == 0)
> +	    continue;
> +
> +	/* Ignore any files/directories the user has configured to be
> +	 * ignored
> +	 */
> +	if (_entry_in_ignore_list (entry->d_name, state)) {
> +	    if (state->debug)
>  		printf ("(D) count_files: explicitly ignoring %s/%s\n",
> -			path,
> -			entry->d_name);
> +			path, entry->d_name);
>  	    continue;
>  	}
>  
> -- 
> 2.10.2
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> https://notmuchmail.org/mailman/listinfo/notmuch

Re: [PATCH] cli: don't call _entry_in_ignore_list twice in count files debug

[David Bremner]

Jani Nikula <jani@nikula.org> writes:

> Split file ignores in count_files to fixed and user configured in
> order to not have to call _entry_in_ignore_list twice when debugging
> is enabled. Minor detail.

pushed to master

d