Merge "clang-format on mkvreader.[ch]pp"

This commit is contained in:
Vignesh Venkatasubramanian 2014-04-25 22:09:02 -07:00 committed by Gerrit Code Review
commit 0cf7b1b7d3
2 changed files with 91 additions and 103 deletions

View File

@ -10,17 +10,11 @@
#include <cassert>
namespace mkvparser
{
namespace mkvparser {
MkvReader::MkvReader() :
m_file(NULL),
reader_owns_file_(true) {
}
MkvReader::MkvReader() : m_file(NULL), reader_owns_file_(true) {}
MkvReader::MkvReader(FILE* fp) :
m_file(fp),
reader_owns_file_(false) {
MkvReader::MkvReader(FILE* fp) : m_file(fp), reader_owns_file_(false) {
GetFileSize();
}
@ -30,114 +24,109 @@ MkvReader::~MkvReader() {
m_file = NULL;
}
int MkvReader::Open(const char* fileName)
{
if (fileName == NULL)
return -1;
int MkvReader::Open(const char* fileName) {
if (fileName == NULL)
return -1;
if (m_file)
return -1;
if (m_file)
return -1;
#ifdef _MSC_VER
const errno_t e = fopen_s(&m_file, fileName, "rb");
const errno_t e = fopen_s(&m_file, fileName, "rb");
if (e)
return -1; //error
if (e)
return -1; // error
#else
m_file = fopen(fileName, "rb");
m_file = fopen(fileName, "rb");
if (m_file == NULL)
return -1;
if (m_file == NULL)
return -1;
#endif
return !GetFileSize();
return !GetFileSize();
}
bool MkvReader::GetFileSize() {
if (m_file == NULL)
return false;
if (m_file == NULL)
return false;
#ifdef _MSC_VER
int status = _fseeki64(m_file, 0L, SEEK_END);
int status = _fseeki64(m_file, 0L, SEEK_END);
if (status)
return false; //error
if (status)
return false; // error
m_length = _ftelli64(m_file);
m_length = _ftelli64(m_file);
#else
fseek(m_file, 0L, SEEK_END);
m_length = ftell(m_file);
fseek(m_file, 0L, SEEK_END);
m_length = ftell(m_file);
#endif
assert(m_length >= 0);
assert(m_length >= 0);
if (m_length < 0)
return false;
if (m_length < 0)
return false;
#ifdef _MSC_VER
status = _fseeki64(m_file, 0L, SEEK_SET);
status = _fseeki64(m_file, 0L, SEEK_SET);
if (status)
return false; //error
if (status)
return false; // error
#else
fseek(m_file, 0L, SEEK_SET);
fseek(m_file, 0L, SEEK_SET);
#endif
return true;
return true;
}
void MkvReader::Close()
{
if (m_file != NULL)
{
fclose(m_file);
m_file = NULL;
}
void MkvReader::Close() {
if (m_file != NULL) {
fclose(m_file);
m_file = NULL;
}
}
int MkvReader::Length(long long* total, long long* available)
{
if (m_file == NULL)
return -1;
int MkvReader::Length(long long* total, long long* available) {
if (m_file == NULL)
return -1;
if (total)
*total = m_length;
if (total)
*total = m_length;
if (available)
*available = m_length;
if (available)
*available = m_length;
return 0;
}
int MkvReader::Read(long long offset, long len, unsigned char* buffer) {
if (m_file == NULL)
return -1;
if (offset < 0)
return -1;
if (len < 0)
return -1;
if (len == 0)
return 0;
}
int MkvReader::Read(long long offset, long len, unsigned char* buffer)
{
if (m_file == NULL)
return -1;
if (offset < 0)
return -1;
if (len < 0)
return -1;
if (len == 0)
return 0;
if (offset >= m_length)
return -1;
if (offset >= m_length)
return -1;
#ifdef _MSC_VER
const int status = _fseeki64(m_file, offset, SEEK_SET);
const int status = _fseeki64(m_file, offset, SEEK_SET);
if (status)
return -1; //error
if (status)
return -1; // error
#else
fseek(m_file, offset, SEEK_SET);
fseek(m_file, offset, SEEK_SET);
#endif
const size_t size = fread(buffer, 1, len, m_file);
const size_t size = fread(buffer, 1, len, m_file);
if (size < size_t(len))
return -1; //error
if (size < size_t(len))
return -1; // error
return 0; //success
return 0; // success
}
} //end namespace mkvparser
} // end namespace mkvparser

View File

@ -12,35 +12,34 @@
#include "mkvparser.hpp"
#include <cstdio>
namespace mkvparser
{
namespace mkvparser {
class MkvReader : public IMkvReader
{
MkvReader(const MkvReader&);
MkvReader& operator=(const MkvReader&);
public:
MkvReader();
MkvReader(FILE* fp);
virtual ~MkvReader();
class MkvReader : public IMkvReader {
public:
MkvReader();
MkvReader(FILE* fp);
virtual ~MkvReader();
int Open(const char*);
void Close();
int Open(const char*);
void Close();
virtual int Read(long long position, long length, unsigned char* buffer);
virtual int Length(long long* total, long long* available);
private:
virtual int Read(long long position, long length, unsigned char* buffer);
virtual int Length(long long* total, long long* available);
// Determines the size of the file. This is called either by the constructor
// or by the Open function depending on file ownership. Returns true on
// success.
bool GetFileSize();
private:
MkvReader(const MkvReader&);
MkvReader& operator=(const MkvReader&);
long long m_length;
FILE* m_file;
bool reader_owns_file_;
// Determines the size of the file. This is called either by the constructor
// or by the Open function depending on file ownership. Returns true on
// success.
bool GetFileSize();
long long m_length;
FILE* m_file;
bool reader_owns_file_;
};
} //end namespace mkvparser
} // end namespace mkvparser
#endif //MKVREADER_HPP
#endif // MKVREADER_HPP