Commit 064a86ae authored by Stefan Westerfeld's avatar Stefan Westerfeld

Optimize error handling code for reading ts packets.

Signed-off-by: Stefan Westerfeld's avatarStefan Westerfeld <stefan@space.twc.de>
parent ca63bc2f
...@@ -35,8 +35,6 @@ public: ...@@ -35,8 +35,6 @@ public:
bool bool
read (FILE *file, Error& err) read (FILE *file, Error& err)
{ {
err = Error::Code::NONE;
size_t bytes_read = fread (m_data.data(), 1, m_data.size(), file); size_t bytes_read = fread (m_data.data(), 1, m_data.size(), file);
if (bytes_read == 0) /* probably eof */ if (bytes_read == 0) /* probably eof */
return false; return false;
...@@ -219,10 +217,10 @@ TSReader::load (const string& inname) ...@@ -219,10 +217,10 @@ TSReader::load (const string& inname)
vector<unsigned char> awmk_stream; vector<unsigned char> awmk_stream;
Header header; Header header;
bool header_valid = false; bool header_valid = false;
Error err;
while (!feof (infile)) while (!feof (infile))
{ {
TSPacket p; TSPacket p;
Error err;
bool read_ok = p.read (infile, err); bool read_ok = p.read (infile, err);
if (!read_ok) if (!read_ok)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment