diff options
| author | Julian Phillips <julian@quantumfyre.co.uk> | 2010-06-26 00:41:39 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-27 10:17:18 -0700 |
| commit | 0c72cead8435b2865efc884060bd0bd49313cbd5 (patch) | |
| tree | 85fe1fa29a3e80661746ca3d223bd016d0cb869e /builtin/grep.c | |
| parent | 7f5329f46dd3221618124df70aee2391aef6305a (diff) | |
| parent | 1d2f80fa79cdc6f7f4fa1cefb47d7d19be3bc5ee (diff) | |
| download | git-0c72cead8435b2865efc884060bd0bd49313cbd5.tar.gz | |
Merge branch 'jp/string-list-api-cleanup' into jn/grep-open
An evil merge to adjust the series to cleaned-up API.
From: Julian Phillips <julian@quantumfyre.co.uk>
Subject: [PATCH v2 7/7] grep: fix string_list_append calls
Date: Sat, 26 Jun 2010 00:41:39 +0100
Message-ID: <20100625234140.18927.35025.julian@quantumfyre.co.uk>
* jp/string-list-api-cleanup:
string_list: Fix argument order for string_list_append
string_list: Fix argument order for string_list_lookup
string_list: Fix argument order for string_list_insert_at_index
string_list: Fix argument order for string_list_insert
string_list: Fix argument order for for_each_string_list
string_list: Fix argument order for print_string_list
Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/grep.c')
| -rw-r--r-- | builtin/grep.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index f32fbbc35a..4b8ddbe0d5 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -564,7 +564,7 @@ static void append_path(struct grep_opt *opt, const void *data, size_t len) if (len == 1 && *(const char *)data == '\0') return; - string_list_append(xstrndup(data, len), path_list); + string_list_append(path_list, xstrndup(data, len)); } static void run_pager(struct grep_opt *opt, const char *prefix) @@ -1001,7 +1001,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) opt.null_following_name = 1; opt.output_priv = &path_list; opt.output = append_path; - string_list_append(show_in_pager, &path_list); + string_list_append(&path_list, show_in_pager); use_threads = 0; } @@ -1076,7 +1076,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) strbuf_addf(&buf, "+/%s%s", strcmp("less", pager) ? "" : "*", opt.pattern_list->pattern); - string_list_append(buf.buf, &path_list); + string_list_append(&path_list, buf.buf); strbuf_detach(&buf, NULL); } } |