Replace struct body with const char *[][2]

1 files changed, 62 insertions, 56 deletions

diff --git a/admin.c b/admin.c
index 7ce6ad2..fec0fcd 100644
--- a/admin.c
+++ b/admin.c
@@ -16,75 +16,81 @@ void interchange_admin_login(const char *username, const char *password,
 			failpage, handler, (void (*)(void *))callback);
 }
 
-void interchange_admin_new_admin(const char *username, const char *password, const char *name, bool super,
-		enum interchange_admin_group group, void (*handler)(interchange_response *))
+void interchange_admin_new_admin(const char *username, const char *password,
+		const char *name, bool super,
+		enum interchange_admin_group group,
+		void (*handler)(interchange_response *))
 {
-	request(handler, NULL, &(struct body){ 13, {
-		{ "mv_todo", "set" },
-		{ "mv_data_table", "access" },
-		{ "mv_data_key", "username" },
-		{ "mv_update_empty", "1" },
-		{ "mv_data_fields", "username password name super groups" },
-		{ "mv_click", "process_filter" },
-		{ "user_id", "NEW" },
-		{ "name", name },
-		{ "mv_data_function", "insert" },
-		{ "username", username },
-		{ "password", password },
-		{ "super", super ? "1" : "0" },
-		{ "groups", group == INTERCHANGE_ADMIN_GROUP_CONTENT ? ":CONTENT"
-		: group == INTERCHANGE_ADMIN_GROUP_MERCH ? ":MERCH" : ":ORDERS" }
-	}}, "%s", "ui");
+	request(handler, NULL, (const char *[][2]){
+		"mv_todo", "set",
+		"mv_data_table", "access",
+		"mv_data_key", "username",
+		"mv_update_empty", "1",
+		"mv_data_fields", "username password name super groups",
+		"mv_click", "process_filter",
+		"user_id", "NEW",
+		"name", name,
+		"mv_data_function", "insert",
+		"username", username,
+		"password", password,
+		"super", super ? "1" : "0",
+		"groups", group == INTERCHANGE_ADMIN_GROUP_CONTENT ? ":CONTENT"
+		: group == INTERCHANGE_ADMIN_GROUP_MERCH ? ":MERCH" : ":ORDERS"
+	}, "%s", "ui");
 }
 
-void interchange_admin_new_item(const char *description, const char *comment, const char *price,
-		const char *image_path, void (*handler)(interchange_response *))
+void interchange_admin_new_item(const char *description, const char *comment,
+		const char *price, const char *image_path,
+		void (*handler)(interchange_response *))
 {
-	request(handler, NULL, &(struct body){ 15, {
-		{ "mv_click", "process_filter" },
-		{ "mv_data_fields", "sku description prod_group category comment inactive price wholesale"
-						"image thumb image_large weight nontaxable gift_cert" },
-		{ "mv_ui", "1" },
-		{ "ui_new_item", "1" },
-		{ "mv_todo", "set" },
-		{ "mv_update_empty", "1" },
-		{ "mv_action", "set" },
-		{ "mv_data_table", "products" },
-		{ "mv_data_function", "insert" },
-		{ "mv_data_key", "sku" },
-		{ "mv_return_table", "products" },
-		{ "sku", image_path },
-		{ "description", description },
-		{ "comment", comment },
-		{ "price", price }
+	request(handler, NULL, (const char *[][2]){
+		"mv_click", "process_filter",
+		"mv_data_fields",
+		"sku description prod_group category comment inactive price "
+		"wholesale image thumb image_large weight nontaxable gift_cert",
+		"mv_ui", "1",
+		"ui_new_item", "1",
+		"mv_todo", "set",
+		"mv_update_empty", "1",
+		"mv_action", "set",
+		"mv_data_table", "products",
+		"mv_data_function", "insert",
+		"mv_data_key", "sku",
+		"mv_return_table", "products",
+		"sku", image_path,
+		"description", description,
+		"comment", comment,
+		"price", price,
 		/*
-		{ "image",
+		"image",
 		CURLFORM_FILE, image_path,
-		CURLFORM_CONTENTTYPE, "image/jpeg" },
-		{ "mv_data_file_field", "image" },
-		{ "mv_data_file_path", "images/items" }
+		CURLFORM_CONTENTTYPE, "image/jpeg",
+		"mv_data_file_field", "image",
+		"mv_data_file_path", "images/items"
 		*/
-	}}, "%s", "admin/item_edit");
+		NULL
+	}, "%s", "admin/item_edit");
 }
 
 void interchange_admin_new_transaction(const struct interchange_ord_order *order,
 		const struct interchange_member *member, bool new_customer_id,
 		void (*handler)(interchange_response *))
 {
-	request(handler, NULL, &(struct body){ 12, {
-		{ "mv_values_space", "order_entry" },
-		{ "order_desk_entry", "1" },
-		{ "customer_id", member->username },
-		{ "new_customer_id", new_customer_id ? "1" : "0" },
-		{ "fname", member->fname },
-		{ "lname", member->lname },
-		{ "address1", member->address1 },
-		{ "city", member->city },
-		{ "zip", member->zip },
-		{ "email", member->email },
-		{ "country", member->country },
-		{ "phone_day", member->phone_day }
-	}}, "%s", "process");
+	request(handler, NULL, (const char *[][2]){
+		"mv_values_space", "order_entry",
+		"order_desk_entry", "1",
+		"customer_id", member->username,
+		"new_customer_id", new_customer_id ? "1" : "0",
+		"fname", member->fname,
+		"lname", member->lname,
+		"address1", member->address1,
+		"city", member->city,
+		"zip", member->zip,
+		"email", member->email,
+		"country", member->country,
+		"phone_day", member->phone_day,
+		NULL
+	}, "%s", "process");
 }
 
 void interchange_admin_logout()