From f33c2ee251ee9669508b29752db3cf4729d9487d Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 8 Feb 2006 00:04:23 +0000 Subject: [PATCH] * closeout.c (close_stdout): Don't assume 'bool' converts nonzero ints to 0 or 1, as this isn't true for the stdbool.h substitute. --- lib/ChangeLog | 5 +++++ lib/closeout.c | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index cb2cf94775..a403158790 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2006-02-07 Paul Eggert + + * closeout.c (close_stdout): Don't assume 'bool' converts nonzero + ints to 0 or 1, as this isn't true for the stdbool.h substitute. + 2006-02-07 Sergey Poznyakoff * argp-namefrob.h: Restore changes accidentally lost during the diff --git a/lib/closeout.c b/lib/closeout.c index 5d0509dede..2137fd4a33 100644 --- a/lib/closeout.c +++ b/lib/closeout.c @@ -1,7 +1,7 @@ /* closeout.c - close standard output - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 Free Software - Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2006 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 @@ -73,9 +73,9 @@ close_stdout_set_file_name (const char *file) void close_stdout (void) { - bool prev_fail = ferror (stdout); - bool none_pending = (0 == __fpending (stdout)); - bool fclose_fail = fclose (stdout); + bool none_pending = (__fpending (stdout) == 0); + bool prev_fail = (ferror (stdout) != 0); + bool fclose_fail = (fclose (stdout) != 0); if (prev_fail || fclose_fail) { -- 2.30.2