mass replace of const string& params by const char*

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

14 files changed, 70 insertions, 102 deletions

diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp
index 8a86e14..3a3604b 100644
--- a/lib/Plugins/CCpp.cpp
+++ b/lib/Plugins/CCpp.cpp
@@ -223,7 +223,7 @@ int rate_backtrace(const std::string & backtrace)
     return 0;
 }
 
-static void GetBacktrace(const std::string& pDebugDumpDir, std::string& pBacktrace)
+static void GetBacktrace(const char *pDebugDumpDir, std::string& pBacktrace)
 {
     update_client(_("Getting backtrace..."));
 
@@ -258,7 +258,7 @@ static void GetBacktrace(const std::string& pDebugDumpDir, std::string& pBacktra
     args[4] = (char*)"-ex";
     args[5] = xasprintf("file %s", executable.c_str());
     args[6] = (char*)"-ex";
-    args[7] = xasprintf("core-file %s/"FILENAME_COREDUMP, pDebugDumpDir.c_str());
+    args[7] = xasprintf("core-file %s/"FILENAME_COREDUMP, pDebugDumpDir);
     args[8] = (char*)"-ex";
     args[9] = (char*)"thread apply all backtrace full";
     args[10] = NULL;
@@ -420,7 +420,7 @@ static void GetIndependentBuildIdPC(const std::string& pBuildIdPC, std::string&
     }
 }
 
-static std::string run_unstrip_n(const std::string& pDebugDumpDir)
+static std::string run_unstrip_n(const char *pDebugDumpDir)
 {
     std::string UID;
     {
@@ -431,7 +431,7 @@ static std::string run_unstrip_n(const std::string& pDebugDumpDir)
 
     char* args[4];
     args[0] = (char*)"eu-unstrip";
-    args[1] = xasprintf("--core=%s/"FILENAME_COREDUMP, pDebugDumpDir.c_str());
+    args[1] = xasprintf("--core=%s/"FILENAME_COREDUMP, pDebugDumpDir);
     args[2] = (char*)"-n";
     args[3] = NULL;
 
@@ -455,7 +455,7 @@ static bool is_hexstr(const char* str)
     }
     return true;
 }
-static void InstallDebugInfos(const std::string& pDebugDumpDir, std::string& build_ids)
+static void InstallDebugInfos(const char *pDebugDumpDir, std::string& build_ids)
 {
     log("Getting module names, file names, build IDs from core file");
     std::string unstrip_list = run_unstrip_n(pDebugDumpDir);
@@ -648,7 +648,7 @@ Another application is holding the yum lock, cannot continue
 /* Needs gdb feature from here: https://bugzilla.redhat.com/show_bug.cgi?id=528668
  * It is slated to be in F12/RHEL6.
  */
-static void InstallDebugInfos(const std::string& pDebugDumpDir, std::string& build_ids)
+static void InstallDebugInfos(const char *pDebugDumpDir, std::string& build_ids)
 {
     update_client(_("Searching for debug-info packages..."));
 
@@ -673,7 +673,7 @@ static void InstallDebugInfos(const std::string& pDebugDumpDir, std::string& bui
 
         setsid();
 
-        char *coredump = xasprintf("%s/"FILENAME_COREDUMP, pDebugDumpDir.c_str());
+        char *coredump = xasprintf("%s/"FILENAME_COREDUMP, pDebugDumpDir);
         /* SELinux guys are not happy with /tmp, using /var/run/abrt */
         char *tempdir = xasprintf(LOCALSTATEDIR"/run/abrt/tmp-%u-%lu", (int)getpid(), (long)time(NULL));
         /* log() goes to stderr/syslog, it's ok to use it here */
@@ -787,7 +787,7 @@ static void trim_debuginfo_cache(unsigned max_mb)
     }
 }
 
-std::string CAnalyzerCCpp::GetLocalUUID(const std::string& pDebugDumpDir)
+std::string CAnalyzerCCpp::GetLocalUUID(const char *pDebugDumpDir)
 {
     log(_("Getting local universal unique identification..."));
 
@@ -806,7 +806,7 @@ std::string CAnalyzerCCpp::GetLocalUUID(const std::string& pDebugDumpDir)
     return CreateHash(package + executable + independentBuildIdPC);
 }
 
-std::string CAnalyzerCCpp::GetGlobalUUID(const std::string& pDebugDumpDir)
+std::string CAnalyzerCCpp::GetGlobalUUID(const char *pDebugDumpDir)
 {
     log(_("Getting global universal unique identification..."));
 
@@ -851,7 +851,7 @@ static bool DebuginfoCheckPolkit(int uid)
     return false;
 }
 
-void CAnalyzerCCpp::CreateReport(const std::string& pDebugDumpDir, int force)
+void CAnalyzerCCpp::CreateReport(const char *pDebugDumpDir, int force)
 {
     update_client(_("Starting report creation..."));
 
@@ -889,13 +889,12 @@ void CAnalyzerCCpp::CreateReport(const std::string& pDebugDumpDir, int force)
     GetBacktrace(pDebugDumpDir, backtrace);
 
     dd.Open(pDebugDumpDir);
-    dd.SaveText(FILENAME_BACKTRACE, build_ids + backtrace);
+    dd.SaveText(FILENAME_BACKTRACE, (build_ids + backtrace).c_str());
     if (m_bMemoryMap)
     {
         dd.SaveText(FILENAME_MEMORYMAP, "memory map of the crashed C/C++ application, not implemented yet");
     }
-    std::string rating = ssprintf("%d", rate_backtrace(backtrace));
-    dd.SaveText(FILENAME_RATING, rating);
+    dd.SaveText(FILENAME_RATING, to_string(rate_backtrace(backtrace)).c_str());
     dd.Close();
 }
 
diff --git a/lib/Plugins/CCpp.h b/lib/Plugins/CCpp.h
index a37ba67..a768c0a 100644
--- a/lib/Plugins/CCpp.h
+++ b/lib/Plugins/CCpp.h
@@ -39,9 +39,9 @@ class CAnalyzerCCpp : public CAnalyzer
 
     public:
         CAnalyzerCCpp();
-        virtual std::string GetLocalUUID(const std::string& pDebugDumpDir);
-        virtual std::string GetGlobalUUID(const std::string& pDebugDumpDir);
-        virtual void CreateReport(const std::string& pDebugDumpDir, int force);
+        virtual std::string GetLocalUUID(const char *pDebugDumpDir);
+        virtual std::string GetGlobalUUID(const char *pDebugDumpDir);
+        virtual void CreateReport(const char *pDebugDumpDir, int force);
         virtual void Init();
         virtual void DeInit();
         virtual void SetSettings(const map_plugin_settings_t& pSettings);
diff --git a/lib/Plugins/FileTransfer.cpp b/lib/Plugins/FileTransfer.cpp
index 6642758..75031fc 100644
--- a/lib/Plugins/FileTransfer.cpp
+++ b/lib/Plugins/FileTransfer.cpp
@@ -55,62 +55,42 @@ CFileTransfer::CFileTransfer()
 {
 }
 
-void CFileTransfer::SendFile(const std::string& pURL,
-                             const std::string& pFilename)
+void CFileTransfer::SendFile(const char *pURL, const char *pFilename)
 {
-    if (pURL == "")
+    int len = strlen(pURL);
+    if (len == 0)
     {
         warn_client(_("FileTransfer: URL not specified"));
         return;
     }
 
-    int len = pURL.length();
-    int i = 0;
-    std::string protocol;
-    while (pURL[i] != ':')
-    {
-        protocol += pURL[i];
-        i++;
-        if (i == len)
-        {
-            throw CABRTException(EXCEP_PLUGIN, "CFileTransfer::SendFile(): malformed URL, does not contain protocol");
-        }
-    }
-
-    std::string msg = ssprintf(_("Sending archive %s via %s"), pFilename.c_str(), protocol.c_str());
+    std::string msg = ssprintf(_("Sending archive %s to %s"), pFilename, pURL);
     update_client(msg.c_str());
 
-    std::string wholeURL;
-    if (pURL[len-1] == '/')
-    {
-        wholeURL = pURL + pFilename;
-    }
-    else
-    {
-        wholeURL = pURL + "/" + pFilename;
-    }
+    std::string wholeURL = concat_path_file(pURL, pFilename);
 
     int result;
     int count = m_nRetryCount;
     do
     {
-        FILE * f;
+        FILE *f;
         struct stat buf;
-        CURL * curl;
+        CURL *curl;
 
-        f = fopen(pFilename.c_str(), "r");
+        f = fopen(pFilename, "r");
         if (!f)
         {
-            throw CABRTException(EXCEP_PLUGIN, "CFileTransfer::SendFile(): cannot open archive file "+pFilename);
+            throw CABRTException(EXCEP_PLUGIN, ssprintf("Can't open archive file '%s'", pFilename));
         }
         if (fstat(fileno(f), &buf) == -1)
         {
-            throw CABRTException(EXCEP_PLUGIN, "CFileTransfer::SendFile(): cannot stat archive file "+pFilename);
+            fclose(f);
+            throw CABRTException(EXCEP_PLUGIN, ssprintf("Can't stat archive file '%s'", pFilename));
         }
         curl = curl_easy_init();
         if (!curl)
         {
-            throw CABRTException(EXCEP_PLUGIN, "CFileTransfer::SendFile(): Curl library error.");
+            throw CABRTException(EXCEP_PLUGIN, "Curl library init error");
         }
         /* enable uploading */
         curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L);
@@ -285,28 +265,27 @@ static void create_tarbz2(const char * archive_name, const char * directory)
     free(name_without_bz2);
 }
 
-void CFileTransfer::CreateArchive(const std::string& pArchiveName,
-                                  const std::string& pDir)
+void CFileTransfer::CreateArchive(const char *pArchiveName, const char *pDir)
 {
     if (m_sArchiveType == ".tar")
     {
-        create_tar(pArchiveName.c_str(), pDir.c_str());
+        create_tar(pArchiveName, pDir);
     }
     else if (m_sArchiveType == ".tar.gz")
     {
-        create_targz(pArchiveName.c_str(), pDir.c_str());
+        create_targz(pArchiveName, pDir);
     }
     else if (m_sArchiveType == ".tar.bz2")
     {
-        create_tarbz2(pArchiveName.c_str(), pDir.c_str());
+        create_tarbz2(pArchiveName, pDir);
     }
     else if (m_sArchiveType == ".zip")
     {
-        create_zip(pArchiveName.c_str(), pDir.c_str());
+        create_zip(pArchiveName, pDir);
     }
     else
     {
-        throw CABRTException(EXCEP_PLUGIN, "CFileTransfer::CreateArchive(): unknown/unsupported archive type "+m_sArchiveType);
+        throw CABRTException(EXCEP_PLUGIN, "Unknown/unsupported archive type " + m_sArchiveType);
     }
 }
 
@@ -326,7 +305,7 @@ static std::string DirBase(const std::string& pStr)
     return result;
 }
 
-void CFileTransfer::Run(const std::string& pActiveDir, const std::string& pArgs)
+void CFileTransfer::Run(const char *pActionDir, const char *pArgs)
 {
     fstream dirlist;
     std::string dirname, archivename;
@@ -334,23 +313,23 @@ void CFileTransfer::Run(const std::string& pActiveDir, const std::string& pArgs)
 
     update_client(_("File Transfer: Creating a report..."));
 
-    if (pArgs == "store")
+    if (strcmp(pArgs, "store") == 0)
     {
         /* store pActiveDir for later sending */
         dirlist.open(FILETRANSFER_DIRLIST, fstream::out | fstream::app );
-        dirlist << pActiveDir << endl;
+        dirlist << pActionDir << endl;
         dirlist.close();
     }
-    else if (pArgs == "one")
+    else if (strcmp(pArgs, "one") == 0)
     {
         /* just send one archive */
         gethostname(hostname, HBLEN);
         archivename = std::string(hostname) + "-"
-                      + DirBase(pActiveDir) + m_sArchiveType;
+                      + DirBase(pActionDir) + m_sArchiveType;
         try
         {
-            CreateArchive(archivename, pActiveDir);
-            SendFile(m_sURL, archivename);
+            CreateArchive(archivename.c_str(), pActionDir);
+            SendFile(m_sURL.c_str(), archivename.c_str());
         }
         catch (CABRTException& e)
         {
@@ -377,8 +356,8 @@ void CFileTransfer::Run(const std::string& pActiveDir, const std::string& pArgs)
                          + DirBase(dirname) + m_sArchiveType;
             try
             {
-                CreateArchive(archivename, dirname);
-                SendFile(m_sURL, archivename);
+                CreateArchive(archivename.c_str(), dirname.c_str());
+                SendFile(m_sURL.c_str(), archivename.c_str());
             }
             catch (CABRTException& e)
             {
diff --git a/lib/Plugins/FileTransfer.h b/lib/Plugins/FileTransfer.h
index 2f230c6..526fbc3 100644
--- a/lib/Plugins/FileTransfer.h
+++ b/lib/Plugins/FileTransfer.h
@@ -35,18 +35,14 @@ class CFileTransfer : public CAction
         int m_nRetryCount;
         int m_nRetryDelay;
 
-        void CreateArchive(const std::string& pArchiveName,
-                           const std::string& pDir);
-
-        void SendFile(const std::string& pURL,
-                      const std::string& pFilename);
+        void CreateArchive(const char *pArchiveName, const char *pDir);
+        void SendFile(const char *pURL, const char *pFilename);
 
     public:
         CFileTransfer();
         virtual void SetSettings(const map_plugin_settings_t& pSettings);
         virtual map_plugin_settings_t GetSettings();
-        virtual void Run(const std::string& pActiveDir,
-                         const std::string& pArgs);
+        virtual void Run(const char *pActionDir, const char *pArgs);
 };
 
 #endif /* FILETRANSFER_H_ */
diff --git a/lib/Plugins/Kerneloops.cpp b/lib/Plugins/Kerneloops.cpp
index e072ada..f2a8a59 100644
--- a/lib/Plugins/Kerneloops.cpp
+++ b/lib/Plugins/Kerneloops.cpp
@@ -32,7 +32,7 @@
 
 #define FILENAME_KERNELOOPS  "kerneloops"
 
-std::string CAnalyzerKerneloops::GetLocalUUID(const std::string& pDebugDumpDir)
+std::string CAnalyzerKerneloops::GetLocalUUID(const char *pDebugDumpDir)
 {
 	log(_("Getting local universal unique identification"));
 
@@ -58,7 +58,7 @@ std::string CAnalyzerKerneloops::GetLocalUUID(const std::string& pDebugDumpDir)
 	return to_string(hash);
 }
 
-std::string CAnalyzerKerneloops::GetGlobalUUID(const std::string& pDebugDumpDir)
+std::string CAnalyzerKerneloops::GetGlobalUUID(const char *pDebugDumpDir)
 {
 	return GetLocalUUID(pDebugDumpDir);
 }
diff --git a/lib/Plugins/Kerneloops.h b/lib/Plugins/Kerneloops.h
index c22e787..cda223d 100644
--- a/lib/Plugins/Kerneloops.h
+++ b/lib/Plugins/Kerneloops.h
@@ -37,9 +37,9 @@ class CAnalyzerKerneloops : public CAnalyzer
 		map_plugin_settings_t m_pSettings;
 
 	public:
-		virtual std::string GetLocalUUID(const std::string& pDebugDumpDir);
-		virtual std::string GetGlobalUUID(const std::string& pDebugDumpDir);
-		virtual void CreateReport(const std::string& pDebugDumpDir, int force) {}
+		virtual std::string GetLocalUUID(const char *pDebugDumpDir);
+		virtual std::string GetGlobalUUID(const char *pDebugDumpDir);
+		virtual void CreateReport(const char *pDebugDumpDir, int force) {}
 		virtual void SetSettings(const map_plugin_settings_t& pSettings);
 		virtual map_plugin_settings_t GetSettings();
 };
diff --git a/lib/Plugins/KerneloopsScanner.cpp b/lib/Plugins/KerneloopsScanner.cpp
index c7756ba..3572ef2 100644
--- a/lib/Plugins/KerneloopsScanner.cpp
+++ b/lib/Plugins/KerneloopsScanner.cpp
@@ -50,8 +50,7 @@ CKerneloopsScanner::CKerneloopsScanner()
 		SaveOopsToDebugDump();
 }
 
-void CKerneloopsScanner::Run(const std::string& pActionDir,
-			     const std::string& pArgs)
+void CKerneloopsScanner::Run(const char *pActionDir, const char *pArgs)
 {
 	const char *syslog_file = "/var/log/messages";
 	map_plugin_settings_t::const_iterator it = m_pSettings.find("SysLogFile");
diff --git a/lib/Plugins/KerneloopsScanner.h b/lib/Plugins/KerneloopsScanner.h
index 7352393..a2a4e4b 100644
--- a/lib/Plugins/KerneloopsScanner.h
+++ b/lib/Plugins/KerneloopsScanner.h
@@ -49,8 +49,7 @@ class CKerneloopsScanner : public CAction
 		/* Plugin interface */
 	public:
 		CKerneloopsScanner();
-		virtual void Run(const std::string& pActionDir,
-				 const std::string& pArgs);
+		virtual void Run(const char *pActionDir, const char *pArgs);
 		virtual void SetSettings(const map_plugin_settings_t& pSettings);
 		virtual map_plugin_settings_t GetSettings();
 };
diff --git a/lib/Plugins/Python.cpp b/lib/Plugins/Python.cpp
index b92d6af..9fb7880 100644
--- a/lib/Plugins/Python.cpp
+++ b/lib/Plugins/Python.cpp
@@ -6,7 +6,7 @@
 #define FILENAME_BACKTRACE      "backtrace"
 #define PYHOOK_CONFIG          "/etc/abrt/pyhook.conf"
 
-static std::string CreateHash(const std::string& pDebugDumpDir)
+static std::string CreateHash(const char *pDebugDumpDir)
 {
 	std::string uuid;
 	CDebugDump dd;
@@ -15,11 +15,11 @@ static std::string CreateHash(const std::string& pDebugDumpDir)
 	return uuid;
 }
 
-std::string CAnalyzerPython::GetLocalUUID(const std::string& pDebugDumpDir)
+std::string CAnalyzerPython::GetLocalUUID(const char *pDebugDumpDir)
 {
 	return CreateHash(pDebugDumpDir);
 }
-std::string CAnalyzerPython::GetGlobalUUID(const std::string& pDebugDumpDir)
+std::string CAnalyzerPython::GetGlobalUUID(const char *pDebugDumpDir)
 {
 	return GetLocalUUID(pDebugDumpDir);
 }
diff --git a/lib/Plugins/Python.h b/lib/Plugins/Python.h
index 532ee8c..82f52c0 100644
--- a/lib/Plugins/Python.h
+++ b/lib/Plugins/Python.h
@@ -8,9 +8,9 @@
 class CAnalyzerPython : public CAnalyzer
 {
     public:
-        virtual std::string GetLocalUUID(const std::string& pDebugDumpDir);
-        virtual std::string GetGlobalUUID(const std::string& pDebugDumpDir);
-        virtual void CreateReport(const std::string& pDebugDumpDir, int force) {}
+        virtual std::string GetLocalUUID(const char *pDebugDumpDir);
+        virtual std::string GetGlobalUUID(const char *pDebugDumpDir);
+        virtual void CreateReport(const char *pDebugDumpDir, int force) {}
         virtual void Init();
         virtual void DeInit();
 };
diff --git a/lib/Plugins/RunApp.cpp b/lib/Plugins/RunApp.cpp
index 51d4346..f816dc2 100644
--- a/lib/Plugins/RunApp.cpp
+++ b/lib/Plugins/RunApp.cpp
@@ -59,15 +59,14 @@ static void ParseArgs(const char *psArgs, vector_string_t& pArgs)
     }
 }
 
