CVS commit: src/lib/libpthread

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Wed Jan 26 18:48:58 UTC 2011

Modified Files:
        src/lib/libpthread: pthread_cancelstub.c

Log Message:
make the code more re-usable


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/lib/libpthread/pthread_cancelstub.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/lib/libpthread/pthread_cancelstub.c
diff -u src/lib/libpthread/pthread_cancelstub.c:1.30 src/lib/libpthread/pthread_cancelstub.c:1.31
--- src/lib/libpthread/pthread_cancelstub.c:1.30	Wed Jan 26 13:11:35 2011
+++ src/lib/libpthread/pthread_cancelstub.c	Wed Jan 26 13:48:57 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pthread_cancelstub.c,v 1.30 2011/01/26 18:11:35 christos Exp $	*/
+/*	$NetBSD: pthread_cancelstub.c,v 1.31 2011/01/26 18:48:57 christos Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread_cancelstub.c,v 1.30 2011/01/26 18:11:35 christos Exp $");
+__RCSID("$NetBSD: pthread_cancelstub.c,v 1.31 2011/01/26 18:48:57 christos Exp $");
 
 #ifndef lint
 
@@ -474,15 +474,15 @@
 #define STUB(fun) __ssp_weak_name(fun)
 ssize_t _sys_readlink(const char * __restrict, char * __restrict, size_t);
 ssize_t
-_cancelstub_readlink(const char * __restrict path, char * __restrict buf,
+STUB(readlink)(const char * __restrict path, char * __restrict buf,
     size_t bufsiz)
 {
 	return _sys_readlink(path, buf, bufsiz);
 }
 
-char * _sys_getcwd(char *, size_t);
+char *_sys_getcwd(char *, size_t);
 char *
-_cancelstub_getcwd(char *buf, size_t size)
+STUB(getcwd)(char *buf, size_t size)
 {
 	return _sys_getcwd(buf, size);
 }