Аксессоры в MemBlock приведены к соглашению

kucheryavenkovn · Mar 28, 2018 · 9e1b089 · 9e1b089
1 parent 6a11e99
commit 9e1b089
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/src/tool1cd/Class_1CD.cpp b/src/tool1cd/Class_1CD.cpp
@@ -47,7 +47,7 @@ bool T_1CD::get_block(void* buf, uint32_t block_number, int32_t blocklen)
 			.add_detail("Всего блоков", to_hex_string(length));
 	}
 
-	memcpy(buf, memBlockManager.getblock(block_number), blocklen);
+	memcpy(buf, memBlockManager.get_block(block_number), blocklen);
 	return true;
 }
 
@@ -62,7 +62,7 @@ char*  T_1CD::get_block(uint32_t block_number) const
 			.add_detail("Всего блоков", to_hex_string(length));
 	}
 
-	return memBlockManager.getblock(block_number);
+	return memBlockManager.get_block(block_number);
 }
 
 //---------------------------------------------------------------------------
@@ -88,7 +88,7 @@ char*  T_1CD::get_block_for_write(uint32_t block_number, bool read)
 		bc->length = length;
 	}
 
-	return memBlockManager.getblock_for_write(block_number, read);
+	return memBlockManager.get_block_for_write(block_number, read);
 }
 
 //---------------------------------------------------------------------------

diff --git a/src/tool1cd/MemBlock.cpp b/src/tool1cd/MemBlock.cpp
@@ -74,17 +74,17 @@ void MemBlockManager::garbage(bool aggressive)
 }
 
 //---------------------------------------------------------------------------
-char* MemBlockManager::getblock(uint32_t _numblock)
+char* MemBlockManager::get_block(uint32_t _numblock)
 {
 	if(_numblock >= memblocks.size()) return nullptr;
 	if (!memblocks[_numblock]) {
 		memblocks[_numblock] = MemBlock::create(fs, pagesize, _numblock, false, true);
 	}
-	return memblocks[_numblock]->getblock(false);
+	return memblocks[_numblock]->get_block(false);
 }
 
 //---------------------------------------------------------------------------
-char* MemBlockManager::getblock_for_write(uint32_t _numblock, bool read)
+char* MemBlockManager::get_block_for_write(uint32_t _numblock, bool read)
 {
 	if (_numblock > memblocks.size()) {
 		return nullptr;
@@ -97,7 +97,7 @@ char* MemBlockManager::getblock_for_write(uint32_t _numblock, bool read)
 	if(!memblocks[_numblock]) {
 		memblocks[_numblock] = MemBlock::create(fs, pagesize, _numblock, true, read);
 	}
-	return memblocks[_numblock]->getblock(true);
+	return memblocks[_numblock]->get_block(true);
 }
 
 //---------------------------------------------------------------------------
@@ -170,7 +170,7 @@ MemBlockManager::MemBlockManager()
 
 }
 
-char *MemBlock::getblock(bool for_write)
+char *MemBlock::get_block(bool for_write)
 {
 	if (for_write) {
 		changed = true;
@@ -179,7 +179,7 @@ char *MemBlock::getblock(bool for_write)
 	return data.data();
 }
 
-const char *MemBlock::getblock() const
+const char *MemBlock::get_block() const
 {
 	last_data_get = GetTickCount();
 	return data.data();

diff --git a/src/tool1cd/MemBlock.h b/src/tool1cd/MemBlock.h
@@ -20,9 +20,9 @@ class MemBlock
 		data.resize(page_size);
 	}
 
-	char *getblock(bool for_write);
+	char *get_block(bool for_write);
 
-	const char *getblock() const;
+	const char *get_block() const;
 
 	void write(std::shared_ptr<TFileStream> &fs);
 
@@ -57,8 +57,8 @@ class MemBlockManager
 	uint32_t count; // текущее количество кешированных блоков
 
 	void garbage(bool aggressive);
-	char* getblock(uint32_t _numblock);
-	char* getblock_for_write(uint32_t _numblock, bool read);
+	char* get_block(uint32_t _numblock);
+	char* get_block_for_write(uint32_t _numblock, bool read);
 	void create_memblocks(uint64_t _numblocks);
 
 	void delete_memblocks();