aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Chou <petechou@gmail.com>2014-09-25 16:47:48 +0800
committerPete Chou <petechou@gmail.com>2014-09-25 19:25:11 +0800
commitdc7f4fe7d434b5a545fbd37063e14661bdf47c16 (patch)
tree62170cba93d6e5ba1b87c6e6890395bbe6a0f9cc
parent8dccb02db8b7455985c26a36b8c00677835bf2d8 (diff)
downloadmclinker-dc7f4fe7d434b5a545fbd37063e14661bdf47c16.tar.gz
lint: Fix some [runtime/explicit] [5] errors.
-rw-r--r--include/mcld/ADT/BinTree.h4
-rw-r--r--include/mcld/ADT/Flags.h4
-rw-r--r--include/mcld/ADT/TreeBase.h4
-rw-r--r--include/mcld/MC/FileAction.h4
-rw-r--r--include/mcld/MC/InputBuilder.h2
-rw-r--r--include/mcld/Support/FileHandle.h6
-rw-r--r--lib/Core/IRBuilder.cpp11
-rw-r--r--lib/Core/Linker.cpp13
-rw-r--r--lib/LD/Archive.cpp4
-rw-r--r--lib/MC/FileAction.cpp4
-rw-r--r--lib/Script/GroupCmd.cpp4
-rw-r--r--lib/Script/InputCmd.cpp4
-rw-r--r--lib/Support/FileHandle.cpp8
-rw-r--r--unittests/FileHandleTest.cpp6
-rw-r--r--unittests/FragmentRefTest.cpp6
-rw-r--r--unittests/UniqueGCFactoryBaseTest.cpp12
16 files changed, 55 insertions, 41 deletions
diff --git a/include/mcld/ADT/BinTree.h b/include/mcld/ADT/BinTree.h
index c89b3996..6c9a0393 100644
--- a/include/mcld/ADT/BinTree.h
+++ b/include/mcld/ADT/BinTree.h
@@ -28,7 +28,7 @@ class DFSIterator : public TreeIteratorBase {
public:
DFSIterator() : TreeIteratorBase() {}
- DFSIterator(NodeBase* X) : TreeIteratorBase(X) {
+ explicit DFSIterator(NodeBase* X) : TreeIteratorBase(X) {
if (hasRightChild())
m_Stack.push(m_pNode->right);
if (hasLeftChild())
@@ -58,7 +58,7 @@ class BFSIterator : public TreeIteratorBase {
public:
BFSIterator() : TreeIteratorBase() {}
- BFSIterator(NodeBase* X) : TreeIteratorBase(X) {
+ explicit BFSIterator(NodeBase* X) : TreeIteratorBase(X) {
if (hasRightChild())
m_Queue.push(m_pNode->right);
if (hasLeftChild())
diff --git a/include/mcld/ADT/Flags.h b/include/mcld/ADT/Flags.h
index 18e28fa1..e53ee093 100644
--- a/include/mcld/ADT/Flags.h
+++ b/include/mcld/ADT/Flags.h
@@ -19,9 +19,9 @@ class Flags {
public:
Flags(const Flags& pOther) : m_Data(pOther.m_Data) {}
- Flags(Enum pFlag) : m_Data(pFlag) {}
+ explicit Flags(Enum pFlag) : m_Data(pFlag) {}
- Flags(unsigned int pFlag = 0x0) : m_Data(pFlag) {}
+ explicit Flags(unsigned int pFlag = 0x0) : m_Data(pFlag) {}
operator unsigned int() const { return m_Data; }
diff --git a/include/mcld/ADT/TreeBase.h b/include/mcld/ADT/TreeBase.h
index 40b07a5f..1e40b38e 100644
--- a/include/mcld/ADT/TreeBase.h
+++ b/include/mcld/ADT/TreeBase.h
@@ -40,7 +40,7 @@ class TreeIteratorBase {
public:
TreeIteratorBase() : m_pNode(NULL) {}
- TreeIteratorBase(NodeBase* X) : m_pNode(X) {}
+ explicit TreeIteratorBase(NodeBase* X) : m_pNode(X) {}
virtual ~TreeIteratorBase(){};
@@ -106,7 +106,7 @@ class Node : public NodeBase {
public:
Node() : NodeBase(), data(NULL) {}
- Node(const value_type& pValue) : NodeBase(), data(&pValue) {}
+ explicit Node(const value_type& pValue) : NodeBase(), data(&pValue) {}
};
} // namespace mcld
diff --git a/include/mcld/MC/FileAction.h b/include/mcld/MC/FileAction.h
index fa77cb31..f07cbf86 100644
--- a/include/mcld/MC/FileAction.h
+++ b/include/mcld/MC/FileAction.h
@@ -31,8 +31,8 @@ class ContextAction : public InputAction {
class MemoryAreaAction : public InputAction {
public:
MemoryAreaAction(unsigned int pPosition,
- FileHandle::OpenMode pMode,
- FileHandle::Permission pPerm = FileHandle::System);
+ FileHandle::OpenModeEnum pMode,
+ FileHandle::PermissionEnum pPerm = FileHandle::System);
bool activate(InputBuilder& pBuilder) const;
diff --git a/include/mcld/MC/InputBuilder.h b/include/mcld/MC/InputBuilder.h
index 18b273b6..4f15dd57 100644
--- a/include/mcld/MC/InputBuilder.h
+++ b/include/mcld/MC/InputBuilder.h
@@ -66,7 +66,7 @@ class InputBuilder {
bool setMemory(Input& pInput,
FileHandle::OpenMode pMode,
- FileHandle::Permission pPerm = FileHandle::System);
+ FileHandle::Permission pPerm);
bool setMemory(Input& pInput, void* pMemBuffer, size_t pSize);
diff --git a/include/mcld/Support/FileHandle.h b/include/mcld/Support/FileHandle.h
index 4188d6f7..d1e299f0 100644
--- a/include/mcld/Support/FileHandle.h
+++ b/include/mcld/Support/FileHandle.h
@@ -69,11 +69,9 @@ class FileHandle {
/// open - open the file.
/// @return if we meet any trouble during opening the file, return false.
/// use rdstate() to see what happens.
- bool open(const sys::fs::Path& pPath,
- OpenMode pMode,
- Permission pPerm = System);
+ bool open(const sys::fs::Path& pPath, OpenMode pMode, Permission pPerm);
- bool delegate(int pFD, OpenMode pMode = Unknown);
+ bool delegate(int pFD, OpenModeEnum pMode = Unknown);
bool close();
diff --git a/lib/Core/IRBuilder.cpp b/lib/Core/IRBuilder.cpp
index a39b72b4..19899851 100644
--- a/lib/Core/IRBuilder.cpp
+++ b/lib/Core/IRBuilder.cpp
@@ -142,7 +142,8 @@ Input* IRBuilder::ReadInput(const std::string& pName,
m_InputBuilder.setContext(*input);
if (!input->hasMemArea())
- m_InputBuilder.setMemory(*input, FileHandle::ReadOnly, FileHandle::System);
+ m_InputBuilder.setMemory(*input, FileHandle::OpenMode(FileHandle::ReadOnly),
+ FileHandle::Permission(FileHandle::System));
return input;
}
@@ -180,7 +181,8 @@ Input* IRBuilder::ReadInput(const std::string& pNameSpec) {
m_InputBuilder.setContext(*input);
if (!input->hasMemArea())
- m_InputBuilder.setMemory(*input, FileHandle::ReadOnly, FileHandle::System);
+ m_InputBuilder.setMemory(*input, FileHandle::OpenMode(FileHandle::ReadOnly),
+ FileHandle::Permission(FileHandle::System));
return input;
}
@@ -193,12 +195,11 @@ Input* IRBuilder::ReadInput(FileHandle& pFileHandle) {
Input* input = *m_InputBuilder.getCurrentNode();
if (pFileHandle.path().empty()) {
m_InputBuilder.setContext(*input, false);
- m_InputBuilder.setMemory(
- *input, pFileHandle.handler(), FileHandle::ReadOnly);
} else {
m_InputBuilder.setContext(*input, true);
- m_InputBuilder.setMemory(*input, FileHandle::ReadOnly, FileHandle::System);
}
+ m_InputBuilder.setMemory(*input, FileHandle::OpenMode(FileHandle::ReadOnly),
+ FileHandle::Permission(FileHandle::System));
return input;
}
diff --git a/lib/Core/Linker.cpp b/lib/Core/Linker.cpp
index 999a7df8..83027cdc 100644
--- a/lib/Core/Linker.cpp
+++ b/lib/Core/Linker.cpp
@@ -254,25 +254,24 @@ bool Linker::emit(FileOutputBuffer& pOutput) {
bool Linker::emit(const Module& pModule, const std::string& pPath) {
FileHandle file;
- FileHandle::Permission perm;
+ FileHandle::OpenMode open_mode(
+ FileHandle::ReadWrite | FileHandle::Truncate | FileHandle::Create);
+ FileHandle::Permission permission;
switch (m_pConfig->codeGenType()) {
case mcld::LinkerConfig::Unknown:
case mcld::LinkerConfig::Object:
- perm = mcld::FileHandle::Permission(0x644);
+ permission = FileHandle::Permission(0x644);
break;
case mcld::LinkerConfig::DynObj:
case mcld::LinkerConfig::Exec:
case mcld::LinkerConfig::Binary:
- perm = mcld::FileHandle::Permission(0x755);
+ permission = FileHandle::Permission(0x755);
break;
default:
assert(0 && "Unknown file type");
}
- bool result = file.open(
- sys::fs::Path(pPath),
- FileHandle::ReadWrite | FileHandle::Truncate | FileHandle::Create,
- perm);
+ bool result = file.open(sys::fs::Path(pPath), open_mode, permission);
if (!result) {
error(diag::err_cannot_open_output_file) << "Linker::emit()" << pPath;
return false;
diff --git a/lib/LD/Archive.cpp b/lib/LD/Archive.cpp
index fcbdbdae..cf543dd5 100644
--- a/lib/LD/Archive.cpp
+++ b/lib/LD/Archive.cpp
@@ -235,7 +235,9 @@ Input* Archive::getMemberFile(Input& pArchiveFile,
} else {
member = m_Builder.createInput(pName, pPath, Input::Unknown);
assert(member != NULL);
- if (!m_Builder.setMemory(*member, FileHandle::ReadOnly)) {
+ if (!m_Builder.setMemory(*member,
+ FileHandle::OpenMode(FileHandle::ReadOnly),
+ FileHandle::Permission(FileHandle::System))) {
error(diag::err_cannot_open_input) << member->name() << member->path();
return NULL;
}
diff --git a/lib/MC/FileAction.cpp b/lib/MC/FileAction.cpp
index 1450f90d..6e6199d9 100644
--- a/lib/MC/FileAction.cpp
+++ b/lib/MC/FileAction.cpp
@@ -37,8 +37,8 @@ bool ContextAction::activate(InputBuilder& pBuilder) const {
// MemoryAreaAction
//===----------------------------------------------------------------------===//
MemoryAreaAction::MemoryAreaAction(unsigned int pPosition,
- FileHandle::OpenMode pMode,
- FileHandle::Permission pPerm)
+ FileHandle::OpenModeEnum pMode,
+ FileHandle::PermissionEnum pPerm)
: InputAction(pPosition), m_Mode(pMode), m_Permission(pPerm) {
}
diff --git a/lib/Script/GroupCmd.cpp b/lib/Script/GroupCmd.cpp
index b54f4765..6ead8d1b 100644
--- a/lib/Script/GroupCmd.cpp
+++ b/lib/Script/GroupCmd.cpp
@@ -153,8 +153,10 @@ void GroupCmd::activate(Module& pModule) {
Input* input = *m_Builder.getCurrentNode();
assert(input != NULL);
- if (!m_Builder.setMemory(*input, FileHandle::ReadOnly))
+ if (!m_Builder.setMemory(*input, FileHandle::OpenMode(FileHandle::ReadOnly),
+ FileHandle::Permission(FileHandle::System))) {
error(diag::err_cannot_open_input) << input->name() << input->path();
+ }
m_Builder.setContext(*input);
}
diff --git a/lib/Script/InputCmd.cpp b/lib/Script/InputCmd.cpp
index 45f06567..c83535f6 100644
--- a/lib/Script/InputCmd.cpp
+++ b/lib/Script/InputCmd.cpp
@@ -168,7 +168,9 @@ void InputCmd::activate(Module& pModule) {
is_begin_marked = true;
}
assert(*input != NULL);
- if (!m_Builder.setMemory(**input, FileHandle::ReadOnly)) {
+ if (!m_Builder.setMemory(**input,
+ FileHandle::OpenMode(FileHandle::ReadOnly),
+ FileHandle::Permission(FileHandle::System))) {
error(diag::err_cannot_open_input) << (*input)->name()
<< (*input)->path();
}
diff --git a/lib/Support/FileHandle.cpp b/lib/Support/FileHandle.cpp
index 6f2e4f4d..3aefe666 100644
--- a/lib/Support/FileHandle.cpp
+++ b/lib/Support/FileHandle.cpp
@@ -89,7 +89,7 @@ bool FileHandle::open(const sys::fs::Path& pPath,
m_Path = pPath;
if (m_Handler == -1) {
- m_OpenMode = NotOpen;
+ m_OpenMode = OpenMode(NotOpen);
setState(FailBit);
return false;
}
@@ -102,14 +102,14 @@ bool FileHandle::open(const sys::fs::Path& pPath,
return true;
}
-bool FileHandle::delegate(int pFD, FileHandle::OpenMode pMode) {
+bool FileHandle::delegate(int pFD, FileHandle::OpenModeEnum pMode) {
if (isOpened()) {
setState(BadBit);
return false;
}
m_Handler = pFD;
- m_OpenMode = pMode;
+ m_OpenMode = OpenMode(pMode);
m_State = (GoodBit | DeputedBit);
if (!get_size(m_Handler, m_Size)) {
@@ -135,7 +135,7 @@ bool FileHandle::close() {
m_Path.native().clear();
m_Size = 0;
- m_OpenMode = NotOpen;
+ m_OpenMode = OpenMode(NotOpen);
cleanState();
return true;
}
diff --git a/unittests/FileHandleTest.cpp b/unittests/FileHandleTest.cpp
index 67935fbb..5951857a 100644
--- a/unittests/FileHandleTest.cpp
+++ b/unittests/FileHandleTest.cpp
@@ -40,7 +40,8 @@ void FileHandleTest::TearDown() {
TEST_F(FileHandleTest, open_close) {
mcld::sys::fs::Path path(TOPDIR);
path.append("unittests/test.txt");
- ASSERT_TRUE(m_pTestee->open(path, FileHandle::ReadOnly));
+ ASSERT_TRUE(m_pTestee->open(path, FileHandle::OpenMode(FileHandle::ReadOnly),
+ FileHandle::Permission(FileHandle::System)));
ASSERT_TRUE(m_pTestee->isOpened());
ASSERT_TRUE(m_pTestee->isGood());
ASSERT_TRUE(m_pTestee->isOwned());
@@ -81,7 +82,8 @@ TEST_F(FileHandleTest, delegate_close) {
TEST_F(FileHandleTest, fail_close) {
mcld::sys::fs::Path path(TOPDIR);
path.append("unittests/test.txt");
- ASSERT_TRUE(m_pTestee->open(path, FileHandle::ReadOnly));
+ ASSERT_TRUE(m_pTestee->open(path, FileHandle::OpenMode(FileHandle::ReadOnly),
+ FileHandle::Permission(FileHandle::System)));
ASSERT_TRUE(m_pTestee->isOpened());
ASSERT_TRUE(m_pTestee->isGood());
diff --git a/unittests/FragmentRefTest.cpp b/unittests/FragmentRefTest.cpp
index f8c2c7bd..6fe69d3b 100644
--- a/unittests/FragmentRefTest.cpp
+++ b/unittests/FragmentRefTest.cpp
@@ -36,14 +36,16 @@ void FragmentRefTest::SetUp() {
void FragmentRefTest::TearDown() {
}
-//==========================================================================//
+//============================================================================//
// Testcases
//
TEST_F(FragmentRefTest, ) {
Path path(TOPDIR);
path.append("unittests/test3.txt");
MemoryAreaFactory* areaFactory = new MemoryAreaFactory(1);
- MemoryArea* area = areaFactory->produce(path, FileHandle::ReadWrite);
+ MemoryArea* area =
+ areaFactory->produce(path, FileHandle::OpenMode(FileHandle::ReadWrite),
+ FileHandle::Permission(FileHandle::System));
llvm::StringRef region = area->request(0, 4096);
RegionFragment* frag = new RegionFragment(region);
diff --git a/unittests/UniqueGCFactoryBaseTest.cpp b/unittests/UniqueGCFactoryBaseTest.cpp
index 1e61de30..a6d21563 100644
--- a/unittests/UniqueGCFactoryBaseTest.cpp
+++ b/unittests/UniqueGCFactoryBaseTest.cpp
@@ -70,11 +70,17 @@ TEST_F(UniqueGCFactoryBaseTest, iterator) {
path2.append("unittests/test2.txt");
MemoryAreaFactory* memFactory = new MemoryAreaFactory(10);
- MemoryArea* area1 = memFactory->produce(path1, FileHandle::ReadOnly);
- MemoryArea* area2 = memFactory->produce(path2, FileHandle::ReadOnly);
+ MemoryArea* area1 =
+ memFactory->produce(path1, FileHandle::OpenMode(FileHandle::ReadOnly),
+ FileHandle::Permission(FileHandle::System));
+ MemoryArea* area2 =
+ memFactory->produce(path2, FileHandle::OpenMode(FileHandle::ReadOnly),
+ FileHandle::Permission(FileHandle::System));
ASSERT_NE(area1, area2);
- MemoryArea* area3 = memFactory->produce(path1, FileHandle::ReadOnly);
+ MemoryArea* area3 =
+ memFactory->produce(path1, FileHandle::OpenMode(FileHandle::ReadOnly),
+ FileHandle::Permission(FileHandle::System));
ASSERT_EQ(area1, area3);
ASSERT_FALSE(memFactory->empty());