lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

Define miss_F_GETOWN_EX only if needed.

Browse Source 
When doing i686-unknown-linux-gnu build configured with --enable-kernel=2.6.24,
there are several warnings like this:

  ../sysdeps/unix/sysv/linux/i386/fcntl.c:36:12: warning: ‘miss_F_GETOWN_EX’ defined but not used
This commit is contained in:
Ulrich Drepper
2010-03-27 04:11:14 -07:00
parent 8dc1d0baa0
commit 62f8db6e49
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2010-03-26 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/i386/fcntl.c: Define miss_F_GETOWN_EX
only if needed.
Patch mostly by Paul Pluzhnikov <ppluzhnikov@google.com>.
2010-03-26 Richard Henderson <rth@redhat.com> 2010-03-26 Richard Henderson <rth@redhat.com>
* sysdeps/generic/ldsodefs.h (_dl_random): Mark attribute_relro; * sysdeps/generic/ldsodefs.h (_dl_random): Mark attribute_relro;

22
sysdeps/unix/sysv/linux/i386/fcntl.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2000,2002,2003,2004,2006,2009 Free Software Foundation, Inc. /* Copyright (C) 2000,2002-2004,2006,2009,2010 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -25,23 +25,23 @@
#include <sys/syscall.h> #include <sys/syscall.h>
#include <kernel-features.h> #include <kernel-features.h>
#if __ASSUME_FCNTL64 == 0 #ifndef __ASSUME_FCNTL64
/* This variable is shared with all files that check for fcntl64. */ /* This variable is shared with all files that check for fcntl64. */
int __have_no_fcntl64; int __have_no_fcntl64;
#endif #endif
#ifdef __ASSUME_F_GETOWN_EX #ifdef __ASSUME_F_GETOWN_EX
# define miss_F_GETOWN_EX 0 # define miss_F_GETOWN_EX 0
#else #elif !defined __ASSUME_FCNTL64
static int miss_F_GETOWN_EX; static int miss_F_GETOWN_EX;
#endif #endif
#if defined NO_CANCELLATION && __ASSUME_FCNTL64 == 0 #if defined NO_CANCELLATION && !defined __ASSUME_FCNTL64
# define __fcntl_nocancel __libc_fcntl # define __fcntl_nocancel __libc_fcntl
#endif #endif
#if !defined NO_CANCELLATION || __ASSUME_FCNTL64 == 0 #if !defined NO_CANCELLATION || !defined __ASSUME_FCNTL64
int int
__fcntl_nocancel (int fd, int cmd, ...) __fcntl_nocancel (int fd, int cmd, ...)
{ {
@ -52,7 +52,7 @@ __fcntl_nocancel (int fd, int cmd, ...)
arg = va_arg (ap, void *); arg = va_arg (ap, void *);
va_end (ap); va_end (ap);
#if __ASSUME_FCNTL64 == 0 #ifndef __ASSUME_FCNTL64
# ifdef __NR_fcntl64 # ifdef __NR_fcntl64
if (! __have_no_fcntl64) if (! __have_no_fcntl64)
{ {
@ -135,11 +135,11 @@ __fcntl_nocancel (int fd, int cmd, ...)
if (!INTERNAL_SYSCALL_ERROR_P (res, err)) if (!INTERNAL_SYSCALL_ERROR_P (res, err))
return fex.type == F_OWNER_GID ? -fex.pid : fex.pid; return fex.type == F_OWNER_GID ? -fex.pid : fex.pid;
#ifndef __ASSUME_F_GETOWN_EX # ifndef __ASSUME_F_GETOWN_EX
if (INTERNAL_SYSCALL_ERRNO (res, err) == EINVAL) if (INTERNAL_SYSCALL_ERRNO (res, err) == EINVAL)
miss_F_GETOWN_EX = 1; miss_F_GETOWN_EX = 1;
else else
#endif # endif
{ {
__set_errno (INTERNAL_SYSCALL_ERRNO (res, err)); __set_errno (INTERNAL_SYSCALL_ERRNO (res, err));
return -1; return -1;
@ -168,21 +168,21 @@ __libc_fcntl (int fd, int cmd, ...)
arg = va_arg (ap, void *); arg = va_arg (ap, void *);
va_end (ap); va_end (ap);
#if __ASSUME_FCNTL64 > 0 # ifdef __ASSUME_FCNTL64
if (SINGLE_THREAD_P || (cmd != F_SETLKW && cmd != F_SETLKW64)) if (SINGLE_THREAD_P || (cmd != F_SETLKW && cmd != F_SETLKW64))
return INLINE_SYSCALL (fcntl64, 3, fd, cmd, arg); return INLINE_SYSCALL (fcntl64, 3, fd, cmd, arg);
int oldtype = LIBC_CANCEL_ASYNC (); int oldtype = LIBC_CANCEL_ASYNC ();
int result = INLINE_SYSCALL (fcntl64, 3, fd, cmd, arg); int result = INLINE_SYSCALL (fcntl64, 3, fd, cmd, arg);
#else # else
if (SINGLE_THREAD_P || (cmd != F_SETLKW && cmd != F_SETLKW64)) if (SINGLE_THREAD_P || (cmd != F_SETLKW && cmd != F_SETLKW64))
return __fcntl_nocancel (fd, cmd, arg); return __fcntl_nocancel (fd, cmd, arg);
int oldtype = LIBC_CANCEL_ASYNC (); int oldtype = LIBC_CANCEL_ASYNC ();
int result = __fcntl_nocancel (fd, cmd, arg); int result = __fcntl_nocancel (fd, cmd, arg);
#endif # endif
LIBC_CANCEL_RESET (oldtype); LIBC_CANCEL_RESET (oldtype);