diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-08-18 00:34:47 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-08-18 00:34:47 +0000 |
| commit | 56c55d5d4a8ef51ef424cbfcb9eca2b2fa95e419 (patch) | |
| tree | f7a806a0fde858c7b387865ceb3eabad61e43ffd /sysdeps | |
| parent | 5d08d21845b284c3ad10aafec82cf85938229613 (diff) | |
| download | glibc-56c55d5d4a8ef51ef424cbfcb9eca2b2fa95e419.tar.gz glibc-56c55d5d4a8ef51ef424cbfcb9eca2b2fa95e419.tar.xz glibc-56c55d5d4a8ef51ef424cbfcb9eca2b2fa95e419.zip | |
Update.
* dirent/dirent.h (telldir): Change return type to long int. * sysdeps/generic/telldir.c: Likewise. * sysdeps/mach/hurd/telldir.c: Likewise. * sysdeps/unix/telldir.c: Likewise. * sysdeps/unix/bsd/telldir.c: Likewise. Fix locking problem.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/telldir.c | 8 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/telldir.c | 4 | ||||
| -rw-r--r-- | sysdeps/unix/bsd/telldir.c | 10 | ||||
| -rw-r--r-- | sysdeps/unix/telldir.c | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/sysdeps/generic/telldir.c b/sysdeps/generic/telldir.c index 3400829cb7..3a00bd836b 100644 --- a/sysdeps/generic/telldir.c +++ b/sysdeps/generic/telldir.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996, 1997, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -22,18 +22,18 @@ #include <dirent.h> /* Return the current position of DIRP. */ -off_t +long int telldir (dirp) DIR *dirp; { if (dirp == NULL) { __set_errno (EINVAL); - return -1; + return -1l; } __set_errno (ENOSYS); - return (off_t) -1; + return -1l; } diff --git a/sysdeps/mach/hurd/telldir.c b/sysdeps/mach/hurd/telldir.c index 0063ddf688..d2ffe03650 100644 --- a/sysdeps/mach/hurd/telldir.c +++ b/sysdeps/mach/hurd/telldir.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1994, 1995, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1994, 1995, 1997, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -25,7 +25,7 @@ /* Return the current position of DIRP. */ /* XXX should be __telldir ? */ -off_t +long int telldir (dirp) DIR *dirp; { diff --git a/sysdeps/unix/bsd/telldir.c b/sysdeps/unix/bsd/telldir.c index 29ef72c41e..4ce508c718 100644 --- a/sysdeps/unix/bsd/telldir.c +++ b/sysdeps/unix/bsd/telldir.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1994, 1995, 1996, 1997, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -39,18 +39,18 @@ __libc_lock_define_initialized(static, lock) /* Locks above data. */ /* Return the current position of DIRP. */ -off_t +long int telldir (dirp) DIR *dirp; { struct record *new; off_t pos; - __libc_lock_lock (lock); - new = malloc (sizeof *new); if (new == NULL) - return (off_t) -1; + return -1l; + + __libc_lock_lock (lock); new->pos = dirp->filepos; new->offset = dirp->offset; diff --git a/sysdeps/unix/telldir.c b/sysdeps/unix/telldir.c index f0ad95fd7c..b1c7952c05 100644 --- a/sysdeps/unix/telldir.c +++ b/sysdeps/unix/telldir.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996, 1997, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ #include <dirstream.h> /* Return the current position of DIRP. */ -off_t +long int telldir (DIR *dirp) { return dirp->filepos; |