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

Suppress sign-conversion warning from FD_SET.

Browse Source 
[BZ #14210] See <http://sourceware.org/ml/libc-alpha/2012-05/msg01794.html>.
* debug/fdelt_chk.c (__fdelt_chk): Accept and return long int,
not unsigned long int.
* misc/bits/select2.h (__fdelt_chk, __fdelt_warn, __FD_ELT): Likewise.
This commit is contained in:
Paul Pluzhnikov
2012-06-13 09:57:18 -07:00
committed by Paul Eggert
parent ddb2897514
commit ceb9e56b3d
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2012-06-13 Paul Pluzhnikov <ppluzhnikov@google.com>
[BZ #14210]
Suppress sign-conversion warning from FD_SET.
See <http://sourceware.org/ml/libc-alpha/2012-05/msg01794.html>.
* debug/fdelt_chk.c (__fdelt_chk): Accept and return long int,
not unsigned long int.
* misc/bits/select2.h (__fdelt_chk, __fdelt_warn, __FD_ELT): Likewise.
2012-06-12 H.J. Lu <hongjiu.lu@intel.com> 2012-06-12 H.J. Lu <hongjiu.lu@intel.com>
[BZ #14050] [BZ #14050]

8
debug/fdelt_chk.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2011 Free Software Foundation, Inc. /* Copyright (C) 2011, 2012 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
@ -18,10 +18,10 @@
#include <sys/select.h> #include <sys/select.h>
unsigned long int long int
__fdelt_chk (unsigned long int d) __fdelt_chk (long int d)
{ {
if (d >= FD_SETSIZE) if (d < 0 || d >= FD_SETSIZE)
__chk_fail (); __chk_fail ();
return d / __NFDBITS; return d / __NFDBITS;

13
misc/bits/select2.h
View File

@ -1,5 +1,5 @@
/* Checking macros for select functions. /* Checking macros for select functions.
Copyright (C) 2011 Free Software Foundation, Inc. Copyright (C) 2011, 2012 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
@ -21,14 +21,15 @@
#endif #endif
/* Helper functions to issue warnings and errors when needed. */ /* Helper functions to issue warnings and errors when needed. */
extern unsigned long int __fdelt_chk (unsigned long int __d); extern long int __fdelt_chk (long int __d);
extern unsigned long int __fdelt_warn (unsigned long int __d) extern long int __fdelt_warn (long int __d)
__warnattr ("bit outside of fd_set selected"); __warnattr ("bit outside of fd_set selected");
#undef __FD_ELT #undef __FD_ELT
#define __FD_ELT(d) \ #define __FD_ELT(d) \
__extension__ \ __extension__ \
({ unsigned long int __d = (d); \ ({ long int __d = (d); \
(__builtin_constant_p (__d) \ (__builtin_constant_p (__d) \
? (__d >= __FD_SETSIZE \ ? (0 <= __d && __d < __FD_SETSIZE \
? __fdelt_warn (__d) : (__d / __NFDBITS)) \ ? (__d / __NFDBITS) \
: __fdelt_warn (__d)) \
: __fdelt_chk (__d)); }) : __fdelt_chk (__d)); })