From: cgit at cryptocrack.de (Lukas Fleischer)
Subject: [PATCH 2/2] ui-log.c: Several simplifications
Date: Fri, 22 Nov 2013 13:39:07 +0100 [thread overview]
Message-ID: <1385123947-8505-2-git-send-email-cgit@cryptocrack.de> (raw)
In-Reply-To: <1385123947-8505-1-git-send-email-cgit@cryptocrack.de>
* Use argv_array_pushf() for inserting formatted strings.
* Remove unneeded static strings.
* Replace "if" by "else if" for readability and speed.
Signed-off-by: Lukas Fleischer <cgit at cryptocrack.de>
---
ui-log.c | 28 +++++++++-------------------
1 file changed, 9 insertions(+), 19 deletions(-)
diff --git a/ui-log.c b/ui-log.c
index 3c5130a..c154f69 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -291,7 +291,6 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
struct argv_array rev_argv = ARGV_ARRAY_INIT;
int i, columns = commit_graph ? 4 : 3;
int must_free_tip = 0;
- struct strbuf argbuf = STRBUF_INIT;
/* rev_argv.argv[0] will be ignored by setup_revisions */
argv_array_push(&rev_argv, "log_rev_setup");
@@ -305,10 +304,8 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
pattern = xstrdup(pattern);
if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
!strcmp(grep, "committer")) {
- strbuf_addf(&argbuf, "--%s=%s", grep, pattern);
- argv_array_push(&rev_argv, argbuf.buf);
- }
- if (!strcmp(grep, "range")) {
+ argv_array_pushf(&rev_argv, "--%s=%s", grep, pattern);
+ } else if (!strcmp(grep, "range")) {
char *arg;
/* Split the pattern at whitespace and add each token
* as a revision expression. Do not accept other
@@ -327,25 +324,19 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
}
}
if (commit_graph) {
- static const char *graph_arg = "--graph";
- static const char *color_arg = "--color";
- argv_array_push(&rev_argv, graph_arg);
- argv_array_push(&rev_argv, color_arg);
+ argv_array_push(&rev_argv, "--graph");
+ argv_array_push(&rev_argv, "--color");
graph_set_column_colors(column_colors_html,
COLUMN_COLORS_HTML_MAX);
}
- if (commit_sort == 1) {
- static const char *date_order_arg = "--date-order";
- argv_array_push(&rev_argv, date_order_arg);
- } else if (commit_sort == 2) {
- static const char *topo_order_arg = "--topo-order";
- argv_array_push(&rev_argv, topo_order_arg);
- }
+ if (commit_sort == 1)
+ argv_array_push(&rev_argv, "--date-order");
+ else if (commit_sort == 2)
+ argv_array_push(&rev_argv, "--topo-order");
if (path) {
- static const char *double_dash_arg = "--";
- argv_array_push(&rev_argv, double_dash_arg);
+ argv_array_push(&rev_argv, "--");
argv_array_push(&rev_argv, path);
}
@@ -437,5 +428,4 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
/* If we allocated tip then it is safe to cast away const. */
if (must_free_tip)
free((char*) tip);
- strbuf_release(&argbuf);
}
--
1.8.4.2
prev parent reply other threads:[~2013-11-22 12:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-22 12:39 [PATCH 1/2] Use argv_array in place of vector cgit
2013-11-22 12:39 ` cgit [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1385123947-8505-2-git-send-email-cgit@cryptocrack.de \
--to=cgit@lists.zx2c4.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).