Browse Source

getpt.c: no need for hidden posix_openpt

Prefer static inline instead of hidden (__bsd_getpt)

Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Peter S. Mazinger 13 years ago
parent
commit
f503f6a970
3 changed files with 6 additions and 7 deletions
  1. 0 1
      include/stdlib.h
  2. 1 1
      libc/stdlib/bsd_getpt.c
  3. 5 5
      libc/stdlib/getpt.c

+ 0 - 1
include/stdlib.h

@@ -864,7 +864,6 @@ extern void setkey (__const char *__key) __THROW __nonnull ((1));
 #ifdef __USE_XOPEN2K
 /* Return a master pseudo-terminal handle.  */
 extern int posix_openpt (int __oflag) __wur;
-libc_hidden_proto(posix_openpt)
 #endif
 
 #ifdef __USE_XOPEN

+ 1 - 1
libc/stdlib/bsd_getpt.c

@@ -40,7 +40,7 @@ const char __libc_ptyname1[] attribute_hidden = PTYNAME1;
 const char __libc_ptyname2[] attribute_hidden = PTYNAME2;
 
 /* Open a master pseudo terminal and return its file descriptor.  */
-int
+static __inline__ int
 __getpt (void)
 {
   char buf[sizeof (_PATH_PTY) + 2];

+ 5 - 5
libc/stdlib/getpt.c

@@ -43,12 +43,12 @@ extern __typeof(statfs) __libc_statfs;
 
 #if !defined __UNIX98PTY_ONLY__ && defined __UCLIBC_HAS_GETPT__
 /* Prototype for function that opens BSD-style master pseudo-terminals.  */
-extern int __bsd_getpt (void) attribute_hidden;
+static __inline__ int __bsd_getpt (void);
 #endif
 
 /* Open a master pseudo terminal and return its file descriptor.  */
-int
-posix_openpt (int flags)
+static int
+__posix_openpt (int flags)
 {
 #define have_no_dev_ptmx (1<<0)
 #define devpts_mounted   (1<<1)
@@ -112,14 +112,14 @@ posix_openpt (int flags)
 #endif
   return -1;
 }
-libc_hidden_def(posix_openpt)
+strong_alias(__posix_openpt,posix_openpt)
 #undef have_no_dev_ptmx
 #undef devpts_mounted
 
 #if defined __USE_GNU && defined __UCLIBC_HAS_GETPT__
 int getpt (void)
 {
-	return posix_openpt(O_RDWR);
+	return __posix_openpt(O_RDWR);
 }
 
 #if !defined __UNIX98PTY_ONLY__ && defined __UCLIBC_HAS_GETPT__