diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | libio/oldiofdopen.c | 4 | ||||
| -rw-r--r-- | libio/oldtmpfile.c | 2 | ||||
| -rw-r--r-- | sunrpc/clnt_unix.c | 2 | ||||
| -rw-r--r-- | sysdeps/posix/profil.c | 6 |
5 files changed, 13 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index e2ec7ee32d..cf9499c949 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 1998-12-17 Ulrich Drepper <drepper@cygnus.com> + * sunrpc/clnt_unix.c (clntunix_destroy): Use __close not close. + * libio/oldtmpfile.c: Likewise. + * libio/oldiofdopen.c: Use __fcntl instead fcntl. + * sysdeps/posix/profil.c: Use __sigaction instead of sigaction. + * iconvdata/iso646.c (gconv_init): Return correct error value if we run out of memory. * iconvdata/iso-2022-jp.c: Likewise. @@ -16,7 +21,7 @@ 1998-12-17 Ulrich Drepper <drepper@cygnus.com> - * login/login.c: Determine pts/3 and terminal name if path is + * login/login.c: Determine pts/3 as terminal name if path is /dev/pts/3. This is consistent with getlogin. [PR libc/906] 1998-12-16 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> diff --git a/libio/oldiofdopen.c b/libio/oldiofdopen.c index e9c18d932b..0e015226cc 100644 --- a/libio/oldiofdopen.c +++ b/libio/oldiofdopen.c @@ -25,13 +25,13 @@ #define _IO_USE_OLD_IO_FILE #ifdef __STDC__ -#include <stdlib.h> +# include <stdlib.h> #endif #include "libioP.h" #include <fcntl.h> #ifndef _IO_fcntl -#define _IO_fcntl fcntl +# define _IO_fcntl __fcntl #endif _IO_FILE * diff --git a/libio/oldtmpfile.c b/libio/oldtmpfile.c index 72437fea0f..40395bf9c2 100644 --- a/libio/oldtmpfile.c +++ b/libio/oldtmpfile.c @@ -43,7 +43,7 @@ __old_tmpfile (void) (void) remove (buf); if ((f = _IO_old_fdopen (fd, "w+b")) == NULL) - close (fd); + __close (fd); return f; } diff --git a/sunrpc/clnt_unix.c b/sunrpc/clnt_unix.c index cead72b761..923dd8a070 100644 --- a/sunrpc/clnt_unix.c +++ b/sunrpc/clnt_unix.c @@ -427,7 +427,7 @@ clntunix_destroy (CLIENT *h) if (ct->ct_closeit) { - (void) close (ct->ct_sock); + (void) __close (ct->ct_sock); } XDR_DESTROY (&(ct->ct_xdrs)); mem_free ((caddr_t) ct, sizeof (struct ct_data)); diff --git a/sysdeps/posix/profil.c b/sysdeps/posix/profil.c index 6c8adbcd0b..f4f0acd7fc 100644 --- a/sysdeps/posix/profil.c +++ b/sysdeps/posix/profil.c @@ -77,7 +77,7 @@ __profil (u_short *sample_buffer, size_t size, size_t offset, u_int scale) if (__setitimer (ITIMER_PROF, &otimer, NULL) < 0) return -1; samples = NULL; - return sigaction (SIGPROF, &oact, NULL); + return __sigaction (SIGPROF, &oact, NULL); } if (samples) @@ -85,7 +85,7 @@ __profil (u_short *sample_buffer, size_t size, size_t offset, u_int scale) /* Was already turned on. Restore old timer and signal handler first. */ if (__setitimer (ITIMER_PROF, &otimer, NULL) < 0 - || sigaction (SIGPROF, &oact, NULL) < 0) + || __sigaction (SIGPROF, &oact, NULL) < 0) return -1; } @@ -97,7 +97,7 @@ __profil (u_short *sample_buffer, size_t size, size_t offset, u_int scale) act.sa_handler = (sighandler_t) &profil_counter; act.sa_flags = SA_RESTART; sigfillset (&act.sa_mask); - if (sigaction (SIGPROF, &act, &oact) < 0) + if (__sigaction (SIGPROF, &act, &oact) < 0) return -1; timer.it_value.tv_sec = 0; |