From: "Martin Ågren" <martin.agren@gmail.com> To: git@vger.kernel.org Cc: Junio C Hamano <gitster@pobox.com>, Emily Shaffer <emilyshaffer@google.com>, Jeff King <peff@peff.net> Subject: [PATCH 3/4] grep: simplify color setup Date: Sat, 21 Nov 2020 19:31:09 +0100 Message-ID: <d6e43bc540bc682bb46d54e579a7101d0d2c462d.1605972564.git.martin.agren@gmail.com> (raw) In-Reply-To: <cover.1605972564.git.martin.agren@gmail.com> The previous commit left us with only one user of the one-line wrapper `color_set()`. We could inline it, but note how we're `xsnprintf()`-ing all the entries in one array into another array of the same type. We might as well just `memcpy()` everything into place. Signed-off-by: Martin Ågren <martin.agren@gmail.com> --- Cc-ing Peff, who initially introduced this helper. After having inlined the function into the for loop, it seemed better to just copy the whole array. Happy to hear arguments against. Come to think of it, I suppose we could copy the whole struct and not just the color array. Hmmm... grep.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/grep.c b/grep.c index 8f2009ec9f..9597cec67e 100644 --- a/grep.c +++ b/grep.c @@ -66,11 +66,6 @@ static const char *color_grep_slots[] = { [GREP_COLOR_SEP] = "separator", }; -static void color_set(char *dst, const char *color_bytes) -{ - xsnprintf(dst, COLOR_MAXLEN, "%s", color_bytes); -} - static int parse_pattern_type_arg(const char *opt, const char *arg) { if (!strcmp(arg, "default")) @@ -158,7 +153,6 @@ int grep_config(const char *var, const char *value, void *cb) void grep_init(struct grep_opt *opt, struct repository *repo, const char *prefix) { struct grep_opt *def = &grep_defaults; - int i; #if defined(USE_LIBPCRE2) if (!pcre2_global_context) @@ -189,8 +183,7 @@ void grep_init(struct grep_opt *opt, struct repository *repo, const char *prefix opt->relative = def->relative; opt->output = def->output; - for (i = 0; i < NR_GREP_COLORS; i++) - color_set(opt->colors[i], def->colors[i]); + memcpy(opt->colors, def->colors, sizeof(def->colors)); } void grep_destroy(void) -- 2.29.2.454.gaff20da3a2
next prev parent reply other threads:[~2020-11-21 18:33 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-21 18:31 [PATCH 0/4] grep: retire `init_grep_defaults()` Martin Ågren 2020-11-21 18:31 ` [PATCH 1/4] grep: don't set up a "default" repo for grep Martin Ågren 2020-11-21 18:31 ` [PATCH 2/4] grep: use designated initializers for `grep_defaults` Martin Ågren 2020-11-21 18:31 ` Martin Ågren [this message] 2020-11-21 20:23 ` [PATCH 3/4] grep: simplify color setup Jeff King 2020-11-21 20:52 ` Martin Ågren 2020-11-21 22:46 ` Junio C Hamano 2020-11-24 6:54 ` Jeff King 2020-11-21 18:31 ` [PATCH 4/4] MyFirstObjectWalk: drop `init_walken_defaults()` Martin Ågren 2020-11-23 11:03 ` [PATCH 0/4] grep: retire `init_grep_defaults()` Johannes Schindelin 2020-11-24 21:04 ` [PATCH v2 0/4] grep: simplify "grep defaults" handling Martin Ågren 2020-11-24 21:04 ` [PATCH v2 1/4] grep: don't set up a "default" repo for grep Martin Ågren 2020-11-24 21:04 ` [PATCH v2 2/4] grep: use designated initializers for `grep_defaults` Martin Ågren 2020-11-24 21:04 ` [PATCH v2 3/4] grep: copy struct in one fell swoop Martin Ågren 2020-11-24 22:34 ` Junio C Hamano 2020-11-25 6:25 ` Martin Ågren 2020-11-25 7:53 ` Junio C Hamano 2020-11-26 20:25 ` Martin Ågren 2020-11-24 21:04 ` [PATCH v2 4/4] MyFirstObjectWalk: drop `init_walken_defaults()` Martin Ågren 2020-11-25 9:27 ` [PATCH v2 0/4] grep: simplify "grep defaults" handling Ævar Arnfjörð Bjarmason 2020-11-29 19:52 ` [PATCH v3 " Martin Ågren 2020-11-29 19:52 ` [PATCH v3 1/4] grep: don't set up a "default" repo for grep Martin Ågren 2020-11-29 19:52 ` [PATCH v3 2/4] grep: use designated initializers for `grep_defaults` Martin Ågren 2020-11-29 19:52 ` [PATCH v3 3/4] grep: copy struct in one fell swoop Martin Ågren 2020-11-29 19:52 ` [PATCH v3 4/4] MyFirstObjectWalk: drop `init_walken_defaults()` Martin Ågren 2020-12-01 4:46 ` [PATCH v3 0/4] grep: simplify "grep defaults" handling Junio C Hamano
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=d6e43bc540bc682bb46d54e579a7101d0d2c462d.1605972564.git.martin.agren@gmail.com \ --to=martin.agren@gmail.com \ --cc=emilyshaffer@google.com \ --cc=git@vger.kernel.org \ --cc=gitster@pobox.com \ --cc=peff@peff.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
git@vger.kernel.org list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ https://public-inbox.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git