-void CActionRunApp::Run(const std::string& pActionDir,
-                        const std::string& pArgs)
+void CActionRunApp::Run(const char *pActionDir, const char *pArgs)
 {
     update_client(_("Executing RunApp plugin..."));
 
     std::string output;
     vector_string_t args;
 
-    ParseArgs(pArgs.c_str(), args);
+    ParseArgs(pArgs, args);
 
     FILE *fp = popen(args[COMMAND].c_str(), "r");
     if (fp == NULL)
@@ -85,7 +84,7 @@ void CActionRunApp::Run(const std::string& pActionDir,
     {
         CDebugDump dd;
         dd.Open(pActionDir);
-        dd.SaveText(args[FILENAME].c_str(), output);
+        dd.SaveText(args[FILENAME].c_str(), output.c_str());
     }
 }
 
diff --git a/lib/Plugins/RunApp.h b/lib/Plugins/RunApp.h
index 0e12351..939feaa 100644
--- a/lib/Plugins/RunApp.h
+++ b/lib/Plugins/RunApp.h
@@ -29,8 +29,7 @@
 class CActionRunApp : public CAction
 {
     public:
-        virtual void Run(const std::string& pActionDir,
-                         const std::string& pArgs);
+        virtual void Run(const char *pActionDir, const char *pArgs);
 };
 
 #endif
diff --git a/lib/Plugins/SOSreport.cpp b/lib/Plugins/SOSreport.cpp
index 4938f7d..744550b 100644
--- a/lib/Plugins/SOSreport.cpp
+++ b/lib/Plugins/SOSreport.cpp
@@ -114,8 +114,7 @@ static void ParseArgs(const char *psArgs, vector_string_t& pArgs)
     }
 }
 
