native: continue reorganizing: main.c edition

2 files changed, 96 insertions, 86 deletions

diff --git a/src/jurl.h b/src/jurl.h
index f2f6be7..b029956 100644
--- a/src/jurl.h
+++ b/src/jurl.h
@@ -55,21 +55,25 @@ JANET_CFUN(jurl_getinfo);
 // jurl.c
 JANET_CFUN(jurl_dup);
 jurl_handle *janet_getjurl(Janet *argv, int32_t n);
+JANET_CFUN(jurl_global_init);
+JANET_CFUN(jurl_global_cleanup);
 JANET_CFUN(jurl_new);
 JANET_CFUN(jurl_perform);
 JANET_CFUN(jurl_reset);
 
-// mime.c
+// mime.c - mime
 JANET_CFUN(jurl_mime_addpart);
+JANET_CFUN(jurl_mime_new);
+jurl_mime *janet_getjurlmime(Janet *argv, int32_t n);
+
+// mime.c - mimepart
 JANET_CFUN(jurl_mime_data);
 JANET_CFUN(jurl_mime_data_cb);
 JANET_CFUN(jurl_mime_encoder);
 JANET_CFUN(jurl_mime_filedata);
 JANET_CFUN(jurl_mime_filename);
-jurl_mime *janet_getjurlmime(Janet *argv, int32_t n);
 JANET_CFUN(jurl_mime_headers);
 JANET_CFUN(jurl_mime_name);
-JANET_CFUN(jurl_mime_new);
 JANET_CFUN(jurl_mime_subparts);
 JANET_CFUN(jurl_mime_type);
 
diff --git a/src/main.c b/src/main.c
index 2a7ffa9..b38d34c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,23 +6,21 @@
 #undef JANET_FN
 #define JANET_FN JANET_FN_D
 
-// jurl.c
-JANET_FN(jurl_escape,
-		"(escape string)",
-		"Returns URL-encoded version of string");
-
-JANET_FN(jurl_unescape,
-		"(unescape string)",
-		"Return URL-decoded version of string");
-
-JANET_FN(jurl_new,
-		"(new)",
-		"Create new jurl handle");
+// errors.c
+JANET_FN(jurl_strerror,
+		"(strerror :error/write-error)"
+		"\n"
+		"(strerror 1234)",
+		"Get an explanation string about a jurl error");
 
-JANET_FN(jurl_reset,
-		"(reset handle)",
-		"Reset an existing jurl handle");
+// getinfo.c
+JANET_FN(jurl_getinfo,
+		"(getinfo handle :info)"
+		"\n"
+		"(getinfo handle 1234)",
+		"Get a curl info from handle");
 
+// jurl.c
 JANET_FN(jurl_dup,
 		"(dup handle)",
 		"Duplicate an existing jurl handle");
@@ -37,45 +35,30 @@ JANET_FN(jurl_global_cleanup,
 		"(global-cleanup)",
 		"Run curl global cleanup");
 
+JANET_FN(jurl_new,
+		"(new)",
+		"Create new jurl handle");
+
 JANET_FN(jurl_perform,
 		"(perform handle)",
 		"Perform the request associated with a handle");
 
-JANET_FN(jurl_wrap_error,
-		"(wrap-error :ok body)"
-		"\n"
-		"(wrap-error :err _)",
-		"Boxes an :ok signal with a body, else the error with its explanation in string form");
-
-// jurl_errors.c
-JANET_FN(jurl_strerror,
-		"(strerror :error/write-error)"
-		"\n"
-		"(strerror 1234)",
-		"Get an explanation string about a jurl error");
-
-// jurl_getinfo.c
-JANET_FN(jurl_getinfo,
-		"(getinfo handle :info)"
-		"\n"
-		"(getinfo handle 1234)",
-		"Get a curl info from handle");
-
-// jurl_mime.c
-JANET_FN(jurl_mime_new,
-		"(mime-new)",
-		"Create a new mime form");
+JANET_FN(jurl_reset,
+		"(reset handle)",
+		"Reset an existing jurl handle");
 
+// mime.c - mime
 JANET_FN(jurl_mime_addpart,
 		"(mime-addpart mime)"
 		"\n"
 		"(:addpart mime)",
 		"Add a part to a mime form");
 
-JANET_FN(jurl_mime_name,
-		"(mime-name part string)",
-		"Set a name for the mimepart");
+JANET_FN(jurl_mime_new,
+		"(mime-new)",
+		"Create a new mime form");
 
