[src/trunk]: src/lib/librumphijack Backout previous, it breaks lots of tests ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fc9aa7e704f5
branches:  trunk
changeset: 764424:fc9aa7e704f5
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Apr 21 08:21:13 2011 +0000

description:
Backout previous, it breaks lots of tests (tests/lib/librumphijack for
example).

diffstat:

 lib/librumphijack/hijack.c |  11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diffs (48 lines):

diff -r a11219534734 -r fc9aa7e704f5 lib/librumphijack/hijack.c
--- a/lib/librumphijack/hijack.c        Thu Apr 21 08:17:00 2011 +0000
+++ b/lib/librumphijack/hijack.c        Thu Apr 21 08:21:13 2011 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: hijack.c,v 1.88 2011/04/13 12:40:54 he Exp $  */
+/*      $NetBSD: hijack.c,v 1.89 2011/04/21 08:21:13 martin Exp $      */
 
 /*-
  * Copyright (c) 2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: hijack.c,v 1.88 2011/04/13 12:40:54 he Exp $");
+__RCSID("$NetBSD: hijack.c,v 1.89 2011/04/21 08:21:13 martin Exp $");
 
 #define __ssp_weak_name(fun) _hijack_ ## fun
 
@@ -1970,11 +1970,9 @@
        (int, int),                                                     \
        (fd, how))
 
-ssize_t _sys_readlink(const char * __restrict, char * __restrict, size_t);
-
 #if _FORTIFY_SOURCE > 0
 #define STUB(fun) __ssp_weak_name(fun)
-ssize_t STUB(readlink)(const char * __restrict, char * __restrict, size_t);
+ssize_t _sys_readlink(const char * __restrict, char * __restrict, size_t);
 ssize_t
 STUB(readlink)(const char * __restrict path, char * __restrict buf,
     size_t bufsiz)
@@ -1982,7 +1980,6 @@
        return _sys_readlink(path, buf, bufsiz);
 }
 
-char *STUB(getcwd)(char *, size_t);
 char *_sys_getcwd(char *, size_t);
 char *
 STUB(getcwd)(char *buf, size_t size)
@@ -2133,7 +2130,7 @@
        (const char *, const char *),                                   \
        (target, path))
 
-PATHCALL(ssize_t, _sys_readlink, DUALCALL_READLINK,                    \
+PATHCALL(ssize_t, readlink, DUALCALL_READLINK,                         \
        (const char *path, char *buf, size_t bufsiz),                   \
        (const char *, char *, size_t),                                 \
        (path, buf, bufsiz))