request not inline any more

1 files changed, 4 insertions, 155 deletions

diff --git a/request.h b/request.h
index 11444de..b8752c0 100644
--- a/request.h
+++ b/request.h
@@ -1,17 +1,7 @@
-#ifndef ICCLIENT_REQUEST_H
-#define ICCLIENT_REQUEST_H
+#ifndef REQUEST_H
+#define REQUEST_H
 
-#if defined __ANDROID__ && defined DEBUG
-#include <android/log.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#ifndef __EMSCRIPTEN__
-#include <threads.h>
-#include <curl/curl.h>
-#endif
+#include <stddef.h>
 #include "icclient/typedefs.h"
 
 struct body {
@@ -22,147 +12,6 @@ struct body {
 	} pairs[16];
 };
 
-#ifndef __EMSCRIPTEN__
-extern char *sampleurl;
-extern char *certificate;
-size_t append(char *, size_t, size_t, icclient_response *);
-#endif
-
-static inline void request(void (*handler)(icclient_response *), void (*callback)(void *), struct body *body, char *fmt, ...)
-{
-	va_list ap;
-	char *p, *sval;
-	unsigned int ival;
-	size_t length =
-#ifndef __EMSCRIPTEN__
-		strlen(sampleurl) +
-#endif
-		strlen(fmt);
-
-	va_start(ap, fmt);
-	for (p = fmt; *p; p++) {
-		if (*p != '%')
-			continue;
-		switch(*++p) {
-			case 's':
-				sval = va_arg(ap, char *);
-				length += strlen(sval) - 2;
-				break;
-			case 'd':
-				ival = va_arg(ap, unsigned int);
-				do {
-					length++;
-				} while ((ival /= 10));
-				length -= 2;
-				break;
-			default:
-				break;
-		}
-	}
-	va_end(ap);
-
-	char url[length + 1];
-#ifdef __EMSCRIPTEN__
-	memset(url, '\0', length + 1);
-#else
-	strcpy(url, sampleurl);
-#endif
-
-	va_start(ap, fmt);
-	for (p = fmt; *p; p++) {
-		if (*p != '%')
-			continue;
-		switch(*++p) {
-			case 's':
-				sval = va_arg(ap, char *);
-				strcat(url, sval);
-				break;
-			case 'd':
-				ival = va_arg(ap, unsigned int);
-				sprintf(url, "%s%d", url, ival);
-				break;
-			default:
-				break;
-		}
-	}
-	va_end(ap);
-
-#ifdef __EMSCRIPTEN__
-	emscripten_fetch_attr_t attr;
-	emscripten_fetch_attr_init(&attr);
-	attr.attributes = EMSCRIPTEN_FETCH_LOAD_TO_MEMORY;
-	if (handler)
-		attr.onsuccess = handler;
-	if (body) {
-		size_t length = 0;
-		char *post = malloc(1);
-		memset(post, '\0', 1);
-		for (size_t i = 0; i < body->num_pairs; i++) {
-			struct pair pair = body->pairs[i];
-			if (!pair.value)
-				continue;
-			length += strlen(pair.key) + strlen(pair.value) + (i ? 1 : 0) + 1;
-			post = realloc(post, length + 1);
-			if (i)
-				strcat(post, "&");
-			sprintf(post, "%s%s=%s", post, pair.key, pair.value);
-		}
-		strcpy(attr.requestMethod, "POST");
-		const char *headers[] = { "Content-Type", "application/x-www-form-urlencoded", NULL };
-		attr.requestHeaders = headers;
-		attr.requestData = post;
-		attr.requestDataSize = length + 1;
-		attr.userData = post;
-	} else {
-		strcpy(attr.requestMethod, "GET");
-		attr.userData = callback;
-	}
-	emscripten_fetch(&attr, url);
-#else
-	CURL *curl = curl_easy_init();
-	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
-	curl_easy_setopt(curl, CURLOPT_COOKIEFILE, "");
-	if (certificate)
-		curl_easy_setopt(curl, CURLOPT_CAINFO, certificate);
-#ifdef DEBUG
-	curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
-#endif
-	curl_easy_setopt(curl, CURLOPT_URL, url);
-	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, append);
-	icclient_response response = { .userData = callback, .numBytes = 0 };
-	curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
-	struct curl_httppost *post, *last = NULL;
-	if (body) {
-		for (size_t i = 0; i < body->num_pairs; i++) {
-			struct pair pair = body->pairs[i];
-			if (!pair.value)
-				continue;
-			curl_formadd(&post, &last,
-					CURLFORM_COPYNAME, pair.key,
-					CURLFORM_PTRCONTENTS, pair.value,
-					CURLFORM_END);
-		}
-		last = NULL;
-		curl_easy_setopt(curl, CURLOPT_HTTPPOST, post);
-	} else
-		curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
-	CURLcode res = curl_easy_perform(curl);
-	if (post)
-		curl_formfree(post);
-	if (res == CURLE_OK && handler)
-		handler(&response);
-#ifdef DEBUG
-	else {
-		const char *error = curl_easy_strerror(res);
-#ifdef __ANDROID__
-		__android_log_print(ANDROID_LOG_ERROR, "libicclient.so", "%s", error);
-#else
-		fprintf(stderr, "%s\n", error);
-#endif
-	}
-#endif
-	curl_easy_cleanup(curl);
-#endif
-}
+void request(void (*)(icclient_response *), void (*)(void *), struct body *, char *, ...);
 
 #endif