X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gl%2Fopen-safer.c;fp=gl%2Fopen-safer.c;h=15bf6a65d01dda9e563ffc7aed925b54ac7ce0ef;hb=71cdb52799220f8d9052643baf1d3e9836a9c755;hp=ce493d5e3151c9c88f9a59877961a53f61465ca0;hpb=f7afa46586645e50498d8b2d0c67884f014dc3a4;p=nagiosplug.git diff --git a/gl/open-safer.c b/gl/open-safer.c index ce493d5..15bf6a6 100644 --- a/gl/open-safer.c +++ b/gl/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 @@ open_safer (char const *file, int flags, ...) /* 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); }