From eb1474bd8487fe8da6ea1c93e8033f7c2ba51157 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Thu, 5 Jun 2014 17:10:12 -0400 Subject: [PATCH] FileReader: fix num_lines() --- src/lib/include/jes/FileReader.h | 13 +++++++++++-- src/lib/src/FileReader.cc | 1 - 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/lib/include/jes/FileReader.h b/src/lib/include/jes/FileReader.h index 657cd5e..a6391cb 100644 --- a/src/lib/include/jes/FileReader.h +++ b/src/lib/include/jes/FileReader.h @@ -22,7 +22,17 @@ namespace jes FileReader(); ~FileReader(); bool load(const char * fname); - unsigned int num_lines() { return m_num_lines; } + unsigned int num_lines() + { + if (m_lines.is_null()) + { + return 0u; + } + else + { + return m_lines->size(); + } + } TextRef get_line(unsigned int line_no); int get_line_endings() { return m_line_endings; } protected: @@ -31,7 +41,6 @@ namespace jes typedef Ref LineIndexPairVectorRef; void load_buf(size_t size); int m_fd; - unsigned int m_num_lines; uint8_t * m_buf; int m_line_endings; LineIndexPairVectorRef m_lines; diff --git a/src/lib/src/FileReader.cc b/src/lib/src/FileReader.cc index 2bb688d..5ee7178 100644 --- a/src/lib/src/FileReader.cc +++ b/src/lib/src/FileReader.cc @@ -11,7 +11,6 @@ namespace jes FileReader::FileReader() { m_fd = 0; - m_num_lines = 0u; m_buf = NULL; m_line_endings = LINE_ENDING_COUNT; m_lines = NULL;