summaryrefslogtreecommitdiff
path: root/src/fs/virtfs
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-07-14 01:31:22 +0300
committerAndrei Karas <akaras@inbox.ru>2017-07-14 01:31:22 +0300
commit311c175f3184103950c72bc5c775174597430b83 (patch)
treead022dc44a1c4177b3d53bf0d7eaa5a1736c8cf1 /src/fs/virtfs
parent16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 (diff)
downloadmv-311c175f3184103950c72bc5c775174597430b83.tar.gz
mv-311c175f3184103950c72bc5c775174597430b83.tar.bz2
mv-311c175f3184103950c72bc5c775174597430b83.tar.xz
mv-311c175f3184103950c72bc5c775174597430b83.zip
Replace std::vector into macro STD_VECTOR.
In most case it equal to std::vector except debug modes. Now it can be also mse::mstd::vector, but sadly this class not support all required features.
Diffstat (limited to 'src/fs/virtfs')
-rw-r--r--src/fs/virtfs/fs.cpp38
-rw-r--r--src/fs/virtfs/fs.h2
-rw-r--r--src/fs/virtfs/fszip.cpp42
-rw-r--r--src/fs/virtfs/zipentry.h4
-rw-r--r--src/fs/virtfs/zipreader.cpp4
5 files changed, 45 insertions, 45 deletions
diff --git a/src/fs/virtfs/fs.cpp b/src/fs/virtfs/fs.cpp
index 9fe755560..2ec75ac05 100644
--- a/src/fs/virtfs/fs.cpp
+++ b/src/fs/virtfs/fs.cpp
@@ -51,7 +51,7 @@ namespace VirtFs
{
namespace
{
- std::vector<FsEntry*> mEntries;
+ STD_VECTOR<FsEntry*> mEntries;
} // namespace
void init(const std::string &restrict name)
@@ -85,7 +85,7 @@ namespace VirtFs
return FsDir::getUserDir();
}
- std::vector<FsEntry*> &getEntries()
+ STD_VECTOR<FsEntry*> &getEntries()
{
return mEntries;
}
@@ -93,7 +93,7 @@ namespace VirtFs
FsEntry *searchByRootInternal(const std::string &restrict root,
const std::string &restrict subDir)
{
- FOR_EACH (std::vector<FsEntry*>::const_iterator, it, mEntries)
+ FOR_EACH (STD_VECTOR<FsEntry*>::const_iterator, it, mEntries)
{
const FsEntry *const entry = *it;
if (entry->root == root &&
@@ -108,7 +108,7 @@ namespace VirtFs
FsEntry *searchByTypeInternal(const std::string &restrict root,
const FsEntryTypeT type)
{
- FOR_EACH (std::vector<FsEntry*>::const_iterator, it, mEntries)
+ FOR_EACH (STD_VECTOR<FsEntry*>::const_iterator, it, mEntries)
{
const FsEntry *const entry = *it;
if (entry->root == root &&
@@ -134,7 +134,7 @@ namespace VirtFs
if (findLast(rootDir, std::string(dirSeparator)) == false)
rootDir += dirSeparator;
- FOR_EACH (std::vector<FsEntry*>::const_iterator, it, mEntries)
+ FOR_EACH (STD_VECTOR<FsEntry*>::const_iterator, it, mEntries)
{
FsEntry *const entry = *it;
if (entry->funcs->exists(entry, name, rootDir) == true)
@@ -159,7 +159,7 @@ namespace VirtFs
rootDir += dirSeparator;
StringVect &names = list->names;
- FOR_EACH (std::vector<FsEntry*>::const_iterator, it, mEntries)
+ FOR_EACH (STD_VECTOR<FsEntry*>::const_iterator, it, mEntries)
{
FsEntry *const entry = *it;
entry->funcs->enumerate(entry, rootDir, names);
@@ -183,7 +183,7 @@ namespace VirtFs
if (findLast(rootDir, std::string(dirSeparator)) == false)
rootDir += dirSeparator;
- FOR_EACH (std::vector<FsEntry*>::const_iterator, it, mEntries)
+ FOR_EACH (STD_VECTOR<FsEntry*>::const_iterator, it, mEntries)
{
FsEntry *const entry = *it;
entry->funcs->getFiles(entry, rootDir, list);
@@ -205,7 +205,7 @@ namespace VirtFs
if (findLast(rootDir, std::string(dirSeparator)) == false)
rootDir += dirSeparator;
- FOR_EACH (std::vector<FsEntry*>::const_iterator, it, mEntries)
+ FOR_EACH (STD_VECTOR<FsEntry*>::const_iterator, it, mEntries)
{
FsEntry *const entry = *it;
entry->funcs->getFilesWithDir(entry, rootDir, list);
@@ -228,7 +228,7 @@ namespace VirtFs
if (findLast(rootDir, std::string(dirSeparator)) == false)
rootDir += dirSeparator;
- FOR_EACH (std::vector<FsEntry*>::const_iterator, it, mEntries)
+ FOR_EACH (STD_VECTOR<FsEntry*>::const_iterator, it, mEntries)
{
FsEntry *const entry = *it;
entry->funcs->getDirs(entry, rootDir, list);
@@ -248,7 +248,7 @@ namespace VirtFs
if (findLast(dirName, std::string(dirSeparator)) == false)
dirName += dirSeparator;
- FOR_EACH (std::vector<FsEntry*>::const_iterator, it, mEntries)
+ FOR_EACH (STD_VECTOR<FsEntry*>::const_iterator, it, mEntries)
{
FsEntry *const entry = *it;
bool isDirFlag(false);
@@ -279,7 +279,7 @@ namespace VirtFs
filename.c_str());
return nullptr;
}
- FOR_EACH (std::vector<FsEntry*>::const_iterator, it, mEntries)
+ FOR_EACH (STD_VECTOR<FsEntry*>::const_iterator, it, mEntries)
{
FsEntry *const entry = *it;
File *const file = entry->funcs->openRead(entry, filename);
@@ -298,7 +298,7 @@ namespace VirtFs
filename.c_str());
return nullptr;
}
- FOR_EACH (std::vector<FsEntry*>::const_iterator, it, mEntries)
+ FOR_EACH (STD_VECTOR<FsEntry*>::const_iterator, it, mEntries)
{
FsEntry *const entry = *it;
File *const file = entry->funcs->openWrite(entry, filename);
@@ -317,7 +317,7 @@ namespace VirtFs
filename.c_str());
return nullptr;
}
- FOR_EACH (std::vector<FsEntry*>::const_iterator, it, mEntries)
+ FOR_EACH (STD_VECTOR<FsEntry*>::const_iterator, it, mEntries)
{
FsEntry *const entry = *it;
File *const file = entry->funcs->openAppend(entry, filename);
@@ -487,7 +487,7 @@ namespace VirtFs
{
subDir += dirSeparator;
}
- FOR_EACH (std::vector<FsEntry*>::iterator, it, mEntries)
+ FOR_EACH (STD_VECTOR<FsEntry*>::iterator, it, mEntries)
{
FsEntry *const entry = *it;
if (entry->root == oldDir &&
@@ -679,7 +679,7 @@ namespace VirtFs
reportAlways("Called unmount without zip archive");
return false;
}
- FOR_EACH (std::vector<FsEntry*>::iterator, it, mEntries)
+ FOR_EACH (STD_VECTOR<FsEntry*>::iterator, it, mEntries)
{
FsEntry *const entry = *it;
if (entry->root == oldDir &&
@@ -719,7 +719,7 @@ namespace VirtFs
{
subDir += dirSeparator;
}
- FOR_EACH (std::vector<FsEntry*>::iterator, it, mEntries)
+ FOR_EACH (STD_VECTOR<FsEntry*>::iterator, it, mEntries)
{
FsEntry *const entry = *it;
if (entry->root == oldDir &&
@@ -756,7 +756,7 @@ namespace VirtFs
if (findLast(rootDir, std::string(dirSeparator)) == false)
rootDir += dirSeparator;
- FOR_EACH (std::vector<FsEntry*>::const_iterator, it, mEntries)
+ FOR_EACH (STD_VECTOR<FsEntry*>::const_iterator, it, mEntries)
{
FsEntry *const entry = *it;
std::string realDir;
@@ -785,7 +785,7 @@ namespace VirtFs
{
FsDir::deinit();
FsZip::deinit();
- FOR_EACH (std::vector<FsEntry*>::iterator, it, mEntries)
+ FOR_EACH (STD_VECTOR<FsEntry*>::iterator, it, mEntries)
{
FsEntry *const entry = *it;
if (entry->type == FsEntryType::Dir)
@@ -865,7 +865,7 @@ namespace VirtFs
filename.c_str());
return nullptr;
}
- FOR_EACH (std::vector<FsEntry*>::const_iterator, it, mEntries)
+ FOR_EACH (STD_VECTOR<FsEntry*>::const_iterator, it, mEntries)
{
FsEntry *const entry = *it;
const char *const buf = entry->funcs->loadFile(entry,
diff --git a/src/fs/virtfs/fs.h b/src/fs/virtfs/fs.h
index ca67117ea..326a88d90 100644
--- a/src/fs/virtfs/fs.h
+++ b/src/fs/virtfs/fs.h
@@ -98,7 +98,7 @@ namespace VirtFs
const Append append);
bool unmountDirInternal(std::string oldDir,
std::string subDir);
- std::vector<FsEntry*> &getEntries();
+ STD_VECTOR<FsEntry*> &getEntries();
FsEntry *searchByRootInternal(const std::string &restrict root,
const std::string &restrict subDir);
FsEntry *searchByTypeInternal(const std::string &restrict root,
diff --git a/src/fs/virtfs/fszip.cpp b/src/fs/virtfs/fszip.cpp
index 830909778..148df66fc 100644
--- a/src/fs/virtfs/fszip.cpp
+++ b/src/fs/virtfs/fszip.cpp
@@ -102,7 +102,7 @@ namespace FsZip
filename = pathJoin(subDir, filename);
dirName = pathJoin(subDir, dirName);
}
- FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
+ FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator,
it2,
zipEntry->mHeaders)
{
@@ -112,7 +112,7 @@ namespace FsZip
return true;
}
}
- FOR_EACH (std::vector<std::string>::const_iterator,
+ FOR_EACH (STD_VECTOR<std::string>::const_iterator,
it2,
zipEntry->mDirs)
{
@@ -136,14 +136,14 @@ namespace FsZip
filename = pathJoin(subDir, filename);
dirName = pathJoin(subDir, dirName);
}
- FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
+ FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator,
it2,
zipEntry->mHeaders)
{
if ((*it2)->fileName == filename)
return true;
}
- FOR_EACH (std::vector<std::string>::const_iterator,
+ FOR_EACH (STD_VECTOR<std::string>::const_iterator,
it2,
zipEntry->mDirs)
{
@@ -163,7 +163,7 @@ namespace FsZip
dirName = pathJoin(subDir, dirName);
if (dirName == dirSeparator)
{
- FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
+ FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator,
it2,
zipEntry->mHeaders)
{
@@ -188,7 +188,7 @@ namespace FsZip
}
else
{
- FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
+ FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator,
it2,
zipEntry->mHeaders)
{
@@ -226,7 +226,7 @@ namespace FsZip
dirName = pathJoin(subDir, dirName);
if (dirName == dirSeparator)
{
- FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
+ FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator,
it2,
zipEntry->mHeaders)
{
@@ -250,7 +250,7 @@ namespace FsZip
std::string dirName2 = pathJoin(dirName, fileName);
if (findLast(dirName2, std::string(dirSeparator)) == false)
dirName2 += dirSeparator;
- FOR_EACH (std::vector<std::string>::const_iterator,
+ FOR_EACH (STD_VECTOR<std::string>::const_iterator,
it,
zipEntry->mDirs)
{
@@ -267,7 +267,7 @@ namespace FsZip
}
else
{
- FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
+ FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator,
it2,
zipEntry->mHeaders)
{
@@ -296,7 +296,7 @@ namespace FsZip
{
dirName2 += dirSeparator;
}
- FOR_EACH (std::vector<std::string>::const_iterator,
+ FOR_EACH (STD_VECTOR<std::string>::const_iterator,
it,
zipEntry->mDirs)
{
@@ -327,7 +327,7 @@ namespace FsZip
dirNameFull = dirName;
if (dirNameFull == dirSeparator)
{
- FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
+ FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator,
it2,
zipEntry->mHeaders)
{
@@ -351,7 +351,7 @@ namespace FsZip
std::string dirName2 = pathJoin(dirNameFull, fileName);
if (findLast(dirName2, std::string(dirSeparator)) == false)
dirName2 += dirSeparator;
- FOR_EACH (std::vector<std::string>::const_iterator,
+ FOR_EACH (STD_VECTOR<std::string>::const_iterator,
it,
zipEntry->mDirs)
{
@@ -368,7 +368,7 @@ namespace FsZip
}
else
{
- FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
+ FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator,
it2,
zipEntry->mHeaders)
{
@@ -397,7 +397,7 @@ namespace FsZip
{
dirName2 += dirSeparator;
}
- FOR_EACH (std::vector<std::string>::const_iterator,
+ FOR_EACH (STD_VECTOR<std::string>::const_iterator,
it,
zipEntry->mDirs)
{
@@ -425,7 +425,7 @@ namespace FsZip
dirName = pathJoin(subDir, dirName);
if (dirName == dirSeparator)
{
- FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
+ FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator,
it2,
zipEntry->mHeaders)
{
@@ -449,7 +449,7 @@ namespace FsZip
std::string dirName2 = pathJoin(dirName, fileName);
if (findLast(dirName2, std::string(dirSeparator)) == false)
dirName2 += dirSeparator;
- FOR_EACH (std::vector<std::string>::const_iterator,
+ FOR_EACH (STD_VECTOR<std::string>::const_iterator,
it,
zipEntry->mDirs)
{
@@ -466,7 +466,7 @@ namespace FsZip
}
else
{
- FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
+ FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator,
it2,
zipEntry->mHeaders)
{
@@ -495,7 +495,7 @@ namespace FsZip
{
dirName2 += dirSeparator;
}
- FOR_EACH (std::vector<std::string>::const_iterator,
+ FOR_EACH (STD_VECTOR<std::string>::const_iterator,
it,
zipEntry->mDirs)
{
@@ -521,7 +521,7 @@ namespace FsZip
std::string subDir = zipEntry->subDir;
if (!subDir.empty())
dirName = pathJoin(subDir, dirName);
- FOR_EACH (std::vector<std::string>::const_iterator,
+ FOR_EACH (STD_VECTOR<std::string>::const_iterator,
it2,
zipEntry->mDirs)
{
@@ -546,7 +546,7 @@ namespace FsZip
std::string subDir = zipEntry->subDir;
if (!subDir.empty())
filename = pathJoin(subDir, filename);
- FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
+ FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator,
it2,
zipEntry->mHeaders)
{
@@ -679,7 +679,7 @@ namespace FsZip
const std::string subDir = zipEntry->subDir;
if (!subDir.empty())
filename = pathJoin(subDir, filename);
- FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
+ FOR_EACH (STD_VECTOR<ZipLocalHeader*>::const_iterator,
it2,
zipEntry->mHeaders)
{
diff --git a/src/fs/virtfs/zipentry.h b/src/fs/virtfs/zipentry.h
index ddb742b4f..3d8a21ced 100644
--- a/src/fs/virtfs/zipentry.h
+++ b/src/fs/virtfs/zipentry.h
@@ -42,8 +42,8 @@ struct ZipEntry final : public FsEntry
~ZipEntry();
- std::vector<ZipLocalHeader*> mHeaders;
- std::vector<std::string> mDirs;
+ STD_VECTOR<ZipLocalHeader*> mHeaders;
+ STD_VECTOR<std::string> mDirs;
};
} // namespace VirtFs
diff --git a/src/fs/virtfs/zipreader.cpp b/src/fs/virtfs/zipreader.cpp
index 3302fd7c0..017686e6b 100644
--- a/src/fs/virtfs/zipreader.cpp
+++ b/src/fs/virtfs/zipreader.cpp
@@ -82,8 +82,8 @@ namespace ZipReader
return false;
}
const std::string archiveName = entry->root;
- std::vector<ZipLocalHeader*> &restrict headers = entry->mHeaders;
- std::vector<std::string> &restrict dirs = entry->mDirs;
+ STD_VECTOR<ZipLocalHeader*> &restrict headers = entry->mHeaders;
+ STD_VECTOR<std::string> &restrict dirs = entry->mDirs;
FILE *restrict const arcFile = fopen(archiveName.c_str(),
"rb");
if (arcFile == nullptr)