Mercurial > hg > octave-shane > gnulib-hg
changeset 10649:aafc4daf1581
open-safer.c: avoid 'signed and unsigned in conditional...' warning
* lib/open-safer.c (open_safer): Use an "if/else" statement in place
of the ternary operator. Reported by Reuben Thomas <rrt@sc3d.org>.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Thu, 16 Oct 2008 21:48:54 +0200 |
| parents | 9a2054f7225c |
| children | c205b195801d |
| files | ChangeLog lib/open-safer.c |
| diffstat | 2 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-10-16 Paul Eggert <eggert@cs.ucla.edu> + + open-safer.c: avoid 'signed and unsigned in conditional...' warning + * lib/open-safer.c (open_safer): Use an "if/else" statement in place + of the ternary operator. Reported by Reuben Thomas <rrt@sc3d.org>. + 2008-10-16 Jim Meyering <meyering@redhat.com> openat-die.c: avoid 'no previous prototype' warning
--- a/lib/open-safer.c +++ b/lib/open-safer.c @@ -1,6 +1,6 @@ /* Invoke open, but avoid some glitches. - Copyright (C) 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 2005, 2006, 2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -38,9 +38,10 @@ /* Assume mode_t promotes to int if and only if it is smaller. This assumption isn't guaranteed by the C standard, but we don't know of any real-world counterexamples. */ - mode = (sizeof (mode_t) < sizeof (int) - ? va_arg (ap, int) - : va_arg (ap, mode_t)); + if (sizeof (mode_t) < sizeof (int)) + mode = va_arg (ap, int); + else + mode = va_arg (ap, mode_t); va_end (ap); }