Merge branch 'master' of git://git.fedorahosted.org/git/abrt

1 files changed, 4 insertions, 8 deletions

diff --git a/lib/Plugins/TicketUploader.cpp b/lib/Plugins/TicketUploader.cpp
index 06b6cde..a4fe0e8 100644
--- a/lib/Plugins/TicketUploader.cpp
+++ b/lib/Plugins/TicketUploader.cpp
@@ -20,8 +20,8 @@
 #include <string>
 #include <fstream>
 #include <sstream>
-#include <curl/curl.h>
 #include "abrtlib.h"
+#include "abrt_xmlrpc.h" /* for xcurl_easy_init */
 #include "TicketUploader.h"
 #include "DebugDump.h"
 #include "ABRTException.h"
@@ -124,11 +124,7 @@ void CTicketUploader::SendFile(const char *pURL, const char *pFilename)
         {
             throw CABRTException(EXCEP_PLUGIN, "Can't stat archive file '%s'", pFilename);
         }
-        CURL* curl = curl_easy_init();
-        if (!curl)
-        {
-            throw CABRTException(EXCEP_PLUGIN, "Curl library init error");
-        }
+        CURL* curl = xcurl_easy_init();
         /* enable uploading */
         curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L);
         /* specify target */
@@ -394,12 +390,12 @@ void CTicketUploader::SetSettings(const map_plugin_settings_t& pSettings)
     it = pSettings.find("RetryCount");
     if (it != end)
     {
-        m_nRetryCount = atoi(it->second.c_str());
+        m_nRetryCount = xatoi_u(it->second.c_str());
     }
     it = pSettings.find("RetryDelay");
     if (it != end)
     {
-        m_nRetryDelay = atoi(it->second.c_str());
+        m_nRetryDelay = xatoi_u(it->second.c_str());
     }
 }