From: Ingo Ruhnke <grumbel@gmail.com>
Date: Tue, 26 Aug 2014 05:24:44 +0000 (+0200)
Subject: Replaced fancy C++11 lambda with old style static function wrap in Downloader
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=844cd972459065bcd4e0bb19adfacd2c5158d0ef;p=supertux.git

Replaced fancy C++11 lambda with old style static function wrap in Downloader

The C++11 lambda would work, but the lambda has to be cast to a
C-style function pointer first, cURL however doesn't provide function
pointer definitions for quick and easy casting and since it takes
arguments as va_arg it crashes and burns when passing in a raw lambda.
Old style _wrap is simply easier then casting to the proper function type.
---

diff --git a/src/addon/downloader.cpp b/src/addon/downloader.cpp
index f40a14158..702ce246e 100644
--- a/src/addon/downloader.cpp
+++ b/src/addon/downloader.cpp
@@ -63,10 +63,11 @@ public:
     m_downloader(downloader),
     m_id(id),
     m_url(url),
-    m_handle(curl_easy_init()),
+    m_handle(),
     m_error_buffer(),
     m_status(new TransferStatus(id))
   {
+    m_handle = curl_easy_init();
     if (!m_handle)
     {
       throw std::runtime_error("curl_easy_init() failed");
@@ -77,12 +78,7 @@ public:
       curl_easy_setopt(m_handle, CURLOPT_USERAGENT, "SuperTux/" PACKAGE_VERSION " libcURL");
 
       curl_easy_setopt(m_handle, CURLOPT_WRITEDATA, this);
-      curl_easy_setopt(m_handle, CURLOPT_WRITEFUNCTION,
-                       [](void* ptr, size_t size, size_t nmemb, void* userdata) -> size_t
-                       {
-                         return static_cast<Transfer*>(userdata)
-                           ->on_data(ptr, size, nmemb);
-                       });
+      curl_easy_setopt(m_handle, CURLOPT_WRITEFUNCTION, &Transfer::on_data_wrap);
 
       curl_easy_setopt(m_handle, CURLOPT_ERRORBUFFER, m_error_buffer.data());
       curl_easy_setopt(m_handle, CURLOPT_NOSIGNAL, 1);
@@ -91,15 +87,7 @@ public:
 
       curl_easy_setopt(m_handle, CURLOPT_NOPROGRESS, 0);
       curl_easy_setopt(m_handle, CURLOPT_XFERINFODATA, this);
-      curl_easy_setopt(m_handle, CURLOPT_XFERINFOFUNCTION,
-                       [](void* userdata,
-                          curl_off_t dltotal, curl_off_t dlnow,
-                          curl_off_t ultotal, curl_off_t ulnow)
-                       {
-                         return static_cast<Transfer*>(userdata)
-                           ->on_progress(dltotal, dlnow,
-                                         ultotal, ulnow);
-                       });
+      curl_easy_setopt(m_handle, CURLOPT_XFERINFOFUNCTION, &Transfer::on_progress_wrap);
     }
   }
 
@@ -130,7 +118,7 @@ public:
 
   size_t on_data(void* ptr, size_t size, size_t nmemb)
   {
-    return size * nmemb;;
+    return size * nmemb;
   }
 
   void on_progress(curl_off_t dltotal, curl_off_t dlnow,
@@ -144,6 +132,19 @@ public:
   }
 
 private:
+  static size_t on_data_wrap(char* ptr, size_t size, size_t nmemb, void* userdata)
+  {
+    return static_cast<Transfer*>(userdata)->on_data(ptr, size, nmemb);
+  }
+
+  static void on_progress_wrap(void* userdata,
+                               curl_off_t dltotal, curl_off_t dlnow,
+                               curl_off_t ultotal, curl_off_t ulnow)
+  {
+    return static_cast<Transfer*>(userdata)->on_progress(dltotal, dlnow, ultotal, ulnow);
+  }
+
+private:
   Transfer(const Transfer&) = delete;
   Transfer& operator=(const Transfer&) = delete;
 };