+// mime.c - mimepart
 JANET_FN(jurl_mime_data,
 		"(mime-data part string)"
 		"\n"
@@ -86,6 +69,12 @@ JANET_FN(jurl_mime_data_cb,
 		"(mime-data-cb part datasize (fn [mode size|offset &opt position]))",
 		"Set a callback as the data source for the mimepart");
 
+JANET_FN(jurl_mime_encoder,
+		"(mime-encoder part :encoder)",
+		"Set a part to be encoded using :encoder.\n"
+		"Available encoders are:\n"
+		":binary :8bit :7bit :base64 :quoted-printable");
+
 JANET_FN(jurl_mime_filedata,
 		"(mime-filedata part \"local.file\")",
 		"Set a file as the data source for the mimepart");
@@ -94,64 +83,81 @@ JANET_FN(jurl_mime_filename,
 		"(mime-filename part \"remote.file\")",
 		"Set a custom remote filename for the upload mimepart");
 
-JANET_FN(jurl_mime_type,
-		"(mime-type part \"image/png\")",
-		"Set a custom mimetype for the mimepart");
-
 JANET_FN(jurl_mime_headers,
 		"(mime-headers part [headers...])",
 		"Set custom headers for the mimepart");
 
-JANET_FN(jurl_mime_encoder,
-		"(mime-encoder part :encoder)",
-		"Set a part to be encoded using :encoder.\n"
-		"Available encoders are:\n"
-		":binary :8bit :7bit :base64 :quoted-printable");
+JANET_FN(jurl_mime_name,
+		"(mime-name part string)",
+		"Set a name for the mimepart");
 
 JANET_FN(jurl_mime_subparts,
 		"(mime-attach mime part)",
 		"Attach mime to part as a subpart mime");
 
-// jurl_setopt.c
+JANET_FN(jurl_mime_type,
+		"(mime-type part \"image/png\")",
+		"Set a custom mimetype for the mimepart");
+
+// setopt.c
 JANET_FN(jurl_setopt,
 		"(setopt handle :option value)"
 		"\n"
 		"(setopt handle 1234 value)",
 		"Set a curl option in a handle");
 
+// util.c
+JANET_FN(jurl_escape,
+		"(escape string)",
+		"Returns URL-encoded version of string");
+
+JANET_FN(jurl_unescape,
+		"(unescape string)",
+		"Return URL-decoded version of string");
+
+JANET_FN(jurl_wrap_error,
+		"(wrap-error :ok body)"
+		"\n"
+		"(wrap-error :err _)",
+		"Boxes an :ok signal with a body, else the error with its explanation in string form");
+
 static const JanetRegExt cfuns[] = {
+	// errors.c
+	JANET_REG("strerror", jurl_strerror), // (strerror :ok)
+	
+	// getinfo.c
+	JANET_REG("getinfo", jurl_getinfo), // (getinfo handle :tag), (get handle :tag), (:getinfo handle :tag)
+	
 	// jurl.c
-	JANET_REG("escape", jurl_escape),
-	JANET_REG("unescape", jurl_unescape),
-	JANET_REG("new", jurl_new),
-	JANET_REG("reset", jurl_reset),
-	JANET_REG("dup", jurl_dup),
-	JANET_REG("global-init", jurl_global_init),
-	JANET_REG("global-cleanup", jurl_global_cleanup),
-	JANET_REG("perform", jurl_perform),
-	JANET_REG("wrap-error", jurl_wrap_error),
-
-	// jurl_errors.c
-	JANET_REG("strerror", jurl_strerror),
-
-	// jurl_getinfo.c
-	JANET_REG("getinfo", jurl_getinfo),
-
-	// jurl_mime.c
-	JANET_REG("mime-new", jurl_mime_new),
-	JANET_REG("mime-addpart", jurl_mime_addpart),
-	JANET_REG("mime-name", jurl_mime_name),
-	JANET_REG("mime-data", jurl_mime_data),
-	JANET_REG("mime-data-cb", jurl_mime_data_cb),
-	JANET_REG("mime-filedata", jurl_mime_filedata),
-	JANET_REG("mime-filename", jurl_mime_filename),
-	JANET_REG("mime-type", jurl_mime_type),
-	JANET_REG("mime-headers", jurl_mime_headers),
-	JANET_REG("mime-encoder", jurl_mime_encoder),
-	JANET_REG("mime-attach", jurl_mime_subparts),
-
-	// jurl_setopt.c
-	JANET_REG("setopt", jurl_setopt),
+	JANET_REG("dup",            jurl_dup),            // (:dup handle), (dup handle)
+	JANET_REG("global-init",    jurl_global_init),    // (global-init :tag?)
+	JANET_REG("global-cleanup", jurl_global_cleanup), // (global-cleanup)
+	JANET_REG("new",            jurl_new),            // (new)
+	JANET_REG("perform",        jurl_perform),        // (:perform handle), (perform handle)
+	JANET_REG("reset",          jurl_reset),          // (:reset handle), (reset handle)
+
+	// mime.c - mime
+	JANET_REG("addpart",  jurl_mime_addpart), // (:addpart mime), (addpart mime)
+	JANET_REG("new-mime", jurl_mime_new),     // (new-mime)
+
+	// mime.c - mimepart
+	JANET_REG("mime-data",     jurl_mime_data),     // (mime-data part data)
+	JANET_REG("mime-data-cb",  jurl_mime_data_cb),  // (mime-data-cb part cb)
+	JANET_REG("mime-encoder",  jurl_mime_encoder),  // (mime-encoder part encoder)
+	JANET_REG("mime-filedata", jurl_mime_filedata), // (mime-filedata part fdata)
+	JANET_REG("mime-filename", jurl_mime_filename), // (mime-filename part fname)
+	JANET_REG("mime-name",     jurl_mime_name),     // (mime-name part name)
+	JANET_REG("mime-subparts", jurl_mime_subparts), // (mime-subparts part mime)
+	JANET_REG("mime-type",     jurl_mime_type),     // (mime-type part type)
+
+	// setopt.c
+	JANET_REG("setopt", jurl_setopt), // (put handle :tag val), (:setopt handle :tag val), (setopt handle :tag val)
+
+	// util.c
+	JANET_REG("escape",     jurl_escape),     // (escape string)
+	JANET_REG("unescape",   jurl_unescape),   // (unescape string)
+	JANET_REG("wrap-error", jurl_wrap_error), // (wrap-error :tag)
+
 	JANET_REG_END,
 };