Re: [PATCH 1/5] diff.h: Make pickaxe_opts an unsigned bit field

2018-01-03 Thread Junio C Hamano
Stefan Beller  writes:

> This variable is used as a bit field[1], and as we are about to add more
> fields, indicate its usage as a bit field by making it unsigned.
>
> [1] containing the bits
>
> #define DIFF_PICKAXE_ALL  1
> #define DIFF_PICKAXE_REGEX2
> #define DIFF_PICKAXE_KIND_S   4
> #define DIFF_PICKAXE_KIND_G   8
>
> Signed-off-by: Stefan Beller 
> ---
>  diff.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Makes perfect sense.

>
> diff --git a/diff.h b/diff.h
> index 0fb18dd735..ea310f76fd 100644
> --- a/diff.h
> +++ b/diff.h
> @@ -146,7 +146,7 @@ struct diff_options {
>   int skip_stat_unmatch;
>   int line_termination;
>   int output_format;
> - int pickaxe_opts;
> + unsigned pickaxe_opts;
>   int rename_score;
>   int rename_limit;
>   int needed_rename_limit;


[PATCH 1/5] diff.h: Make pickaxe_opts an unsigned bit field

2018-01-02 Thread Stefan Beller
This variable is used as a bit field[1], and as we are about to add more
fields, indicate its usage as a bit field by making it unsigned.

[1] containing the bits

#define DIFF_PICKAXE_ALL1
#define DIFF_PICKAXE_REGEX  2
#define DIFF_PICKAXE_KIND_S 4
#define DIFF_PICKAXE_KIND_G 8

Signed-off-by: Stefan Beller 
---
 diff.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diff.h b/diff.h
index 0fb18dd735..ea310f76fd 100644
--- a/diff.h
+++ b/diff.h
@@ -146,7 +146,7 @@ struct diff_options {
int skip_stat_unmatch;
int line_termination;
int output_format;
-   int pickaxe_opts;
+   unsigned pickaxe_opts;
int rename_score;
int rename_limit;
int needed_rename_limit;
-- 
2.15.1.620.gb9897f4670-goog