diff options
| author | Narayan Kamath <narayan@google.com> | 2015-02-23 15:43:35 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-02-23 15:49:43 +0000 |
| commit | 6832a7a4e04c84192f0bafc6ac990fc79cd13882 (patch) | |
| tree | e8c0940ae4a25e96db0ad84985991731f2b1b8f4 /libutils | |
| parent | f1ac6917da172dd3e6829bac41fcbf23e96da079 (diff) | |
| download | system_core-6832a7a4e04c84192f0bafc6ac990fc79cd13882.zip system_core-6832a7a4e04c84192f0bafc6ac990fc79cd13882.tar.gz system_core-6832a7a4e04c84192f0bafc6ac990fc79cd13882.tar.bz2 | |
Remove useless refCounting from FileMap.
Nobody ever called acquire() so release() was always
equivalent to delete. Just use delete instead so that
people can use unique_ptr directly (or shared_ptr if
they really want refcounts).
Change-Id: I9e3ad5e0f6a4fcc4e02e5a2ff7ef9514fe234415
Diffstat (limited to 'libutils')
| -rw-r--r-- | libutils/FileMap.cpp | 8 | ||||
| -rw-r--r-- | libutils/Tokenizer.cpp | 6 |
2 files changed, 3 insertions, 11 deletions
diff --git a/libutils/FileMap.cpp b/libutils/FileMap.cpp index 0af066f..91e45d8 100644 --- a/libutils/FileMap.cpp +++ b/libutils/FileMap.cpp @@ -48,7 +48,7 @@ using namespace android; // Constructor. Create an empty object. FileMap::FileMap(void) - : mRefCount(1), mFileName(NULL), mBasePtr(NULL), mBaseLength(0), + : mFileName(NULL), mBasePtr(NULL), mBaseLength(0), mDataPtr(NULL), mDataLength(0) { } @@ -56,11 +56,6 @@ FileMap::FileMap(void) // Destructor. FileMap::~FileMap(void) { - assert(mRefCount == 0); - - //printf("+++ removing FileMap %p %zu\n", mDataPtr, mDataLength); - - mRefCount = -100; // help catch double-free if (mFileName != NULL) { free(mFileName); } @@ -134,7 +129,6 @@ bool FileMap::create(const char* origFileName, int fd, off64_t offset, size_t le void* ptr; - assert(mRefCount == 1); assert(fd >= 0); assert(offset >= 0); assert(length > 0); diff --git a/libutils/Tokenizer.cpp b/libutils/Tokenizer.cpp index 7067533..610002f 100644 --- a/libutils/Tokenizer.cpp +++ b/libutils/Tokenizer.cpp @@ -43,9 +43,7 @@ Tokenizer::Tokenizer(const String8& filename, FileMap* fileMap, char* buffer, } Tokenizer::~Tokenizer() { - if (mFileMap) { - mFileMap->release(); - } + delete mFileMap; if (mOwnBuffer) { delete[] mBuffer; } @@ -74,7 +72,7 @@ status_t Tokenizer::open(const String8& filename, Tokenizer** outTokenizer) { fileMap->advise(FileMap::SEQUENTIAL); buffer = static_cast<char*>(fileMap->getDataPtr()); } else { - fileMap->release(); + delete fileMap; fileMap = NULL; // Fall back to reading into a buffer since we can't mmap files in sysfs. |