(close_stdout): Don't assume 'bool' converts nonzero

ints to 0 or 1, as this isn't true for the stdbool.h substitute.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index ee1f7528322d640be8eeebeb481202dc4f04603b..4775458c02ac1e23c34fa8a30583c2b4f5ca4025 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,4 +1,9 @@
-2006-02-02  Jim Meyering  <jim@meyering.net>
+2006-02-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * 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.
+
+006-02-02  Jim Meyering  <jim@meyering.net>
 
        Eliminate the unwelcome (albeit unlikely) possibility of xmalloc
        failure on deficient systems, and simplify gnulib lgpl dependencies.

diff --git a/lib/closeout.c b/lib/closeout.c
index 5d0509dedecdb8c424ed72ec12dca757228c0517..2137fd4a332ab39f0c9a8985279680ec98fb2ac5 100644 (file)
--- 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)
     {