AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-03 08:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
2003-08-28  Carlos O'Donell  <carlos@baldric.uwo.ca>

	* sysdeps/unix/sysv/linux/hppa/syscalls.list: Add semtimedop.

2003-08-29  Jakub Jelinek  <jakub@redhat.com>

	* libio/iofgetpos64.c (_IO_new_fgetpos64): Move lock release to the
	end.

2003-08-29  Ulrich Drepper  <drepper@redhat.com>

	* libio/stdio.h: Remove a few more __THROW.

	* libio/iofputs.c (_IO_fputs): Likewise.
	* libio/iofputws.c (fputws): Likewise.
This commit is contained in:
Ulrich Drepper 2003-08-30 00:24:07 +00:00
parent 0261d33f87
commit bc2e36893a
4 changed files with 47 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@ -1,3 +1,16 @@
2003-08-28 Carlos O'Donell <carlos@baldric.uwo.ca>
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Add semtimedop.
2003-08-29 Jakub Jelinek <jakub@redhat.com>
* libio/iofgetpos64.c (_IO_new_fgetpos64): Move lock release to the
end.
2003-08-29 Ulrich Drepper <drepper@redhat.com>
* libio/stdio.h: Remove a few more __THROW.
2003-08-29 Jakub Jelinek <jakub@redhat.com> 2003-08-29 Jakub Jelinek <jakub@redhat.com>
* libio/Makefile: Compile fputc.c, fputwc.c, freopen64.c, freopen.c, * libio/Makefile: Compile fputc.c, fputwc.c, freopen64.c, freopen.c,
@ -33,8 +46,8 @@
* libio/iofgetpos.c (_IO_new_fgetpos): Likewise. * libio/iofgetpos.c (_IO_new_fgetpos): Likewise.
* libio/iofgets.c (_IO_fgets): Likewise. * libio/iofgets.c (_IO_fgets): Likewise.
* libio/iofgetws.c (fgetws): Likewise. * libio/iofgetws.c (fgetws): Likewise.
* libio/iofputs.c (_IO_fputs): * libio/iofputs.c (_IO_fputs): Likewise.
* libio/iofputws.c (_IO_fputs): Likewise. * libio/iofputws.c (fputws): Likewise.
* libio/iofread.c (_IO_fread): Likewise. * libio/iofread.c (_IO_fread): Likewise.
* libio/iofsetpos64.c (_IO_new_fsetpos64): Likewise. * libio/iofsetpos64.c (_IO_new_fsetpos64): Likewise.
* libio/iofsetpos.c (_IO_new_fsetpos): Likewise. * libio/iofsetpos.c (_IO_new_fsetpos): Likewise.

20
libio/iofgetpos64.c
View File

