C++11 and whitespace cleanups.

[dcpomatic.git] / src / lib / internet.cc

diff --git a/src/lib/internet.cc b/src/lib/internet.cc
index 4fb6c7cb3132132c255042273f631a8e17bfb628..c0c8232eef6b13e3c3f843f0c28e451dcf6ff1cf 100644 (file)
--- a/src/lib/internet.cc
+++ b/src/lib/internet.cc
@@ -19,10 +19,10 @@
 */
 
 
-#include "scoped_temporary.h"
 #include "compose.hpp"
-#include "exceptions.h"
 #include "cross.h"
+#include "exceptions.h"
+#include "scoped_temporary.h"
 #include "util.h"
 #include <curl/curl.h>
 #include <zip.h>
@@ -37,8 +37,8 @@
 using std::function;
 using std::list;
 using std::string;
-using boost::optional;
 using boost::algorithm::trim;
+using boost::optional;
 
 
 static size_t
@@ -66,7 +66,7 @@ ls_url (string url)
        auto const cr = curl_easy_perform (curl);
 
        if (cr != CURLE_OK) {
-               return list<string>();
+               return {};
        }
 
        list<string> result;
@@ -126,14 +126,14 @@ get_from_url (string url, bool pasv, bool skip_pasv_ip, ScopedTemporary& temp)
 
 
 optional<string>
-get_from_url (string url, bool pasv, bool skip_pasv_ip, function<optional<string> (boost::filesystem::path)> load)
+get_from_url (string url, bool pasv, bool skip_pasv_ip, function<optional<string> (boost::filesystem::path, string)> load)
 {
        ScopedTemporary temp;
        auto e = get_from_url (url, pasv, skip_pasv_ip, temp);
        if (e) {
                return e;
        }
-       return load (temp.file());
+       return load (temp.file(), url);
 }
 
 
@@ -142,7 +142,7 @@ get_from_url (string url, bool pasv, bool skip_pasv_ip, function<optional<string
  *  @param load Function passed a (temporary) filesystem path of the unpacked file.
  */
 optional<string>
-get_from_zip_url (string url, string file, bool pasv, bool skip_pasv_ip, function<optional<string> (boost::filesystem::path)> load)
+get_from_zip_url (string url, string file, bool pasv, bool skip_pasv_ip, function<optional<string> (boost::filesystem::path, string)> load)
 {
        /* Download the ZIP file to temp_zip */
        ScopedTemporary temp_zip;
@@ -199,5 +199,5 @@ get_from_zip_url (string url, string file, bool pasv, bool skip_pasv_ip, functio
        zip_close (zip);
        temp_cert.close ();
 
-       return load (temp_cert.file());
+       return load (temp_cert.file(), url);
 }