git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v10 01/40] apply: make some names more specific

From
stefan.naewe@atlas-elektronik.com <stefan.naewe@atlas-elektronik.com>
Date
Aug 9, 2016, 14:51 UTC
Message-ID
<50063bbb-aa5f-cf75-310e-f8305ef30d2d@atlas-elektronik.com>
In-Reply-To
<20160808210337.5038-2-chriscool@tuxfamily.org>
Am 08.08.2016 um 23:02 schrieb Christian Couder:
> 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 th global
s/th/the/
Show 78 quoted lines
> namespace.
> 
> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
> ---
>  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.
> 
Stefan
-- 
----------------------------------------------------------------
/dev/random says: Don't be so humble, you're not that great. -Golda Meir
python -c "print '73746566616e2e6e616577654061746c61732d656c656b74726f6e696b2e636f6d'.decode('hex')" 
GPG Key fingerprint = 2DF5 E01B 09C3 7501 BCA9  9666 829B 49C5 9221 27AF
Previous: Christian CouderNext: Christian Couder
Message 47 of 51 in “libify apply and use lib in am, part 2”
  1. 00/40 libify apply and use lib in am, part 2Christian Couder, Aug 8, 2016
  2. 02/40 apply: move 'struct apply_state' to apply.hChristian Couder, Aug 8, 2016
  3. 03/40 builtin/apply: make apply_patch() return -1 or -128 instead of die()ingChristian Couder, Aug 8, 2016
  4. 04/40 builtin/apply: read_patch_file() return -1 instead of die()ingChristian Couder, Aug 8, 2016
  5. 07/40 builtin/apply: make parse_single_patch() return -1 on errorChristian Couder, Aug 8, 2016
  6. 05/40 builtin/apply: make find_header() return -128 instead of die()ingChristian Couder, Aug 8, 2016
  7. 06/40 builtin/apply: make parse_chunk() return a negative integer on errorChristian Couder, Aug 8, 2016
  8. 10/40 builtin/apply: move init_apply_state() to apply.cChristian Couder, Aug 8, 2016
  9. 09/40 builtin/apply: make parse_ignorewhitespace_option() return -1 instead of die()ingChristian Couder, Aug 8, 2016
  10. 12/40 builtin/apply: make check_apply_state() return -1 instead of die()ingChristian Couder, Aug 8, 2016
  11. 13/40 builtin/apply: move check_apply_state() to apply.cChristian Couder, Aug 8, 2016
  12. 11/40 apply: make init_apply_state() return -1 instead of exit()ingChristian Couder, Aug 8, 2016
  13. 15/40 builtin/apply: make parse_traditional_patch() return -1 on errorChristian Couder, Aug 8, 2016
  14. 21/40 builtin/apply: make add_conflicted_stages_file() return -1 on errorChristian Couder, Aug 8, 2016
  15. 20/40 builtin/apply: make remove_file() return -1 on errorChristian Couder, Aug 8, 2016
  16. 22/40 builtin/apply: make add_index_file() return -1 on errorChristian Couder, Aug 8, 2016
  17. 23/40 builtin/apply: make create_file() return -1 on errorChristian Couder, Aug 8, 2016
  18. 27/40 builtin/apply: make create_one_file() return -1 on errorChristian Couder, Aug 8, 2016
  19. 29/40 apply: rename and move opt constants to apply.hChristian Couder, Aug 8, 2016
  20. 28/40 builtin/apply: rename option parsing functionsChristian Couder, Aug 8, 2016
  21. stefan.naewe@atlas-elektronik.comAug 9, 2016
  22. 26/40 builtin/apply: make try_create_file() return -1 on errorChristian Couder, Aug 8, 2016
  23. 25/40 builtin/apply: make write_out_results() return -1 on errorChristian Couder, Aug 8, 2016
  24. 31/40 apply: make some parsing functions static againChristian Couder, Aug 8, 2016
  25. 24/40 builtin/apply: make write_out_one_result() return -1 on errorChristian Couder, Aug 8, 2016
  26. 32/40 apply: use error_errno() where possibleChristian Couder, Aug 8, 2016
  27. 19/40 builtin/apply: make build_fake_ancestor() return -1 on errorChristian Couder, Aug 8, 2016
  28. 37/40 usage: add get_error_routine() and get_warn_routine()Christian Couder, Aug 8, 2016
  29. 36/40 usage: add set_warn_routine()Christian Couder, Aug 8, 2016
  30. 35/40 apply: don't print on stdout in verbosity_silent modeChristian Couder, Aug 8, 2016
  31. 39/40 apply: refactor `git apply` option parsingChristian Couder, Aug 8, 2016
  32. 33/40 environment: add set_index_file()Christian Couder, Aug 8, 2016
  33. Junio C HamanoAug 8, 2016
  34. Christian CouderAug 10, 2016
  35. Junio C HamanoAug 10, 2016
  36. Christian CouderAug 11, 2016
  37. Junio C HamanoAug 11, 2016
  38. 34/40 apply: make it possible to silently applyChristian Couder, Aug 8, 2016
  39. 38/40 apply: change error_routine when silentChristian Couder, Aug 8, 2016
  40. 18/40 builtin/apply: change die_on_unsafe_path() to check_unsafe_path()Christian Couder, Aug 8, 2016
  41. 40/40 builtin/am: use apply api in run_apply()Christian Couder, Aug 8, 2016
  42. 17/40 builtin/apply: make gitdiff_*() return -1 on errorChristian Couder, Aug 8, 2016
  43. 16/40 builtin/apply: make gitdiff_*() return 1 at end of headerChristian Couder, Aug 8, 2016
  44. 14/40 builtin/apply: make apply_all_patches() return 128 or 1 on errorChristian Couder, Aug 8, 2016
  45. 08/40 builtin/apply: make parse_whitespace_option() return -1 instead of die()ingChristian Couder, Aug 8, 2016
  46. 01/40 apply: make some names more specificChristian Couder, Aug 8, 2016
  47. stefan.naewe@atlas-elektronik.comAug 9, 2016
  48. Christian CouderAug 11, 2016
  49. stefan.naewe@atlas-elektronik.comAug 11, 2016
  50. Christian CouderAug 8, 2016
  51. Junio C HamanoAug 8, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.