Interim windows build fix

[flightgear.git] / src / Scripting / NasalHTTP.cxx

diff --git a/src/Scripting/NasalHTTP.cxx b/src/Scripting/NasalHTTP.cxx
index fb29bc924e94df605603005c32ef99cd961c7da8..637e3a3ac07b2e7588190c5d83306257bafa856f 100644 (file)
--- a/src/Scripting/NasalHTTP.cxx
+++ b/src/Scripting/NasalHTTP.cxx
@@ -48,10 +48,12 @@ FGHTTPClient& requireHTTPClient(naContext c)
 }
 
 /**
- * urlretrieve(url, filename)
+ * http.save(url, filename)
  */
-static naRef f_urlretrieve(const nasal::CallContext& ctx)
+static naRef f_http_save(const nasal::CallContext& ctx)
 {
+  const std::string url = ctx.requireArg<std::string>(0);
+
   // Check for write access to target file
   const std::string filename = ctx.requireArg<std::string>(1);
   const std::string validated_path = fgValidatePath(filename, true);
@@ -63,33 +65,24 @@ static naRef f_urlretrieve(const nasal::CallContext& ctx)
 
   return ctx.to_nasal
   (
-    requireHTTPClient(ctx.c).client()
-    ->urlretrieve
-    (
-      ctx.requireArg<std::string>(0), // url
-      validated_path                  // filename
-    )
+    requireHTTPClient(ctx.c).client()->save(url, validated_path)
   );
 }
 
 /**
- * urlload(url)
+ * http.load(url)
  */
-static naRef f_urlload(const nasal::CallContext& ctx)
+static naRef f_http_load(const nasal::CallContext& ctx)
 {
-  return ctx.to_nasal
-  (
-    requireHTTPClient(ctx.c).client()
-    ->urlload
-    (
-      ctx.requireArg<std::string>(0) // url
-    )
-  );
+  const std::string url = ctx.requireArg<std::string>(0);
+  return ctx.to_nasal( requireHTTPClient(ctx.c).client()->load(url) );
 }
 
+//------------------------------------------------------------------------------
 naRef initNasalHTTP(naRef globals, naContext c)
 {
   using simgear::HTTP::Request;
+  typedef Request* (Request::*HTTPCallback)(const Request::Callback&);
   NasalRequest::init("http.Request")
     .member("url", &Request::url)
     .member("method", &Request::method)
@@ -102,9 +95,9 @@ naRef initNasalHTTP(naRef globals, naContext c)
     .member("reason", &Request::responseReason)
     .member("readyState", &Request::readyState)
     .method("abort", static_cast<void (Request::*)()>(&Request::abort))
-    .method("done", &Request::done)
-    .method("fail", &Request::fail)
-    .method("always", &Request::always);
+    .method("done", static_cast<HTTPCallback>(&Request::done))
+    .method("fail", static_cast<HTTPCallback>(&Request::fail))
+    .method("always", static_cast<HTTPCallback>(&Request::always));
 
   using simgear::HTTP::FileRequest;
   NasalFileRequest::init("http.FileRequest")
@@ -114,12 +107,12 @@ naRef initNasalHTTP(naRef globals, naContext c)
   NasalMemoryRequest::init("http.MemoryRequest")
     .bases<NasalRequest>()
     .member("response", &MemoryRequest::responseBody);
-
+    
   nasal::Hash globals_module(globals, c),
               http = globals_module.createHash("http");
 
-  http.set("urlretrieve", f_urlretrieve);
-  http.set("urlload", f_urlload);
+  http.set("save", f_http_save);
+  http.set("load", f_http_load);
 
   return naNil();
 }