diff options
-rw-r--r-- | xbmc/filesystem/CacheCircular.cpp | 3 | ||||
-rw-r--r-- | xbmc/filesystem/CacheCircular.h | 2 | ||||
-rw-r--r-- | xbmc/filesystem/CacheMemBuffer.cpp | 3 | ||||
-rw-r--r-- | xbmc/filesystem/CacheMemBuffer.h | 2 | ||||
-rw-r--r-- | xbmc/filesystem/CacheStrategy.cpp | 4 | ||||
-rw-r--r-- | xbmc/filesystem/CacheStrategy.h | 4 |
6 files changed, 7 insertions, 11 deletions
diff --git a/xbmc/filesystem/CacheCircular.cpp b/xbmc/filesystem/CacheCircular.cpp index cdecd61679..8e58466107 100644 --- a/xbmc/filesystem/CacheCircular.cpp +++ b/xbmc/filesystem/CacheCircular.cpp @@ -64,7 +64,7 @@ int CCacheCircular::Open() return CACHE_RC_OK; } -int CCacheCircular::Close() +void CCacheCircular::Close() { #ifdef _WIN32 UnmapViewOfFile(m_buf); @@ -74,7 +74,6 @@ int CCacheCircular::Close() delete[] m_buf; #endif m_buf = NULL; - return CACHE_RC_OK; } /** diff --git a/xbmc/filesystem/CacheCircular.h b/xbmc/filesystem/CacheCircular.h index 9606a9e883..52981c6414 100644 --- a/xbmc/filesystem/CacheCircular.h +++ b/xbmc/filesystem/CacheCircular.h @@ -35,7 +35,7 @@ public: virtual ~CCacheCircular(); virtual int Open() ; - virtual int Close(); + virtual void Close(); virtual int WriteToCache(const char *buf, size_t len) ; virtual int ReadFromCache(char *buf, size_t len) ; diff --git a/xbmc/filesystem/CacheMemBuffer.cpp b/xbmc/filesystem/CacheMemBuffer.cpp index f7c8b94aa3..228f0aa139 100644 --- a/xbmc/filesystem/CacheMemBuffer.cpp +++ b/xbmc/filesystem/CacheMemBuffer.cpp @@ -60,12 +60,11 @@ int CacheMemBuffer::Open() return CACHE_RC_OK; } -int CacheMemBuffer::Close() +void CacheMemBuffer::Close() { m_buffer.Clear(); m_HistoryBuffer.Clear(); m_forwardBuffer.Clear(); - return CACHE_RC_OK; } int CacheMemBuffer::WriteToCache(const char *pBuffer, size_t iSize) diff --git a/xbmc/filesystem/CacheMemBuffer.h b/xbmc/filesystem/CacheMemBuffer.h index 6ae480154d..c2fc109fa3 100644 --- a/xbmc/filesystem/CacheMemBuffer.h +++ b/xbmc/filesystem/CacheMemBuffer.h @@ -39,7 +39,7 @@ public: virtual ~CacheMemBuffer(); virtual int Open() ; - virtual int Close(); + virtual void Close(); virtual int WriteToCache(const char *pBuffer, size_t iSize) ; virtual int ReadFromCache(char *pBuffer, size_t iMaxSize) ; diff --git a/xbmc/filesystem/CacheStrategy.cpp b/xbmc/filesystem/CacheStrategy.cpp index 5bea4f527f..55fbc3b1b7 100644 --- a/xbmc/filesystem/CacheStrategy.cpp +++ b/xbmc/filesystem/CacheStrategy.cpp @@ -115,7 +115,7 @@ int CSimpleFileCache::Open() return CACHE_RC_OK; } -int CSimpleFileCache::Close() +void CSimpleFileCache::Close() { if (m_hDataAvailEvent) CloseHandle(m_hDataAvailEvent); @@ -131,8 +131,6 @@ int CSimpleFileCache::Close() CloseHandle(m_hCacheFileRead); m_hCacheFileRead = NULL; - - return CACHE_RC_OK; } int CSimpleFileCache::WriteToCache(const char *pBuffer, size_t iSize) diff --git a/xbmc/filesystem/CacheStrategy.h b/xbmc/filesystem/CacheStrategy.h index 1958990fe9..0d8cef789c 100644 --- a/xbmc/filesystem/CacheStrategy.h +++ b/xbmc/filesystem/CacheStrategy.h @@ -56,7 +56,7 @@ public: virtual ~CCacheStrategy(); virtual int Open() = 0; - virtual int Close() = 0; + virtual void Close() = 0; virtual int WriteToCache(const char *pBuffer, size_t iSize) = 0; virtual int ReadFromCache(char *pBuffer, size_t iMaxSize) = 0; @@ -84,7 +84,7 @@ public: virtual ~CSimpleFileCache(); virtual int Open() ; - virtual int Close() ; + virtual void Close() ; virtual int WriteToCache(const char *pBuffer, size_t iSize) ; virtual int ReadFromCache(char *pBuffer, size_t iMaxSize) ; |