From 4ceb3715a3a6b752009627b0dc6a1974664c03a1 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 6 Dec 2009 22:23:11 +0100 Subject: remove std::string usage from class CABRTException. Signed-off-by: Denys Vlasenko --- lib/Plugins/FileTransfer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/Plugins/FileTransfer.cpp') diff --git a/lib/Plugins/FileTransfer.cpp b/lib/Plugins/FileTransfer.cpp index 868f54d..8fff3a9 100644 --- a/lib/Plugins/FileTransfer.cpp +++ b/lib/Plugins/FileTransfer.cpp @@ -79,12 +79,12 @@ void CFileTransfer::SendFile(const char *pURL, const char *pFilename) f = fopen(pFilename, "r"); if (!f) { - throw CABRTException(EXCEP_PLUGIN, ssprintf("Can't open archive file '%s'", pFilename)); + throw CABRTException(EXCEP_PLUGIN, "Can't open archive file '%s'", pFilename); } if (fstat(fileno(f), &buf) == -1) { fclose(f); - throw CABRTException(EXCEP_PLUGIN, ssprintf("Can't stat archive file '%s'", pFilename)); + throw CABRTException(EXCEP_PLUGIN, "Can't stat archive file '%s'", pFilename); } curl = curl_easy_init(); if (!curl) @@ -282,7 +282,7 @@ void CFileTransfer::CreateArchive(const char *pArchiveName, const char *pDir) } else { - throw CABRTException(EXCEP_PLUGIN, "Unknown/unsupported archive type " + m_sArchiveType); + throw CABRTException(EXCEP_PLUGIN, "Unknown/unsupported archive type %s", m_sArchiveType.c_str()); } } -- cgit From fc2c5e2f02e6da00e27d68a83277a61efdcc9f83 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Thu, 10 Dec 2009 13:10:43 +0100 Subject: style fixes, no code changes Signed-off-by: Denys Vlasenko --- lib/Plugins/FileTransfer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/Plugins/FileTransfer.cpp') diff --git a/lib/Plugins/FileTransfer.cpp b/lib/Plugins/FileTransfer.cpp index 8fff3a9..03ee464 100644 --- a/lib/Plugins/FileTransfer.cpp +++ b/lib/Plugins/FileTransfer.cpp @@ -114,7 +114,7 @@ now used in create_zip, but can be useful for some future archivers as well */ static void traverse_directory(const char * directory, void * something, - void (*func)(void *,const char *) ) + void (*func)(void *, const char *) ) { DIR * dp; struct dirent * dirp; @@ -225,7 +225,7 @@ static void create_tarbz2(const char * archive_name, const char * directory) #define BLOCK_MULTIPLIER 7 name_without_bz2 = xstrdup(archive_name); - strrchr(name_without_bz2,'.')[0] = '\0'; + strrchr(name_without_bz2, '.')[0] = '\0'; create_tar(name_without_bz2, directory); tarFD = open(name_without_bz2, O_RDONLY); -- cgit