@ -37,6 +37,7 @@ _IO_new_fgetpos64 (fp, posp)
{ {
#ifdef _G_LSEEK64 #ifdef _G_LSEEK64
_IO_off64_t pos; _IO_off64_t pos;
int result = 0;
CHECK_FILE (fp, EOF); CHECK_FILE (fp, EOF);
_IO_acquire_lock (fp); _IO_acquire_lock (fp);
pos = _IO_seekoff_unlocked (fp, 0, _IO_seek_cur, 0); pos = _IO_seekoff_unlocked (fp, 0, _IO_seek_cur, 0);
@ -45,7 +46,6 @@ _IO_new_fgetpos64 (fp, posp)
if (fp->_mode <= 0) if (fp->_mode <= 0)
pos -= fp->_IO_save_end - fp->_IO_save_base; pos -= fp->_IO_save_end - fp->_IO_save_base;
} }
_IO_release_lock (fp);
if (pos == _IO_pos_BAD) if (pos == _IO_pos_BAD)
{ {
/* ANSI explicitly requires setting errno to a positive value on /* ANSI explicitly requires setting errno to a positive value on
@ -54,14 +54,18 @@ _IO_new_fgetpos64 (fp, posp)
if (errno == 0) if (errno == 0)
__set_errno (EIO); __set_errno (EIO);
# endif # endif
return EOF; result = EOF;
} }
posp->__pos = pos; else
if (fp->_mode > 0 {
&& (*fp->_codecvt->__codecvt_do_encoding) (fp->_codecvt) < 0) posp->__pos = pos;
/* This is a stateful encoding, safe the state. */ if (fp->_mode > 0
posp->__state = fp->_wide_data->_IO_state; && (*fp->_codecvt->__codecvt_do_encoding) (fp->_codecvt) < 0)
return 0; /* This is a stateful encoding, safe the state. */
posp->__state = fp->_wide_data->_IO_state;
}
_IO_release_lock (fp);
return result;
#else #else
__set_errno (ENOSYS); __set_errno (ENOSYS);
return EOF; return EOF;

29
libio/stdio.h
View File

@ -470,9 +470,12 @@ __BEGIN_NAMESPACE_STD
/* Write a character to STREAM. /* Write a character to STREAM.
These functions are possible cancellation points and therefore not These functions are possible cancellation points and therefore not
marked with __THROW.
These functions is a possible cancellation point and therefore not
marked with __THROW. */ marked with __THROW. */
extern int fputc (int __c, FILE *__stream) __THROW; extern int fputc (int __c, FILE *__stream);
extern int putc (int __c, FILE *__stream) __THROW; extern int putc (int __c, FILE *__stream);
/* Write a character to stdout. /* Write a character to stdout.
@ -508,10 +511,10 @@ extern int putchar_unlocked (int __c);
#if defined __USE_SVID || defined __USE_MISC \ #if defined __USE_SVID || defined __USE_MISC \
|| (defined __USE_XOPEN && !defined __USE_XOPEN2K) || (defined __USE_XOPEN && !defined __USE_XOPEN2K)
/* Get a word (int) from STREAM. */ /* Get a word (int) from STREAM. */
extern int getw (FILE *__stream) __THROW; extern int getw (FILE *__stream);
/* Write a word (int) to STREAM. */ /* Write a word (int) to STREAM. */
extern int putw (int __w, FILE *__stream) __THROW; extern int putw (int __w, FILE *__stream);
#endif #endif
@ -626,9 +629,9 @@ extern int fputs_unlocked (__const char *__restrict __s,
or due to the implementation they are cancellation points and or due to the implementation they are cancellation points and
therefore not marked with __THROW. */ therefore not marked with __THROW. */
extern size_t fread_unlocked (void *__restrict __ptr, size_t __size, extern size_t fread_unlocked (void *__restrict __ptr, size_t __size,
size_t __n, FILE *__restrict __stream) __THROW; size_t __n, FILE *__restrict __stream);
extern size_t fwrite_unlocked (__const void *__restrict __ptr, size_t __size, extern size_t fwrite_unlocked (__const void *__restrict __ptr, size_t __size,
size_t __n, FILE *__restrict __stream) __THROW; size_t __n, FILE *__restrict __stream);
#endif #endif
@ -757,11 +760,17 @@ extern int fileno_unlocked (FILE *__stream) __THROW;
#if (defined __USE_POSIX2 || defined __USE_SVID || defined __USE_BSD || \ #if (defined __USE_POSIX2 || defined __USE_SVID || defined __USE_BSD || \
defined __USE_MISC) defined __USE_MISC)
/* Create a new stream connected to a pipe running the given command. */ /* Create a new stream connected to a pipe running the given command.
extern FILE *popen (__const char *__command, __const char *__modes) __THROW;
/* Close a stream opened by popen and return the status of its child. */ This function is a possible cancellation point and therefore not
extern int pclose (FILE *__stream) __THROW; marked with __THROW. */
extern FILE *popen (__const char *__command, __const char *__modes);
/* Close a stream opened by popen and return the status of its child.
This function is a possible cancellation point and therefore not
marked with __THROW. */
extern int pclose (FILE *__stream);
#endif #endif

1
sysdeps/unix/sysv/linux/hppa/syscalls.list
View File

@ -10,6 +10,7 @@ shmctl - shmctl i:iip __shmctl shmctl
shmdt - shmdt i:s __shmdt shmdt shmdt - shmdt i:s __shmdt shmdt
shmget - shmget i:iii __shmget shmget shmget - shmget i:iii __shmget shmget
semop - semop i:ipi __semop semop semop - semop i:ipi __semop semop
semtimedop - semtimedop i:ipip semtimedop
semget - semget i:iii __semget semget semget - semget i:iii __semget semget
semctl - semctl i:iiii __semctl semctl semctl - semctl i:iiii __semctl semctl