From 69dfeedfc1ec72971f131f8fc8e051ecaaaa48e4 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Wed, 7 Oct 2015 14:03:38 +0200 Subject: [PATCH 1/1] lexer.c: Remove file_name member from lex_reader_file The parent class already has such a member so this is redundant and complicates things. --- src/language/lexer/lexer.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/language/lexer/lexer.c b/src/language/lexer/lexer.c index bbe16cbe17..c263537d0d 100644 --- a/src/language/lexer/lexer.c +++ b/src/language/lexer/lexer.c @@ -1542,7 +1542,6 @@ struct lex_file_reader { struct lex_reader reader; struct u8_istream *istream; - char *file_name; }; static struct lex_reader_class lex_file_reader_class; @@ -1578,7 +1577,6 @@ lex_reader_for_file (const char *file_name, const char *encoding, r->reader.file_name = xstrdup (file_name); r->reader.line_number = 1; r->istream = istream; - r->file_name = xstrdup (file_name); return &r->reader; } @@ -1597,7 +1595,7 @@ lex_file_read (struct lex_reader *r_, char *buf, size_t n, ssize_t n_read = u8_istream_read (r->istream, buf, n); if (n_read < 0) { - msg (ME, _("Error reading `%s': %s."), r->file_name, strerror (errno)); + msg (ME, _("Error reading `%s': %s."), r_->file_name, strerror (errno)); return 0; } return n_read; @@ -1611,12 +1609,11 @@ lex_file_close (struct lex_reader *r_) if (u8_istream_fileno (r->istream) != STDIN_FILENO) { if (u8_istream_close (r->istream) != 0) - msg (ME, _("Error closing `%s': %s."), r->file_name, strerror (errno)); + msg (ME, _("Error closing `%s': %s."), r_->file_name, strerror (errno)); } else u8_istream_free (r->istream); - free (r->file_name); free (r); } -- 2.30.2