diff options
| author | Jiri Moskovcak <jmoskovc@redhat.com> | 2009-09-09 16:07:07 +0200 |
|---|---|---|
| committer | Jiri Moskovcak <jmoskovc@redhat.com> | 2009-09-09 16:07:07 +0200 |
| commit | 320b7eae1821cb3f92a8e19d6ea6fa70be552d29 (patch) | |
| tree | f75b34f244fed4fabff8636ecaddeeb86c06df76 /lib | |
| parent | f6481dd5fb52b85fbb8c74ad3b3c476e7eba84fb (diff) | |
| parent | 741de5ede91b74bb7bd4e8e23db96178056f5613 (diff) | |
| download | abrt-320b7eae1821cb3f92a8e19d6ea6fa70be552d29.tar.gz abrt-320b7eae1821cb3f92a8e19d6ea6fa70be552d29.tar.xz abrt-320b7eae1821cb3f92a8e19d6ea6fa70be552d29.zip | |
Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Plugins/RunApp.cpp | 2 | ||||
| -rw-r--r-- | lib/Utils/DebugDump.cpp | 10 | ||||
| -rw-r--r-- | lib/Utils/DebugDump.h | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/lib/Plugins/RunApp.cpp b/lib/Plugins/RunApp.cpp index 4bc53181..fdbc3a75 100644 --- a/lib/Plugins/RunApp.cpp +++ b/lib/Plugins/RunApp.cpp @@ -83,7 +83,7 @@ void CActionRunApp::Run(const std::string& pActionDir, { CDebugDump dd; dd.Open(pActionDir); - dd.SaveText(args[FILENAME], output); + dd.SaveText(args[FILENAME].c_str(), output); dd.Close(); } } diff --git a/lib/Utils/DebugDump.cpp b/lib/Utils/DebugDump.cpp index 345dbf02..e607d940 100644 --- a/lib/Utils/DebugDump.cpp +++ b/lib/Utils/DebugDump.cpp @@ -410,7 +410,7 @@ static void SaveBinaryFile(const std::string& pPath, const char* pData, const un } } -void CDebugDump::LoadText(const std::string& pName, std::string& pData) +void CDebugDump::LoadText(const char* pName, std::string& pData) { if (!m_bOpened) { @@ -419,7 +419,7 @@ void CDebugDump::LoadText(const std::string& pName, std::string& pData) std::string fullPath = m_sDebugDumpDir + "/" + pName; LoadTextFile(fullPath, pData); } -void CDebugDump::LoadBinary(const std::string& pName, char** pData, unsigned int* pSize) +void CDebugDump::LoadBinary(const char* pName, char** pData, unsigned int* pSize) { if (!m_bOpened) { @@ -429,7 +429,7 @@ void CDebugDump::LoadBinary(const std::string& pName, char** pData, unsigned int LoadBinaryFile(fullPath, pData, pSize); } -void CDebugDump::SaveText(const std::string& pName, const std::string& pData) +void CDebugDump::SaveText(const char* pName, const std::string& pData) { if (!m_bOpened) { @@ -438,7 +438,7 @@ void CDebugDump::SaveText(const std::string& pName, const std::string& pData) std::string fullPath = m_sDebugDumpDir + "/" + pName; SaveTextFile(fullPath, pData); } -void CDebugDump::SaveBinary(const std::string& pName, const char* pData, const unsigned int pSize) +void CDebugDump::SaveBinary(const char* pName, const char* pData, const unsigned int pSize) { if (!m_bOpened) { @@ -489,7 +489,7 @@ bool CDebugDump::GetNextFile(std::string& pFileName, std::string& pContent, bool pFileName = dent->d_name; if (IsTextFile(fullname)) { - LoadText(pFileName, pContent); + LoadText(dent->d_name, pContent); pIsTextFile = true; } else diff --git a/lib/Utils/DebugDump.h b/lib/Utils/DebugDump.h index 573c6073..c5ee060d 100644 --- a/lib/Utils/DebugDump.h +++ b/lib/Utils/DebugDump.h @@ -64,11 +64,11 @@ class CDebugDump bool Exist(const char* pFileName); - void LoadText(const std::string& pName, std::string& pData); - void LoadBinary(const std::string& pName, char** pData, unsigned int* pSize); + void LoadText(const char* pName, std::string& pData); + void LoadBinary(const char* pName, char** pData, unsigned int* pSize); - void SaveText(const std::string& pName, const std::string& pData); - void SaveBinary(const std::string& pName, const char* pData, const unsigned int pSize); + void SaveText(const char* pName, const std::string& pData); + void SaveBinary(const char* pName, const char* pData, const unsigned int pSize); void InitGetNextFile(); bool GetNextFile(std::string& pFileName, std::string& pContent, bool& pIsTextFile); |