Skip to contentSkip to conversation

grep: don't return an expression from pcre2_free()

PATCH New Hans Jerry Illikainen 1 participant 2 messages Nov 27, 2019

lore
Share & tools
lore
#0 lore raw

cover grep: don't return an expression from pcre2_free()

This is a simple one-line fix for a bug I ran into when enabling pedantic builds with DEVELOPER=1 and --with-libpcre. Previously, the void function pcre2_free() returned an expression. This commit changes that as per section 6.8.6.4 in C99 [1] and C11 [2]:

Quoted 2 lines

A return statement with an expression shall not appear in a function whose return type is void.

[1] http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1256.pdf
[2] http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1548.pdf

Hans Jerry Illikainen (1):
grep: don't return an expression from pcre2_free()

 grep.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
2.24.0.156.g00c62833a5

#1 lore raw

PATCH 1/1 grep: don't return an expression from pcre2_free()

Previously, the void pcre2_free() function in grep.c returned free(). While free() itself is void, afaict it's still an expression as per section A.2.3, subsection 6.8.6 (jump-statement) in both C99 [1] and C11 [2]:

Quoted 1 line

return expression

Section 6.8.6.4 in C99 [1] and C11 [2] says that:

Quoted 2 lines

A return statement with an expression shall not appear in a function whose return type is void.

The consequence of the old behavior was that developer builds with pedantic errors enabled broke Git if PCRE2 was enabled and a smart-enough compiler to detect these errors was used. This commit fixes pedantic builds of Git that enables --with-libpcre.

[1] http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1256.pdf
[2] http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1548.pdf

---
 grep.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
grep.c +1 -1
index b7ae5a442a..0552b127c1 100644
@@ -26,7 +26,7 @@ static void *pcre2_malloc(PCRE2_SIZE size, MAYBE_UNUSED void *memory_data)
 
 static void pcre2_free(void *pointer, MAYBE_UNUSED void *memory_data)
 {
-	return free(pointer);
+	free(pointer);
 }
 #endif
 
Signature · 1 line
2.24.0.156.g00c62833a5