From: Brandon Casey Date: Thu, 9 Sep 2010 19:02:46 +0000 (-0500) Subject: xdiff-interface.c: always trim trailing space from xfuncname matches X-Git-Tag: v1.7.3-rc1~3^2~1 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1b6ecbad3511b1aaa65172ef8b520dd3b5141614;p=git.git xdiff-interface.c: always trim trailing space from xfuncname matches Generally, trailing space is removed from the string matched by the xfuncname patterns. The exception is when the matched string exceeds the length of the fixed-size buffer that it will be copied in to. But, a string that exceeds the buffer can still contain trailing space in the portion of the string that will be copied into the buffer. So, simplify this code slightly, and just perform the trailing space removal always. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano --- diff --git a/xdiff-interface.c b/xdiff-interface.c index cd2285de1..e1e054e4d 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);