diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-09 17:29:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-09 17:29:40 -0700 |
| commit | 8ac8cf5bc17ef11a9c5d51ab128ad010cb37c464 (patch) | |
| tree | 7412604a665890a9ce4dbeaac0cca3406f2ba7ca /xdiff-interface.c | |
| parent | bff42061214e17f342efc909c73f29bf66df51e9 (diff) | |
| parent | 1b6ecbad3511b1aaa65172ef8b520dd3b5141614 (diff) | |
| download | git-8ac8cf5bc17ef11a9c5d51ab128ad010cb37c464.tar.gz | |
Merge branch 'maint'
* maint:
xdiff-interface.c: always trim trailing space from xfuncname matches
diff.c: call regfree to free memory allocated by regcomp when necessary
Diffstat (limited to 'xdiff-interface.c')
| -rw-r--r-- | xdiff-interface.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/xdiff-interface.c b/xdiff-interface.c index cd2285de1c..e1e054e4d9 100644 --- a/xdiff-interface.c +++ b/xdiff-interface.c @@ -286,9 +286,8 @@ static long ff_regexp(const char *line, long len, result = pmatch[i].rm_eo - pmatch[i].rm_so; if (result > buffer_size) result = buffer_size; - else - while (result > 0 && (isspace(line[result - 1]))) - result--; + while (result > 0 && (isspace(line[result - 1]))) + result--; memcpy(buffer, line, result); fail: free(line_buffer); |