wip

Author: rdw-software

Runtime/Bindings/FFI/curl/curl.lua

@@ -355,7 +355,7 @@ struct static_curl_exports_table {
 	CURLcode (*curl_easy_recv)(CURL* handle, void* buffer, size_t buflen, size_t* n);
 	void (*curl_easy_reset)(CURL* handle);
 	CURLcode (*curl_easy_send)(CURL* handle, const void* buffer, size_t buflen, size_t* n);
-	CURLcode (*curl_easy_setopt)(CURL* handle, const struct curl_easyoption* option, va_list);
+	CURLcode (*curl_easy_setopt)(CURL* handle, const struct curl_easyoption* option, ...);
 	CURLcode (*curl_easy_ssls_import)(CURL* handle,
 		const char* session_key,
 		const unsigned char* shmac,
@@ -443,7 +443,7 @@ function curl.initialize()
 		return curl.curl_easy_header(self, ...)
 	end
 	-- function easy:init(...)
-		-- return curl.curl_easy_init(self, ...)
+	-- return curl.curl_easy_init(self, ...)
 	-- end
 
 	function easy:nextheader(...)

Runtime/Bindings/FFI/curl/curl_ffi.hpp

@@ -6,11 +6,6 @@
 typedef CURLU* url_ptr_t;
 typedef const CURLU* url_cptr_t;
 
-extern "C" {
-	#include "curl_exports.h"
-}
-
-
 // typedef enum {
 // 	/* This is the FILE * or void * the regular output should be written to. */
 // 	CURLOPT(CURLOPT_WRITEDATA, CURLOPTTYPE_CBPOINT, 1),
@@ -1129,6 +1124,8 @@ extern "C" {
 // 	CURLOPT_LASTENTRY /* the last unused */
 //   } CURLoption;
 
+#include "curl_exports.h"
+
 namespace curl_ffi {
 	void* getExportsTable();
 }

Tests/SmokeTests/bdd-library/test-start-runner.lua

@@ -389,9 +389,7 @@ local function testSetupTeardownHookNestingCase()
 	_G.CALLSTACK = nil -- Is it a crime if there aren't any witnesses?
 end
 
-function testInvalidErrorDetailsAfterThrownException()
-
-end
+function testInvalidErrorDetailsAfterThrownException() end
 
 local function testStartTestRunner()
 	testNoFilesCase()