summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2006-01-13 18:10:09 +0000
committermiod <miod@openbsd.org>2006-01-13 18:10:09 +0000
commit25fa1fc0ab8c7dc58bf0a9c5d41f7b0b99ab1b84 (patch)
treec503cf8ca7209d64fef3203994ae6d5bfd58c06f
parentMajor version bump to deal with potential fallout from the types changes. (diff)
downloadwireguard-openbsd-25fa1fc0ab8c7dc58bf0a9c5d41f7b0b99ab1b84.tar.xz
wireguard-openbsd-25fa1fc0ab8c7dc58bf0a9c5d41f7b0b99ab1b84.zip
Remove neither documented nor found in any spec ctermid_r() function - ctermid()
is reentrant in its current implementation anyway. Surfing on the recent major version bump, ok millert@ deraadt@
-rw-r--r--include/stdio.h3
-rw-r--r--lib/libc/gen/ctermid.c11
2 files changed, 2 insertions, 12 deletions
diff --git a/include/stdio.h b/include/stdio.h
index daae349f18a..afbd64af7fa 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdio.h,v 1.34 2006/01/06 18:53:04 millert Exp $ */
+/* $OpenBSD: stdio.h,v 1.35 2006/01/13 18:10:09 miod Exp $ */
/* $NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $ */
/*-
@@ -293,7 +293,6 @@ __END_DECLS
__BEGIN_DECLS
char *ctermid(char *);
-char *ctermid_r(char *);
char *cuserid(char *);
FILE *fdopen(int, const char *);
int fileno(FILE *);
diff --git a/lib/libc/gen/ctermid.c b/lib/libc/gen/ctermid.c
index 4206dd0c6b4..fddce642d9b 100644
--- a/lib/libc/gen/ctermid.c
+++ b/lib/libc/gen/ctermid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ctermid.c,v 1.6 2005/08/08 08:05:33 espie Exp $ */
+/* $OpenBSD: ctermid.c,v 1.7 2006/01/13 18:10:10 miod Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -43,12 +43,3 @@ ctermid(char *s)
}
return(def);
}
-
-char *
-ctermid_r(char *s)
-{
- if (s)
- return ctermid(s);
- else
- return(NULL);
-}