test-path-utils: handle const parameter of basename and dirname
The parameter to basename(3) and dirname(3) traditionally had the type "char *", but on OpenBSD it's been "const char *" for years. That causes (at least) Clang to throw an incompatible-pointer-types warning for test-path-utils, where we try to pass around pointers to these functions. Avoid this warning (which is fatal in DEVELOPER mode) by ignoring the promise of OpenBSD's implementations to keep input strings unmodified and enclosing them in POSIX-compatible wrappers. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe committed
Aug 7, 2017 at 15:57 UTC
29c2eda80b9d9528ccc881387a0b955249403cbb
1 file changed
+16
-2
t/helper/test-path-utils.c
+16
-2
@@ -38,6 +38,20 @@ struct test_data {
38
const char *alternative; /* output: ... or this. */
39
};
40
41
+/*
42
+ * Compatibility wrappers for OpenBSD, whose basename(3) and dirname(3)
43
+ * have const parameters.
44
+ */
45
+static char *posix_basename(char *path)
46
+{
47
+ return basename(path);
48
+}
49
+
50
+static char *posix_dirname(char *path)
51
+{
52
+ return dirname(path);
53
+}
54
+
55
static int test_function(struct test_data *data, char *(*func)(char *input),
56
const char *funcname)
57
{
@@ -251,10 +265,10 @@ int cmd_main(int argc, const char **argv)
265
}
266
267
if (argc == 2 && !strcmp(argv[1], "basename"))
254
- return test_function(basename_data, basename, argv[1]);
268
+ return test_function(basename_data, posix_basename, argv[1]);
269
270
if (argc == 2 && !strcmp(argv[1], "dirname"))
257
- return test_function(dirname_data, dirname, argv[1]);
271
+ return test_function(dirname_data, posix_dirname, argv[1]);
272
273
fprintf(stderr, "%s: unknown function name: %s\n", argv[0],
274
argv[1] ? argv[1] : "(there was none)");