-void CActionSOSreport::Run(const std::string& pActionDir,
-                           const std::string& pArgs)
+void CActionSOSreport::Run(const char *pActionDir, const char *pArgs)
 {
     update_client(_("Executing SOSreport plugin..."));
 
@@ -128,25 +127,25 @@ void CActionSOSreport::Run(const std::string& pActionDir,
     std::string command;
 
     vector_string_t args;
-    ParseArgs(pArgs.c_str(), args);
+    ParseArgs(pArgs, args);
 
     if (args.size() == 0 || args[0] == "")
     {
-        command = std::string(command_default);
+        command = command_default;
     }
     else
     {
-        command = std::string(command_prefix) + ' ' + args[0] + " 2>&1";
+        command = ssprintf("%s %s 2>&1", command_prefix, args[0].c_str());
     }
 
     update_client(_("running sosreport: ") + command);
     FILE *fp = popen(command.c_str(), "r");
-
     if (fp == NULL)
     {
-        throw CABRTException(EXCEP_PLUGIN, std::string("CActionSOSreport::Run(): cannot execute ") + command);
+        throw CABRTException(EXCEP_PLUGIN, ssprintf("Can't execute '%s'", command.c_str()));
     }
 
+//vda TODO: fix this mess
     std::ostringstream output_stream;
     __gnu_cxx::stdio_filebuf<char> command_output_buffer(fp, std::ios_base::in);
 
@@ -159,7 +158,7 @@ void CActionSOSreport::Run(const std::string& pActionDir,
     std::string output = output_stream.str();
 
     std::string sosreport_filename = ParseFilename(output);
-    std::string sosreport_dd_filename = pActionDir + "/sosreport.tar.bz2";
+    std::string sosreport_dd_filename = concat_path_file(pActionDir, "sosreport.tar.bz2");
 
     CDebugDump dd;
     dd.Open(pActionDir);
diff --git a/lib/Plugins/SOSreport.h b/lib/Plugins/SOSreport.h
index 98d2b6c..d4e0d73 100644
--- a/lib/Plugins/SOSreport.h
+++ b/lib/Plugins/SOSreport.h
@@ -26,8 +26,7 @@
 class CActionSOSreport : public CAction
 {
     public:
-        virtual void Run(const std::string& pActionDir,
-                         const std::string& pArgs);
+        virtual void Run(const char *pActionDir, const char *pArgs);
 };
 
 #endif