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

mkvreader.cpp

@@ -10,17 +10,11 @@
 
 #include <cassert>
 
-namespace mkvparser
+namespace mkvparser {
-{
 
-MkvReader::MkvReader() :
+MkvReader::MkvReader() : m_file(NULL), reader_owns_file_(true) {}
-    m_file(NULL),
-    reader_owns_file_(true) {
-}
 
-MkvReader::MkvReader(FILE* fp) :
+MkvReader::MkvReader(FILE* fp) : m_file(fp), reader_owns_file_(false) {
-    m_file(fp),
-    reader_owns_file_(false) {
   GetFileSize();
 }
 
@@ -30,8 +24,7 @@ MkvReader::~MkvReader() {
   m_file = NULL;
 }
 
-int MkvReader::Open(const char* fileName)
+int MkvReader::Open(const char* fileName) {
-{
   if (fileName == NULL)
     return -1;
 
@@ -42,7 +35,7 @@ int MkvReader::Open(const char* fileName)
   const errno_t e = fopen_s(&m_file, fileName, "rb");
 
   if (e)
-        return -1;  //error
+    return -1;  // error
 #else
   m_file = fopen(fileName, "rb");
 
@@ -59,7 +52,7 @@ bool MkvReader::GetFileSize() {
   int status = _fseeki64(m_file, 0L, SEEK_END);
 
   if (status)
-        return false;  //error
+    return false;  // error
 
   m_length = _ftelli64(m_file);
 #else
@@ -75,7 +68,7 @@ bool MkvReader::GetFileSize() {
   status = _fseeki64(m_file, 0L, SEEK_SET);
 
   if (status)
-        return false;  //error
+    return false;  // error
 #else
   fseek(m_file, 0L, SEEK_SET);
 #endif
@@ -83,17 +76,14 @@ bool MkvReader::GetFileSize() {
   return true;
 }
 
-void MkvReader::Close()
+void MkvReader::Close() {
-{
+  if (m_file != NULL) {
-    if (m_file != NULL)
-    {
     fclose(m_file);
     m_file = NULL;
   }
 }
 
-int MkvReader::Length(long long* total, long long* available)
+int MkvReader::Length(long long* total, long long* available) {
-{
   if (m_file == NULL)
     return -1;
 
@@ -106,8 +96,7 @@ int MkvReader::Length(long long* total, long long* available)
   return 0;
 }
 
-int MkvReader::Read(long long offset, long len, unsigned char* buffer)
+int MkvReader::Read(long long offset, long len, unsigned char* buffer) {
-{
   if (m_file == NULL)
     return -1;
 
@@ -127,7 +116,7 @@ int MkvReader::Read(long long offset, long len, unsigned char* buffer)
   const int status = _fseeki64(m_file, offset, SEEK_SET);
 
   if (status)
-        return -1;  //error
+    return -1;  // error
 #else
   fseek(m_file, offset, SEEK_SET);
 #endif
@@ -135,9 +124,9 @@ int MkvReader::Read(long long offset, long len, unsigned char* buffer)
   const size_t size = fread(buffer, 1, len, m_file);
 
   if (size < size_t(len))
-        return -1;  //error
+    return -1;  // error
 
-    return 0;  //success
+  return 0;  // success
 }
 
-}  //end namespace mkvparser
+}  // end namespace mkvparser

mkvreader.hpp

@@ -12,14 +12,10 @@
 #include "mkvparser.hpp"
 #include <cstdio>
 
-namespace mkvparser
+namespace mkvparser {
-{
 
-class MkvReader : public IMkvReader
+class MkvReader : public IMkvReader {
-{
+ public:
-    MkvReader(const MkvReader&);
-    MkvReader& operator=(const MkvReader&);
-public:
   MkvReader();
   MkvReader(FILE* fp);
   virtual ~MkvReader();
@@ -29,7 +25,10 @@ public:
 
   virtual int Read(long long position, long length, unsigned char* buffer);
   virtual int Length(long long* total, long long* available);
-private:
+
+ private:
+  MkvReader(const MkvReader&);
+  MkvReader& operator=(const MkvReader&);
 
   // 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
@@ -41,6 +40,6 @@ private:
   bool reader_owns_file_;
 };
 
-}  //end namespace mkvparser
+}  // end namespace mkvparser
 
-#endif //MKVREADER_HPP
+#endif  // MKVREADER_HPP