Junio C Hamano | 52e9578 | 2005-05-21 02:40:01 -0700 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2005 Junio C Hamano |
Junio C Hamano | f506b8e | 2010-08-23 10:17:03 -0700 | [diff] [blame] | 3 | * Copyright (C) 2010 Google Inc. |
Junio C Hamano | 52e9578 | 2005-05-21 02:40:01 -0700 | [diff] [blame] | 4 | */ |
| 5 | #include "cache.h" |
| 6 | #include "diff.h" |
| 7 | #include "diffcore.h" |
Junio C Hamano | f506b8e | 2010-08-23 10:17:03 -0700 | [diff] [blame] | 8 | #include "xdiff-interface.h" |
Fredrik Kuivinen | b95c5ad | 2011-08-21 00:41:57 +0200 | [diff] [blame] | 9 | #include "kwset.h" |
Nguyễn Thái Ngọc Duy | b51a9c1 | 2016-06-25 07:22:37 +0200 | [diff] [blame] | 10 | #include "commit.h" |
| 11 | #include "quote.h" |
Junio C Hamano | f506b8e | 2010-08-23 10:17:03 -0700 | [diff] [blame] | 12 | |
Jeff King | 61690bf | 2013-04-05 01:28:10 -0400 | [diff] [blame] | 13 | typedef int (*pickaxe_fn)(mmfile_t *one, mmfile_t *two, |
| 14 | struct diff_options *o, |
| 15 | regex_t *regexp, kwset_t kws); |
| 16 | |
Junio C Hamano | f506b8e | 2010-08-23 10:17:03 -0700 | [diff] [blame] | 17 | struct diffgrep_cb { |
| 18 | regex_t *regexp; |
| 19 | int hit; |
| 20 | }; |
| 21 | |
Ævar Arnfjörð Bjarmason | a8d5eb6 | 2021-04-12 19:15:24 +0200 | [diff] [blame] | 22 | static int diffgrep_consume(void *priv, char *line, unsigned long len) |
Junio C Hamano | f506b8e | 2010-08-23 10:17:03 -0700 | [diff] [blame] | 23 | { |
| 24 | struct diffgrep_cb *data = priv; |
| 25 | regmatch_t regmatch; |
Junio C Hamano | f506b8e | 2010-08-23 10:17:03 -0700 | [diff] [blame] | 26 | |
| 27 | if (line[0] != '+' && line[0] != '-') |
Ævar Arnfjörð Bjarmason | a8d5eb6 | 2021-04-12 19:15:24 +0200 | [diff] [blame] | 28 | return 0; |
Junio C Hamano | f506b8e | 2010-08-23 10:17:03 -0700 | [diff] [blame] | 29 | if (data->hit) |
Ævar Arnfjörð Bjarmason | fa59e7b | 2021-04-12 19:15:26 +0200 | [diff] [blame] | 30 | BUG("Already matched in diffgrep_consume! Broken xdiff_emit_line_fn?"); |
| 31 | if (!regexec_buf(data->regexp, line + 1, len - 1, 1, |
| 32 | ®match, 0)) { |
| 33 | data->hit = 1; |
| 34 | return 1; |
| 35 | } |
Ævar Arnfjörð Bjarmason | a8d5eb6 | 2021-04-12 19:15:24 +0200 | [diff] [blame] | 36 | return 0; |
Junio C Hamano | f506b8e | 2010-08-23 10:17:03 -0700 | [diff] [blame] | 37 | } |
| 38 | |
Jeff King | 61690bf | 2013-04-05 01:28:10 -0400 | [diff] [blame] | 39 | static int diff_grep(mmfile_t *one, mmfile_t *two, |
| 40 | struct diff_options *o, |
Jeff King | 0ada4b9 | 2022-10-17 21:09:07 -0400 | [diff] [blame] | 41 | regex_t *regexp, kwset_t kws UNUSED) |
Junio C Hamano | f506b8e | 2010-08-23 10:17:03 -0700 | [diff] [blame] | 42 | { |
Jeff King | 61690bf | 2013-04-05 01:28:10 -0400 | [diff] [blame] | 43 | struct diffgrep_cb ecbdata; |
| 44 | xpparam_t xpp; |
| 45 | xdemitconf_t xecfg; |
Ævar Arnfjörð Bjarmason | fa59e7b | 2021-04-12 19:15:26 +0200 | [diff] [blame] | 46 | int ret; |
Junio C Hamano | f506b8e | 2010-08-23 10:17:03 -0700 | [diff] [blame] | 47 | |
Jeff King | 61690bf | 2013-04-05 01:28:10 -0400 | [diff] [blame] | 48 | /* |
| 49 | * We have both sides; need to run textual diff and see if |
| 50 | * the pattern appears on added/deleted lines. |
| 51 | */ |
| 52 | memset(&xpp, 0, sizeof(xpp)); |
| 53 | memset(&xecfg, 0, sizeof(xecfg)); |
| 54 | ecbdata.regexp = regexp; |
| 55 | ecbdata.hit = 0; |
Ævar Arnfjörð Bjarmason | 5d93460 | 2021-04-12 19:15:29 +0200 | [diff] [blame] | 56 | xecfg.flags = XDL_EMIT_NO_HUNK_HDR; |
Jeff King | 61690bf | 2013-04-05 01:28:10 -0400 | [diff] [blame] | 57 | xecfg.ctxlen = o->context; |
| 58 | xecfg.interhunkctxlen = o->interhunkcontext; |
Ævar Arnfjörð Bjarmason | fa59e7b | 2021-04-12 19:15:26 +0200 | [diff] [blame] | 59 | |
| 60 | /* |
| 61 | * An xdiff error might be our "data->hit" from above. See the |
| 62 | * comment for xdiff_emit_line_fn in xdiff-interface.h |
| 63 | */ |
Ævar Arnfjörð Bjarmason | 5d93460 | 2021-04-12 19:15:29 +0200 | [diff] [blame] | 64 | ret = xdi_diff_outf(one, two, NULL, diffgrep_consume, |
Ævar Arnfjörð Bjarmason | fa59e7b | 2021-04-12 19:15:26 +0200 | [diff] [blame] | 65 | &ecbdata, &xpp, &xecfg); |
| 66 | if (ecbdata.hit) |
| 67 | return 1; |
| 68 | if (ret) |
| 69 | return ret; |
| 70 | return 0; |
Junio C Hamano | f506b8e | 2010-08-23 10:17:03 -0700 | [diff] [blame] | 71 | } |
| 72 | |
Ævar Arnfjörð Bjarmason | 5b0672a | 2021-04-12 19:15:23 +0200 | [diff] [blame] | 73 | static unsigned int contains(mmfile_t *mf, regex_t *regexp, kwset_t kws, |
| 74 | unsigned int limit) |
Junio C Hamano | 52e9578 | 2005-05-21 02:40:01 -0700 | [diff] [blame] | 75 | { |
Ævar Arnfjörð Bjarmason | 102fdd2 | 2021-04-12 19:15:17 +0200 | [diff] [blame] | 76 | unsigned int cnt = 0; |
| 77 | unsigned long sz = mf->size; |
| 78 | const char *data = mf->ptr; |
Junio C Hamano | 2002eed | 2005-07-23 16:35:25 -0700 | [diff] [blame] | 79 | |
Petr Baudis | d01d8c6 | 2006-03-29 02:16:33 +0200 | [diff] [blame] | 80 | if (regexp) { |
| 81 | regmatch_t regmatch; |
| 82 | int flags = 0; |
| 83 | |
Ævar Arnfjörð Bjarmason | 52e011c | 2021-04-12 19:15:21 +0200 | [diff] [blame] | 84 | while (sz && |
Johannes Schindelin | b7d36ff | 2016-09-21 20:24:14 +0200 | [diff] [blame] | 85 | !regexec_buf(regexp, data, sz, 1, ®match, flags)) { |
Petr Baudis | d01d8c6 | 2006-03-29 02:16:33 +0200 | [diff] [blame] | 86 | flags |= REG_NOTBOL; |
René Scharfe | 50fd699 | 2009-03-16 19:38:42 +0100 | [diff] [blame] | 87 | data += regmatch.rm_eo; |
SZEDER Gábor | f53c5de | 2017-03-18 19:24:08 +0100 | [diff] [blame] | 88 | sz -= regmatch.rm_eo; |
Ævar Arnfjörð Bjarmason | 52e011c | 2021-04-12 19:15:21 +0200 | [diff] [blame] | 89 | if (sz && regmatch.rm_so == regmatch.rm_eo) { |
René Scharfe | 50fd699 | 2009-03-16 19:38:42 +0100 | [diff] [blame] | 90 | data++; |
SZEDER Gábor | f53c5de | 2017-03-18 19:24:08 +0100 | [diff] [blame] | 91 | sz--; |
| 92 | } |
Junio C Hamano | 2002eed | 2005-07-23 16:35:25 -0700 | [diff] [blame] | 93 | cnt++; |
Ævar Arnfjörð Bjarmason | 5b0672a | 2021-04-12 19:15:23 +0200 | [diff] [blame] | 94 | |
| 95 | if (limit && cnt == limit) |
| 96 | return cnt; |
Junio C Hamano | 2002eed | 2005-07-23 16:35:25 -0700 | [diff] [blame] | 97 | } |
Petr Baudis | d01d8c6 | 2006-03-29 02:16:33 +0200 | [diff] [blame] | 98 | |
| 99 | } else { /* Classic exact string match */ |
René Scharfe | ce163c7 | 2009-03-03 00:00:55 +0100 | [diff] [blame] | 100 | while (sz) { |
René Scharfe | 5d176fb | 2011-10-06 18:50:06 +0200 | [diff] [blame] | 101 | struct kwsmatch kwsm; |
| 102 | size_t offset = kwsexec(kws, data, sz, &kwsm); |
Fredrik Kuivinen | b95c5ad | 2011-08-21 00:41:57 +0200 | [diff] [blame] | 103 | if (offset == -1) |
René Scharfe | ce163c7 | 2009-03-03 00:00:55 +0100 | [diff] [blame] | 104 | break; |
René Scharfe | e4aab50 | 2014-03-22 18:16:00 +0100 | [diff] [blame] | 105 | sz -= offset + kwsm.size[0]; |
| 106 | data += offset + kwsm.size[0]; |
René Scharfe | ce163c7 | 2009-03-03 00:00:55 +0100 | [diff] [blame] | 107 | cnt++; |
Ævar Arnfjörð Bjarmason | 5b0672a | 2021-04-12 19:15:23 +0200 | [diff] [blame] | 108 | |
| 109 | if (limit && cnt == limit) |
| 110 | return cnt; |
Petr Baudis | d01d8c6 | 2006-03-29 02:16:33 +0200 | [diff] [blame] | 111 | } |
Junio C Hamano | 2002eed | 2005-07-23 16:35:25 -0700 | [diff] [blame] | 112 | } |
| 113 | return cnt; |
Junio C Hamano | 52e9578 | 2005-05-21 02:40:01 -0700 | [diff] [blame] | 114 | } |
| 115 | |
Jeff King | 61690bf | 2013-04-05 01:28:10 -0400 | [diff] [blame] | 116 | static int has_changes(mmfile_t *one, mmfile_t *two, |
Jeff King | 0ada4b9 | 2022-10-17 21:09:07 -0400 | [diff] [blame] | 117 | struct diff_options *o UNUSED, |
René Scharfe | 5d176fb | 2011-10-06 18:50:06 +0200 | [diff] [blame] | 118 | regex_t *regexp, kwset_t kws) |
René Scharfe | 15dafaf | 2011-10-06 18:26:24 +0200 | [diff] [blame] | 119 | { |
Ævar Arnfjörð Bjarmason | 5b0672a | 2021-04-12 19:15:23 +0200 | [diff] [blame] | 120 | unsigned int c1 = one ? contains(one, regexp, kws, 0) : 0; |
| 121 | unsigned int c2 = two ? contains(two, regexp, kws, c1 + 1) : 0; |
Ævar Arnfjörð Bjarmason | 5d35a95 | 2021-04-12 19:15:22 +0200 | [diff] [blame] | 122 | return c1 != c2; |
Jeff King | 61690bf | 2013-04-05 01:28:10 -0400 | [diff] [blame] | 123 | } |
| 124 | |
| 125 | static int pickaxe_match(struct diff_filepair *p, struct diff_options *o, |
| 126 | regex_t *regexp, kwset_t kws, pickaxe_fn fn) |
| 127 | { |
Simon Ruderich | bc61589 | 2013-04-04 22:20:29 +0200 | [diff] [blame] | 128 | struct userdiff_driver *textconv_one = NULL; |
| 129 | struct userdiff_driver *textconv_two = NULL; |
Jeff King | ef90ab6 | 2012-10-28 08:27:12 -0400 | [diff] [blame] | 130 | mmfile_t mf1, mf2; |
| 131 | int ret; |
| 132 | |
Jeff King | 61690bf | 2013-04-05 01:28:10 -0400 | [diff] [blame] | 133 | /* ignore unmerged */ |
| 134 | if (!DIFF_FILE_VALID(p->one) && !DIFF_FILE_VALID(p->two)) |
| 135 | return 0; |
| 136 | |
Stefan Beller | 15af58c | 2018-01-04 14:50:42 -0800 | [diff] [blame] | 137 | if (o->objfind) { |
| 138 | return (DIFF_FILE_VALID(p->one) && |
| 139 | oidset_contains(o->objfind, &p->one->oid)) || |
| 140 | (DIFF_FILE_VALID(p->two) && |
| 141 | oidset_contains(o->objfind, &p->two->oid)); |
| 142 | } |
| 143 | |
Brandon Williams | 0d1e0e7 | 2017-10-31 11:19:11 -0700 | [diff] [blame] | 144 | if (o->flags.allow_textconv) { |
Nguyễn Thái Ngọc Duy | bd7ad45 | 2018-11-10 06:49:06 +0100 | [diff] [blame] | 145 | textconv_one = get_textconv(o->repo, p->one); |
| 146 | textconv_two = get_textconv(o->repo, p->two); |
Simon Ruderich | a8f6109 | 2013-04-05 15:16:30 +0200 | [diff] [blame] | 147 | } |
Simon Ruderich | bc61589 | 2013-04-04 22:20:29 +0200 | [diff] [blame] | 148 | |
Jeff King | ef90ab6 | 2012-10-28 08:27:12 -0400 | [diff] [blame] | 149 | /* |
| 150 | * If we have an unmodified pair, we know that the count will be the |
| 151 | * same and don't even have to load the blobs. Unless textconv is in |
| 152 | * play, _and_ we are using two different textconv filters (e.g., |
| 153 | * because a pair is an exact rename with different textconv attributes |
| 154 | * for each side, which might generate different content). |
| 155 | */ |
| 156 | if (textconv_one == textconv_two && diff_unmodified_pair(p)) |
| 157 | return 0; |
| 158 | |
Thomas Braun | e0e7cb8 | 2018-12-14 19:49:12 +0100 | [diff] [blame] | 159 | if ((o->pickaxe_opts & DIFF_PICKAXE_KIND_G) && |
| 160 | !o->flags.text && |
| 161 | ((!textconv_one && diff_filespec_is_binary(o->repo, p->one)) || |
| 162 | (!textconv_two && diff_filespec_is_binary(o->repo, p->two)))) |
| 163 | return 0; |
| 164 | |
Nguyễn Thái Ngọc Duy | 6afaf80 | 2018-09-21 17:57:22 +0200 | [diff] [blame] | 165 | mf1.size = fill_textconv(o->repo, textconv_one, p->one, &mf1.ptr); |
| 166 | mf2.size = fill_textconv(o->repo, textconv_two, p->two, &mf2.ptr); |
Jeff King | ef90ab6 | 2012-10-28 08:27:12 -0400 | [diff] [blame] | 167 | |
Ævar Arnfjörð Bjarmason | f97fe35 | 2021-04-12 19:15:27 +0200 | [diff] [blame] | 168 | ret = fn(&mf1, &mf2, o, regexp, kws); |
Jeff King | ef90ab6 | 2012-10-28 08:27:12 -0400 | [diff] [blame] | 169 | |
| 170 | if (textconv_one) |
| 171 | free(mf1.ptr); |
| 172 | if (textconv_two) |
| 173 | free(mf2.ptr); |
| 174 | diff_free_filespec_data(p->one); |
| 175 | diff_free_filespec_data(p->two); |
| 176 | |
| 177 | return ret; |
René Scharfe | 15dafaf | 2011-10-06 18:26:24 +0200 | [diff] [blame] | 178 | } |
| 179 | |
René Scharfe | 3753bd1 | 2014-03-22 18:15:58 +0100 | [diff] [blame] | 180 | static void pickaxe(struct diff_queue_struct *q, struct diff_options *o, |
| 181 | regex_t *regexp, kwset_t kws, pickaxe_fn fn) |
| 182 | { |
| 183 | int i; |
| 184 | struct diff_queue_struct outq; |
| 185 | |
| 186 | DIFF_QUEUE_CLEAR(&outq); |
| 187 | |
| 188 | if (o->pickaxe_opts & DIFF_PICKAXE_ALL) { |
| 189 | /* Showing the whole changeset if needle exists */ |
| 190 | for (i = 0; i < q->nr; i++) { |
| 191 | struct diff_filepair *p = q->queue[i]; |
| 192 | if (pickaxe_match(p, o, regexp, kws, fn)) |
| 193 | return; /* do not munge the queue */ |
| 194 | } |
| 195 | |
| 196 | /* |
| 197 | * Otherwise we will clear the whole queue by copying |
| 198 | * the empty outq at the end of this function, but |
| 199 | * first clear the current entries in the queue. |
| 200 | */ |
| 201 | for (i = 0; i < q->nr; i++) |
| 202 | diff_free_filepair(q->queue[i]); |
| 203 | } else { |
| 204 | /* Showing only the filepairs that has the needle */ |
| 205 | for (i = 0; i < q->nr; i++) { |
| 206 | struct diff_filepair *p = q->queue[i]; |
| 207 | if (pickaxe_match(p, o, regexp, kws, fn)) |
| 208 | diff_q(&outq, p); |
| 209 | else |
| 210 | diff_free_filepair(p); |
| 211 | } |
| 212 | } |
| 213 | |
| 214 | free(q->queue); |
| 215 | *q = outq; |
| 216 | } |
| 217 | |
Nguyễn Thái Ngọc Duy | 3d5b23a | 2016-06-25 07:22:36 +0200 | [diff] [blame] | 218 | static void regcomp_or_die(regex_t *regex, const char *needle, int cflags) |
| 219 | { |
| 220 | int err = regcomp(regex, needle, cflags); |
| 221 | if (err) { |
| 222 | /* The POSIX.2 people are surely sick */ |
| 223 | char errbuf[1024]; |
| 224 | regerror(err, regex, errbuf, 1024); |
Nguyễn Thái Ngọc Duy | 3d5b23a | 2016-06-25 07:22:36 +0200 | [diff] [blame] | 225 | die("invalid regex: %s", errbuf); |
| 226 | } |
| 227 | } |
| 228 | |
René Scharfe | 63b52af | 2014-03-22 18:15:57 +0100 | [diff] [blame] | 229 | void diffcore_pickaxe(struct diff_options *o) |
Junio C Hamano | 52e9578 | 2005-05-21 02:40:01 -0700 | [diff] [blame] | 230 | { |
Junio C Hamano | 382f013 | 2010-08-31 13:44:39 -0700 | [diff] [blame] | 231 | const char *needle = o->pickaxe; |
| 232 | int opts = o->pickaxe_opts; |
Petr Baudis | d01d8c6 | 2006-03-29 02:16:33 +0200 | [diff] [blame] | 233 | regex_t regex, *regexp = NULL; |
Fredrik Kuivinen | b95c5ad | 2011-08-21 00:41:57 +0200 | [diff] [blame] | 234 | kwset_t kws = NULL; |
Ævar Arnfjörð Bjarmason | 03c1f14 | 2021-04-12 19:15:19 +0200 | [diff] [blame] | 235 | pickaxe_fn fn; |
Junio C Hamano | 52e9578 | 2005-05-21 02:40:01 -0700 | [diff] [blame] | 236 | |
Ævar Arnfjörð Bjarmason | 2e197a7 | 2021-04-12 19:15:20 +0200 | [diff] [blame] | 237 | if (opts & ~DIFF_PICKAXE_KIND_OBJFIND && |
| 238 | (!needle || !*needle)) |
| 239 | BUG("should have needle under -G or -S"); |
René Scharfe | 63b52af | 2014-03-22 18:15:57 +0100 | [diff] [blame] | 240 | if (opts & (DIFF_PICKAXE_REGEX | DIFF_PICKAXE_KIND_G)) { |
René Scharfe | 218c45a | 2014-03-22 18:15:56 +0100 | [diff] [blame] | 241 | int cflags = REG_EXTENDED | REG_NEWLINE; |
Stefan Beller | c1ddc46 | 2018-01-04 14:50:40 -0800 | [diff] [blame] | 242 | if (o->pickaxe_opts & DIFF_PICKAXE_IGNORE_CASE) |
René Scharfe | 218c45a | 2014-03-22 18:15:56 +0100 | [diff] [blame] | 243 | cflags |= REG_ICASE; |
Nguyễn Thái Ngọc Duy | 3d5b23a | 2016-06-25 07:22:36 +0200 | [diff] [blame] | 244 | regcomp_or_die(®ex, needle, cflags); |
Petr Baudis | d01d8c6 | 2006-03-29 02:16:33 +0200 | [diff] [blame] | 245 | regexp = ®ex; |
Ævar Arnfjörð Bjarmason | 03c1f14 | 2021-04-12 19:15:19 +0200 | [diff] [blame] | 246 | |
| 247 | if (opts & DIFF_PICKAXE_KIND_G) |
| 248 | fn = diff_grep; |
| 249 | else if (opts & DIFF_PICKAXE_REGEX) |
| 250 | fn = has_changes; |
| 251 | else |
| 252 | /* |
| 253 | * We don't need to check the combination of |
| 254 | * -G and --pickaxe-regex, by the time we get |
| 255 | * here diff.c has already died if they're |
| 256 | * combined. See the usage tests in |
| 257 | * t4209-log-pickaxe.sh. |
| 258 | */ |
| 259 | BUG("unreachable"); |
Stefan Beller | 15af58c | 2018-01-04 14:50:42 -0800 | [diff] [blame] | 260 | } else if (opts & DIFF_PICKAXE_KIND_S) { |
| 261 | if (o->pickaxe_opts & DIFF_PICKAXE_IGNORE_CASE && |
| 262 | has_non_ascii(needle)) { |
| 263 | struct strbuf sb = STRBUF_INIT; |
| 264 | int cflags = REG_NEWLINE | REG_ICASE; |
Nguyễn Thái Ngọc Duy | b51a9c1 | 2016-06-25 07:22:37 +0200 | [diff] [blame] | 265 | |
Stefan Beller | 15af58c | 2018-01-04 14:50:42 -0800 | [diff] [blame] | 266 | basic_regex_quote_buf(&sb, needle); |
| 267 | regcomp_or_die(®ex, sb.buf, cflags); |
| 268 | strbuf_release(&sb); |
| 269 | regexp = ®ex; |
| 270 | } else { |
| 271 | kws = kwsalloc(o->pickaxe_opts & DIFF_PICKAXE_IGNORE_CASE |
| 272 | ? tolower_trans_tbl : NULL); |
| 273 | kwsincr(kws, needle, strlen(needle)); |
| 274 | kwsprep(kws); |
| 275 | } |
Ævar Arnfjörð Bjarmason | 03c1f14 | 2021-04-12 19:15:19 +0200 | [diff] [blame] | 276 | fn = has_changes; |
| 277 | } else if (opts & DIFF_PICKAXE_KIND_OBJFIND) { |
| 278 | fn = NULL; |
| 279 | } else { |
| 280 | BUG("unknown pickaxe_opts flag"); |
Petr Baudis | d01d8c6 | 2006-03-29 02:16:33 +0200 | [diff] [blame] | 281 | } |
| 282 | |
Ævar Arnfjörð Bjarmason | 03c1f14 | 2021-04-12 19:15:19 +0200 | [diff] [blame] | 283 | pickaxe(&diff_queued_diff, o, regexp, kws, fn); |
Junio C Hamano | 367cec1 | 2005-05-27 15:55:28 -0700 | [diff] [blame] | 284 | |
René Scharfe | 63b52af | 2014-03-22 18:15:57 +0100 | [diff] [blame] | 285 | if (regexp) |
| 286 | regfree(regexp); |
Stefan Beller | 15af58c | 2018-01-04 14:50:42 -0800 | [diff] [blame] | 287 | if (kws) |
Fredrik Kuivinen | b95c5ad | 2011-08-21 00:41:57 +0200 | [diff] [blame] | 288 | kwsfree(kws); |
Junio C Hamano | 52e9578 | 2005-05-21 02:40:01 -0700 | [diff] [blame] | 289 | return; |
| 290 | } |