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>
This commit is contained in:
parent
38f4d138ee
commit
3dad11bfdb
@ -140,12 +140,15 @@ struct fragment {
|
|||||||
struct patch {
|
struct patch {
|
||||||
char *new_name, *old_name, *def_name;
|
char *new_name, *old_name, *def_name;
|
||||||
unsigned int old_mode, new_mode;
|
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;
|
int rejected;
|
||||||
unsigned long deflate_origlen;
|
unsigned long deflate_origlen;
|
||||||
int lines_added, lines_deleted;
|
int lines_added, lines_deleted;
|
||||||
int score;
|
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;
|
struct fragment *fragments;
|
||||||
char *result;
|
char *result;
|
||||||
unsigned long resultsize;
|
unsigned long resultsize;
|
||||||
|
Loading…
Reference in New Issue
Block a user