diff options
| author | Eric Blake <ebb9@byu.net> | 2008-05-23 06:27:16 -0600 |
|---|---|---|
| committer | Eric Blake <ebb9@byu.net> | 2008-08-07 07:15:22 -0600 |
| commit | d5a907320c0ef81670caaac3f82a01bae298ffc1 (patch) | |
| tree | 254fe71a77762d7b75bd6d13f7d1a5b5730bcea4 | |
| parent | c52fae5f76dd2b2b54afcf37c61d8f75ff80c7be (diff) | |
| download | m4-d5a907320c0ef81670caaac3f82a01bae298ffc1.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>
(cherry picked from commit f2c5adaeeca0975529d4aa782db0a9b8852818ec)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/freeze.c | 5 |
2 files changed, 8 insertions, 3 deletions
@@ -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 87843ee7..2a7ff30f 100644 --- a/src/freeze.c +++ b/src/freeze.c @@ -386,9 +386,8 @@ reload_frozen_state (const char *name) free (string[0]); free (string[1]); - errno = 0; - if (ferror (file) || fclose (file) != 0) - M4ERROR ((EXIT_FAILURE, errno, "unable to read frozen state")); + if (close_stream (file) != 0) + m4_error (EXIT_FAILURE, errno, _("unable to read frozen state")); current_file = NULL; current_line = 0; |