development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 12:09:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

apply: make some names more specific

Browse source 
To prepare for some structs and constants being moved from
builtin/apply.c to apply.h, we should give them some more
specific names to avoid possible name collisions in the global
namespace.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder 2016-08-11 10:52:29 +02:00 committed by Junio C Hamano
parent f8f7adce9f
commit 4d5acae0ca
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
builtin/apply.c
View file

@ -21,7 +21,7 @@
#include "ll-merge.h" #include "ll-merge.h"
#include "rerere.h" #include "rerere.h"
enum ws_error_action { enum apply_ws_error_action {
nowarn_ws_error, nowarn_ws_error,
warn_on_ws_error, warn_on_ws_error,
die_on_ws_error, die_on_ws_error,
@ -29,7 +29,7 @@ enum ws_error_action {
}; };
enum ws_ignore { enum apply_ws_ignore {
ignore_ws_none, ignore_ws_none,
ignore_ws_change ignore_ws_change
}; };
@ -45,8 +45,8 @@ enum ws_ignore {
* See also "struct string_list symlink_changes" in "struct * See also "struct string_list symlink_changes" in "struct
* apply_state". * apply_state".
*/ */
#define SYMLINK_GOES_AWAY 01 #define APPLY_SYMLINK_GOES_AWAY 01
#define SYMLINK_IN_RESULT 02 #define APPLY_SYMLINK_IN_RESULT 02
struct apply_state { struct apply_state {
const char *prefix; const char *prefix;
@ -110,8 +110,8 @@ struct apply_state {
struct string_list fn_table; struct string_list fn_table;
/* These control whitespace errors */ /* These control whitespace errors */
enum ws_error_action ws_error_action; enum apply_ws_error_action ws_error_action;
enum ws_ignore ws_ignore_action; enum apply_ws_ignore ws_ignore_action;
const char *whitespace_option; const char *whitespace_option;
int whitespace_error; int whitespace_error;
int squelch_whitespace_errors; int squelch_whitespace_errors;
@ -3750,11 +3750,11 @@ static void prepare_symlink_changes(struct apply_state *state, struct patch *pat
if ((patch->old_name && S_ISLNK(patch->old_mode)) && if ((patch->old_name && S_ISLNK(patch->old_mode)) &&
(patch->is_rename || patch->is_delete)) (patch->is_rename || patch->is_delete))
/* the symlink at patch->old_name is removed */ /* the symlink at patch->old_name is removed */
register_symlink_changes(state, patch->old_name, SYMLINK_GOES_AWAY); register_symlink_changes(state, patch->old_name, APPLY_SYMLINK_GOES_AWAY);
if (patch->new_name && S_ISLNK(patch->new_mode)) if (patch->new_name && S_ISLNK(patch->new_mode))
/* the symlink at patch->new_name is created or remains */ /* the symlink at patch->new_name is created or remains */
register_symlink_changes(state, patch->new_name, SYMLINK_IN_RESULT); register_symlink_changes(state, patch->new_name, APPLY_SYMLINK_IN_RESULT);
} }
} }
@ -3769,9 +3769,9 @@ static int path_is_beyond_symlink_1(struct apply_state *state, struct strbuf *na
break; break;
name->buf[name->len] = '\0'; name->buf[name->len] = '\0';
change = check_symlink_changes(state, name->buf); change = check_symlink_changes(state, name->buf);
if (change & SYMLINK_IN_RESULT) if (change & APPLY_SYMLINK_IN_RESULT)
return 1; return 1;
if (change & SYMLINK_GOES_AWAY) if (change & APPLY_SYMLINK_GOES_AWAY)
/* /*
* This cannot be "return 0", because we may * This cannot be "return 0", because we may
* see a new one created at a higher level. * see a new one created at a higher level.