Module Name: src
Committed By: christos
Date: Fri Oct 4 01:57:53 UTC 2019
Modified Files:
src/libexec/ld.elf_so: rtld.c
Log Message:
use __func__ (c99, c++11) instead of __FUNCTION__
To generate a diff of this commit:
cvs rdiff -u -r1.199 -r1.200 src/libexec/ld.elf_so/rtld.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/rtld.c
diff -u src/libexec/ld.elf_so/rtld.c:1.199 src/libexec/ld.elf_so/rtld.c:1.200
--- src/libexec/ld.elf_so/rtld.c:1.199 Thu Oct 3 06:34:30 2019
+++ src/libexec/ld.elf_so/rtld.c Thu Oct 3 21:57:53 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.c,v 1.199 2019/10/03 10:34:30 tnn Exp $ */
+/* $NetBSD: rtld.c,v 1.200 2019/10/04 01:57:53 christos Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: rtld.c,v 1.199 2019/10/03 10:34:30 tnn Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.200 2019/10/04 01:57:53 christos Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -1674,7 +1674,7 @@ _rtld_shared_enter(void)
if (cur == (self | RTLD_EXCLUSIVE_MASK)) {
if (_rtld_mutex_may_recurse)
return;
- _rtld_error("%s: dead lock detected", __FUNCTION__);
+ _rtld_error("%s: dead lock detected", __func__);
_rtld_die();
}
waiter = atomic_swap_uint(&_rtld_waiter_shared, self);
@@ -1738,7 +1738,7 @@ _rtld_exclusive_enter(sigset_t *mask)
membar_sync();
cur = _rtld_mutex;
if (cur == locked_value) {
- _rtld_error("%s: dead lock detected", __FUNCTION__);
+ _rtld_error("%s: dead lock detected", __func__);
_rtld_die();
}
if (cur)
