Assorted C++11/formatting cleanups.

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

diff --git a/src/lib/internet.cc b/src/lib/internet.cc
index b993117bb5e93cc3b58e77264c7dcd3ce0b14f79..943363d1a67da48109f246ed3b900c5e23312135 100644 (file)
--- a/src/lib/internet.cc
+++ b/src/lib/internet.cc
@@ -119,24 +119,25 @@ get_from_url (string url, bool pasv, bool skip_pasv_ip, ScopedTemporary& temp)
        return optional<string>();
 }
 
+
 optional<string>
-get_from_url (string url, bool pasv, bool skip_pasv_ip, function<void (boost::filesystem::path)> load)
+get_from_url (string url, bool pasv, bool skip_pasv_ip, function<optional<string> (boost::filesystem::path)> load)
 {
        ScopedTemporary temp;
        optional<string> e = get_from_url (url, pasv, skip_pasv_ip, temp);
        if (e) {
                return e;
        }
-       load (temp.file());
-       return optional<string>();
+       return load (temp.file());
 }
 
+
 /** @param url URL of ZIP file.
  *  @param file Filename within ZIP file.
  *  @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<void (boost::filesystem::path)> load)
+get_from_zip_url (string url, string file, bool pasv, bool skip_pasv_ip, function<optional<string> (boost::filesystem::path)> load)
 {
        /* Download the ZIP file to temp_zip */
        ScopedTemporary temp_zip;
@@ -193,6 +194,5 @@ get_from_zip_url (string url, string file, bool pasv, bool skip_pasv_ip, functio
        zip_close (zip);
        temp_cert.close ();
 
-       load (temp_cert.file ());
-       return optional<string> ();
+       return load (temp_cert.file());
 }