From 2c008571c3ad156479307b7e23185ae566b5776a Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 19 Apr 2003 16:57:17 +0000 Subject: Update. 2003-04-19 Ulrich Drepper * catgets/nl_types.h: Remove __THROW marker from cancellation points. * dirent/dirent.h: Likewise. * dlfcn/dlfcn.h: Likewise. * grp/grp.h: Likewise. * iconv/iconv.h: Likewise. * io/fcntl.h: Likewise. * io/ftw.h: Likewise. * libio/stdio.h: Likewise. * misc/sys/mman.h: Likewise. * misc/sys/select.h: Likewise. * misc/sys/syslog.h: Likewise. * misc/sys/uio.h: Likewise. * posix/spawn.h: Likewise. * posix/unistd.h: Likewise. * posix/sys/wait.h: Likewise. * pwd/pwd.h: Likewise. * resolv/netdb.h: Likewise. * rt/aio.h: Likewise. * shadow/shadow.h: Likewise. * signal/signal.h: Likewise. * socket/sys/socket.h: Likewise. * stdlib/stdlib.h: Likewise. * streams/stropts.h: Likewise. * string/string.h: Likewise. * sysdeps/gnu/utmpx.h: Likewise. * sysvipc/sys/msg.h: Likewise. * termios/termios.h: Likewise. * time/time.h: Likewise. * wcsmbs/wchar.h: Likewise. * iconv/gconv_cache.c: Include and use non-cancelable functions. * misc/daemon.c: Likewise. * sysdeps/generic/backtracesymsfd.c: Likewise. * sysdeps/generic/check_fds.c: Likewise. * sysdeps/unix/sysv/linux/gethostid.c: Likewise. * sysdeps/unix/sysv/linux/not-cancel.h: New file. * sysdeps/generic/not-cancel.h: New file. * csu/Makefile (distribute): Add not-cancel.h. * sysdeps/unix/sysv/linux/fatal-prepare.h: New file. * sysdeps/unix/sysv/linux/Makefile: Define FATAL_PREPARE_INCLUDE for assert.c and assert-perr.c to include . * sysdeps/unix/sysv/linux/Dist: Add fatal-prepare.h. * sysdeps/posix/remove.c (remove): Rewrite. No need to restore errno and unlink first. * io/ftw.c (ftw_dir): In all places assume fchdir is available. 2003-04-18 Ulrich Drepper * sysdeps/unix/sysv/linux/libc_fatal.c (__libc_fatal): Use INTERNAL_SYSCALL instead of INLINE_SYSCALL. --- streams/stropts.h | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) (limited to 'streams') diff --git a/streams/stropts.h b/streams/stropts.h index e174186dab..192c09b408 100644 --- a/streams/stropts.h +++ b/streams/stropts.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1998, 1999, 2000, 2002, 2003 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 @@ -44,31 +44,41 @@ __BEGIN_DECLS /* Test whether FILDES is associated with a STREAM-based file. */ extern int isastream (int __fildes) __THROW; -/* Receive next message from a STREAMS file. */ +/* Receive next message from a STREAMS file. + + This function is a cancellation point and therefore not marked with + __THROW. */ extern int getmsg (int __fildes, struct strbuf *__restrict __ctlptr, struct strbuf *__restrict __dataptr, - int *__restrict __flagsp) __THROW; + int *__restrict __flagsp); /* Receive next message from a STREAMS file, with *FLAGSP allowing to - control which message. */ + control which message. + + This function is a cancellation point and therefore not marked with + __THROW. */ extern int getpmsg (int __fildes, struct strbuf *__restrict __ctlptr, struct strbuf *__restrict __dataptr, - int *__restrict __bandp, int *__restrict __flagsp) - __THROW; + int *__restrict __bandp, int *__restrict __flagsp); /* Perform the I/O control operation specified by REQUEST on FD. One argument may follow; its presence and type depend on REQUEST. Return value depends on REQUEST. Usually -1 indicates error. */ extern int ioctl (int __fd, unsigned long int __request, ...) __THROW; -/* Send a message on a STREAM. */ +/* Send a message on a STREAM. + + This function is a cancellation point and therefore not marked with + __THROW. */ extern int putmsg (int __fildes, __const struct strbuf *__ctlptr, - __const struct strbuf *__dataptr, int __flags) __THROW; + __const struct strbuf *__dataptr, int __flags); + +/* Send a message on a STREAM to the BAND. -/* Send a message on a STREAM to the BAND. */ + This function is a cancellation point and therefore not marked with + __THROW. */ extern int putpmsg (int __fildes, __const struct strbuf *__ctlptr, - __const struct strbuf *__dataptr, int __band, int __flags) - __THROW; + __const struct strbuf *__dataptr, int __band, int __flags); /* Attach a STREAMS-based file descriptor FILDES to a file PATH in the file system name space. */ -- cgit v1.2.3