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@xxxxxxxxxxxxx> --- I am sending only 01/40 and 28/40 for v11 as there are only commit message updates in those 2 patches. I hope that it will make it possible to merge the first 32 patches or so of this series. As usual cou can get the full series from: https://github.com/chriscool/git/commits/libify-apply-use-in-am builtin/apply.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 1a488f9..ab8f0bd 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -21,7 +21,7 @@ #include "ll-merge.h" #include "rerere.h" -enum ws_error_action { +enum apply_ws_error_action { nowarn_ws_error, warn_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_change }; @@ -45,8 +45,8 @@ enum ws_ignore { * See also "struct string_list symlink_changes" in "struct * apply_state". */ -#define SYMLINK_GOES_AWAY 01 -#define SYMLINK_IN_RESULT 02 +#define APPLY_SYMLINK_GOES_AWAY 01 +#define APPLY_SYMLINK_IN_RESULT 02 struct apply_state { const char *prefix; @@ -110,8 +110,8 @@ struct apply_state { struct string_list fn_table; /* These control whitespace errors */ - enum ws_error_action ws_error_action; - enum ws_ignore ws_ignore_action; + enum apply_ws_error_action ws_error_action; + enum apply_ws_ignore ws_ignore_action; const char *whitespace_option; int whitespace_error; 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)) && (patch->is_rename || patch->is_delete)) /* 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)) /* 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; name->buf[name->len] = '\0'; change = check_symlink_changes(state, name->buf); - if (change & SYMLINK_IN_RESULT) + if (change & APPLY_SYMLINK_IN_RESULT) return 1; - if (change & SYMLINK_GOES_AWAY) + if (change & APPLY_SYMLINK_GOES_AWAY) /* * This cannot be "return 0", because we may * see a new one created at a higher level. -- 2.9.2.614.g5428e0c -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html