summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Blake <ebb9@byu.net>2008-05-23 06:27:16 -0600
committerEric Blake <ebb9@byu.net>2008-05-23 06:27:16 -0600
commitf2c5adaeeca0975529d4aa782db0a9b8852818ec (patch)
tree9c14f30a0352464e30345f17f96a80ca3bb7cb5f
parentfba265c02ea43d6eb835b0fb27e7e2fa05834cbb (diff)
downloadm4-f2c5adaeeca0975529d4aa782db0a9b8852818ec.tar.gz
Make closing files be consistent.
* src/freeze.c (reload_frozen_state): Use close_stream. Reported by Jean-Charles Longuet. Signed-off-by: Eric Blake <ebb9@byu.net>
-rw-r--r--ChangeLog6
-rw-r--r--src/freeze.c3
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9fdca03e..89faf9bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-23 Eric Blake <ebb9@byu.net>
+
+ Make closing files be consistent.
+ * src/freeze.c (reload_frozen_state): Use close_stream.
+ Reported by Jean-Charles Longuet.
+
2008-05-22 Eric Blake <ebb9@byu.net>
Don't allow failure to freeze give exit status of 0.
diff --git a/src/freeze.c b/src/freeze.c
index 15f06fec..c88a2664 100644
--- a/src/freeze.c
+++ b/src/freeze.c
@@ -378,8 +378,7 @@ reload_frozen_state (const char *name)
free (string[0]);
free (string[1]);
- errno = 0;
- if (ferror (file) || fclose (file) != 0)
+ if (close_stream (file) != 0)
m4_error (EXIT_FAILURE, errno, NULL, _("unable to read frozen state"));
current_file = NULL;
current_line = 0;