Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/libexec/ld.elf_so use __func__ (c99, c++11) instead of __FUN...



details:   https://anonhg.NetBSD.org/src/rev/1f07beb739f5
branches:  trunk
changeset: 454989:1f07beb739f5
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Oct 04 01:57:53 2019 +0000

description:
use __func__ (c99, c++11) instead of __FUNCTION__

diffstat:

 libexec/ld.elf_so/rtld.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 40d17df6db62 -r 1f07beb739f5 libexec/ld.elf_so/rtld.c
--- a/libexec/ld.elf_so/rtld.c  Fri Oct 04 01:53:58 2019 +0000
+++ b/libexec/ld.elf_so/rtld.c  Fri Oct 04 01:57:53 2019 +0000
@@ -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 @@
                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 @@
                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)



Home | Main Index | Thread Index | Old Index