git-apply: slightly clean up bitfield usage

This patch fixes a sparse warning about inaccurate_eof being a
"dubious one-bit signed bitfield", makes three more binary
variables members of this (now unsigned) bitfield and adds a
short comment to indicate the nature of two ternary variables.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/builtin-apply.c b/builtin-apply.c
index aad55261fae35fa644bc65aae79fc15aabc38244..61f047fd45383ac64f27bef88e41b56efefdea3b 100644 (file)
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -140,12 +140,15 @@ struct fragment {
 struct patch {
        char *new_name, *old_name, *def_name;
        unsigned int old_mode, new_mode;
 struct patch {
        char *new_name, *old_name, *def_name;
        unsigned int old_mode, new_mode;

-       int is_rename, is_copy, is_new, is_delete, is_binary;
+       int is_new, is_delete;  /* -1 = unknown, 0 = false, 1 = true */

        int rejected;
        unsigned long deflate_origlen;
        int lines_added, lines_deleted;
        int score;
        int rejected;
        unsigned long deflate_origlen;
        int lines_added, lines_deleted;
        int score;

-       int inaccurate_eof:1;
+       unsigned int inaccurate_eof:1;
+       unsigned int is_binary:1;
+       unsigned int is_copy:1;
+       unsigned int is_rename:1;

        struct fragment *fragments;
        char *result;
        unsigned long resultsize;
        struct fragment *fragments;
        char *result;
        unsigned long resultsize;