mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-25 18:08:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui-log.c: Several simplifications

Browse Source 
* 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@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2013-11-22 13:30:58 +01:00 committed by Jason A. Donenfeld
parent 9973ef0207
commit d76c438ead
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ui-log.c
View File

@ -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; struct argv_array rev_argv = ARGV_ARRAY_INIT;
int i, columns = commit_graph ? 4 : 3; int i, columns = commit_graph ? 4 : 3;
int must_free_tip = 0; int must_free_tip = 0;
struct strbuf argbuf = STRBUF_INIT;
/* rev_argv.argv[0] will be ignored by setup_revisions */ /* rev_argv.argv[0] will be ignored by setup_revisions */
argv_array_push(&rev_argv, "log_rev_setup"); 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); pattern = xstrdup(pattern);
if (!strcmp(grep, "grep") || !strcmp(grep, "author") || if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
!strcmp(grep, "committer")) { !strcmp(grep, "committer")) {
strbuf_addf(&argbuf, "--%s=%s", grep, pattern); argv_array_pushf(&rev_argv, "--%s=%s", grep, pattern);
argv_array_push(&rev_argv, argbuf.buf); } else if (!strcmp(grep, "range")) {
}
if (!strcmp(grep, "range")) {
char *arg; char *arg;
/* Split the pattern at whitespace and add each token /* Split the pattern at whitespace and add each token
* as a revision expression. Do not accept other * 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) { if (commit_graph) {
static const char *graph_arg = "--graph"; argv_array_push(&rev_argv, "--graph");
static const char *color_arg = "--color"; argv_array_push(&rev_argv, "--color");
argv_array_push(&rev_argv, graph_arg);
argv_array_push(&rev_argv, color_arg);
graph_set_column_colors(column_colors_html, graph_set_column_colors(column_colors_html,
COLUMN_COLORS_HTML_MAX); COLUMN_COLORS_HTML_MAX);
} }
if (commit_sort == 1) { if (commit_sort == 1)
static const char *date_order_arg = "--date-order"; argv_array_push(&rev_argv, "--date-order");
argv_array_push(&rev_argv, date_order_arg); else if (commit_sort == 2)
} else if (commit_sort == 2) { argv_array_push(&rev_argv, "--topo-order");
static const char *topo_order_arg = "--topo-order";
argv_array_push(&rev_argv, topo_order_arg);
}
if (path) { if (path) {
static const char *double_dash_arg = "--"; argv_array_push(&rev_argv, "--");
argv_array_push(&rev_argv, double_dash_arg);
argv_array_push(&rev_argv, path); 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 we allocated tip then it is safe to cast away const. */
if (must_free_tip) if (must_free_tip)
free((char*) tip); free((char*) tip);
strbuf_release(&argbuf);
} }