Wed Jun 6 17:47:10 2018 UTC ()

Correct compilation of osnet/dev/systrace/systrace.c under Clang

Mark arguments to dtrace_probe_lookup() with __UNCONST().
The proper fix constifying it causes pollution of const in too many files.

This could be done with -W flags, but they are incompatible between
compilers.

This is a step forward functional MKLLVM=yes HAVE_LLVM=yes build.

Sponsored by <The NetBSD Foundation>


(kamil)

diff -r1.10 -r1.11 src/external/cddl/osnet/dev/systrace/systrace.c

--- src/external/cddl/osnet/dev/systrace/systrace.c 2018/05/28 21:05:04	1.10
+++ src/external/cddl/osnet/dev/systrace/systrace.c 2018/06/06 17:47:10	1.11

 @@ -1,14 +1,14 @@
-/*	$NetBSD: systrace.c,v 1.10 2018/05/28 21:05:04 chs Exp $	*/
+/*	$NetBSD: systrace.c,v 1.11 2018/06/06 17:47:10 kamil Exp $	*/
 /*
  * CDDL HEADER START
+ *
  * The contents of this file are subject to the terms of the
  * Common Development and Distribution License (the "License").
  * You may not use this file except in compliance with the License.
+ *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
+ *
 @@ -346,27 +346,27 @@ systrace_provide(void *arg, dtrace_probe
 			continue;
 		(void)dtrace_probe_create(systrace_id, MODNAME,
 		    uglyhack.pp_syscallnames[i], "entry",
 		    SYSTRACE_ARTIFICIAL_FRAMES,
 		    (void *)((uintptr_t)SYSTRACE_ENTRY(i)));
 		(void)dtrace_probe_create(systrace_id, MODNAME,
 		    uglyhack.pp_syscallnames[i], "return",
 		    SYSTRACE_ARTIFICIAL_FRAMES,
 		    (void *)((uintptr_t)SYSTRACE_RETURN(i)));
 #else
 		const char *name = ALTSYSCALLNAMES[i] ? ALTSYSCALLNAMES[i] :
 		    SYSCALLNAMES[i];
-		if (dtrace_probe_lookup(systrace_id, NULL, name, "entry") != 0)
+		if (dtrace_probe_lookup(systrace_id, NULL, __UNCONST(name), __UNCONST("entry")) != 0)
 			continue;
 		(void) dtrace_probe_create(systrace_id, NULL,
 		    name, "entry", SYSTRACE_ARTIFICIAL_FRAMES,
 		    (void *)(intptr_t)SYSTRACE_ENTRY(i));
 		(void) dtrace_probe_create(systrace_id, NULL,
 		    name, "return", SYSTRACE_ARTIFICIAL_FRAMES,
 		    (void *)(intptr_t)SYSTRACE_RETURN(i));
 #endif
+	}
+}
 static void