From f478103ff0ab69829f32537947024269296cff17 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 23 Apr 2003 01:54:03 +0000 Subject: 2003-04-22 Roland McGrath * sysdeps/unix/sysv/linux/not-cancel.h: Put parens around macro args. (open_not_cancel): Make last argument non-optional. * sysdeps/generic/check_fds.c (check_one_fd): Update caller. * sysdeps/unix/sysv/linux/gethostid.c (gethostid): Likewise. * iconv/gconv_cache.c (__gconv_load_cache): Likewise. --- sysdeps/unix/sysv/linux/gethostid.c | 4 ++-- sysdeps/unix/sysv/linux/not-cancel.h | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'sysdeps/unix') diff --git a/sysdeps/unix/sysv/linux/gethostid.c b/sysdeps/unix/sysv/linux/gethostid.c index 4b587ceab3..5ef330b958 100644 --- a/sysdeps/unix/sysv/linux/gethostid.c +++ b/sysdeps/unix/sysv/linux/gethostid.c @@ -72,9 +72,9 @@ gethostid () int fd; /* First try to get the ID from a former invocation of sethostid. */ - fd = open_not_cancel (HOSTIDFILE, O_RDONLY|O_LARGEFILE); + fd = open_not_cancel (HOSTIDFILE, O_RDONLY|O_LARGEFILE, 0); if (fd < 0) - fd = open_not_cancel (OLD_HOSTIDFILE, O_RDONLY|O_LARGEFILE); + fd = open_not_cancel (OLD_HOSTIDFILE, O_RDONLY|O_LARGEFILE, 0); if (fd >= 0) { ssize_t n = read_not_cancel (fd, &id, sizeof (id)); diff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux/not-cancel.h index cf61cff379..fcd0187a5a 100644 --- a/sysdeps/unix/sysv/linux/not-cancel.h +++ b/sysdeps/unix/sysv/linux/not-cancel.h @@ -22,33 +22,32 @@ /* Uncancelable open. */ #ifdef INLINE_SYSCALL -# define open_not_cancel(name, flags, mode...) \ - ({ int _mode = (0, ##mode); \ - INLINE_SYSCALL (open, 3, (const char *) name, flags, _mode); }) +# define open_not_cancel(name, flags, mode) \ + INLINE_SYSCALL (open, 3, (const char *) (name), (flags), (mode)) #endif /* Uncancelable close. */ #ifdef INLINE_SYSCALL # define close_not_cancel_no_status(fd) \ (void) ({ INTERNAL_SYSCALL_DECL (err); \ - INTERNAL_SYSCALL (close, err, 1, fd); }) + INTERNAL_SYSCALL (close, err, 1, (fd)); }) #endif /* Uncancelable read. */ #ifdef INLINE_SYSCALL # define read_not_cancel(fd, buf, n) \ - INLINE_SYSCALL (read, 3, fd, buf, n) + INLINE_SYSCALL (read, 3, (fd), (buf), (n)) #endif /* Uncancelable write. */ #ifdef INLINE_SYSCALL # define write_not_cancel(fd, buf, n) \ - INLINE_SYSCALL (write, 3, fd, buf, n) + INLINE_SYSCALL (write, 3, (fd), (buf), (n)) #endif /* Uncancelable writev. */ #ifdef INLINE_SYSCALL # define writev_not_cancel_no_status(fd, iov, n) \ (void) ({ INTERNAL_SYSCALL_DECL (err); \ - INTERNAL_SYSCALL (writev, err, 3, fd, iov, n); }) + INTERNAL_SYSCALL (writev, err, 3, (fd), (iov), (n)); }) #endif -- cgit v1.2.3