From d24450448eb6c6934be4a5e2f514dcc546cb4289 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Wed, 30 Nov 2016 09:26:50 -0800
Subject: [PATCH] Cleanup

---
 book.c | 26 +++++++++++++-------------
 book.h | 18 +++++++++---------
 main.c |  2 +-
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/book.c b/book.c
index fd31505..3559196 100644
--- a/book.c
+++ b/book.c
@@ -91,15 +91,15 @@ static char* book_read(EB_Book* book, EB_Hookset* hookset, const EB_Position* po
     return result;
 }
 
-static Book_Content book_read_content(EB_Book* book, EB_Hookset* hookset, const EB_Position* position, Book_Mode mode, const Font_Table* table) {
-    Book_Content content = {};
-    content.text = book_read(book, hookset, position, mode, table);
-    content.page = position->page;
-    content.offset = position->offset;
-    return content;
+static Book_Block book_read_content(EB_Book* book, EB_Hookset* hookset, const EB_Position* position, Book_Mode mode, const Font_Table* table) {
+    Book_Block block = {};
+    block.text = book_read(book, hookset, position, mode, table);
+    block.page = position->page;
+    block.offset = position->offset;
+    return block;
 }
 
-static void entry_encode(Book_Entry* entry, json_t* entry_json) {
+static void entry_encode(json_t* entry_json, Book_Entry* entry) {
     json_object_set_new(entry_json, "heading", json_string(entry->heading.text));
     /* json_object_set_new(entry_json, "headingPage", json_integer(entry->heading.page)); */
     /* json_object_set_new(entry_json, "headingOffset", json_integer(entry->heading.offset)); */
@@ -109,7 +109,7 @@ static void entry_encode(Book_Entry* entry, json_t* entry_json) {
     /* json_object_set_new(entry_json, "textOffset", json_integer(entry->text.offset)); */
 }
 
-static void subbok_encode(Book_Subbook* subbook, json_t* subbook_json) {
+static void subbook_encode(json_t* subbook_json, const Book_Subbook* subbook) {
     if (subbook->title != NULL) {
         json_object_set_new(subbook_json, "title", json_string(subbook->title));
     }
@@ -123,21 +123,21 @@ static void subbok_encode(Book_Subbook* subbook, json_t* subbook_json) {
     json_t* entry_json_array = json_array();
     for (int i = 0; i < subbook->entry_count; ++i) {
         json_t* entry_json = json_object();
-        entry_encode(subbook->entries + i, entry_json);
+        entry_encode(entry_json, subbook->entries + i);
         json_array_append_new(entry_json_array, entry_json);
     }
 
     json_object_set_new(subbook_json, "entries", entry_json_array);
 }
 
-static void book_encode(Book* book, json_t* book_json) {
+static void book_encode(json_t* book_json, const Book* book) {
     json_object_set_new(book_json, "charCode", json_string(book->char_code));
     json_object_set_new(book_json, "discCode", json_string(book->disc_code));
 
     json_t* subbook_json_array = json_array();
     for (int i = 0; i < book->subbook_count; ++i) {
         json_t* subbook_json = json_object();
-        subbok_encode(book->subbooks + i, subbook_json);
+        subbook_encode(subbook_json, book->subbooks + i);
         json_array_append_new(subbook_json_array, subbook_json);
     }
 
@@ -228,9 +228,9 @@ void book_free(Book* book) {
     memset(book, 0, sizeof(Book));
 }
 
-bool book_dump(Book* book, bool pretty_print, FILE* fp) {
+bool book_dump(FILE* fp, const Book* book, bool pretty_print) {
     json_t* book_json = json_object();
-    book_encode(book, book_json);
+    book_encode(book_json, book);
 
     char* output = json_dumps(book_json, pretty_print ? JSON_INDENT(4) : JSON_COMPACT);
     if (output != NULL) {
diff --git a/book.h b/book.h
index 3bc8f4e..3745c6c 100644
--- a/book.h
+++ b/book.h
@@ -32,19 +32,19 @@ typedef struct {
     char* text;
     int   page;
     int   offset;
-} Book_Content;
+} Book_Block;
 
 typedef struct {
-    Book_Content heading;
-    Book_Content text;
+    Book_Block heading;
+    Book_Block text;
 } Book_Entry;
 
 typedef struct {
-    char*        title;
-    Book_Content copyright;
-    Book_Entry*  entries;
-    int          entry_count;
-    int          entry_alloc;
+    char*       title;
+    Book_Block  copyright;
+    Book_Entry* entries;
+    int         entry_count;
+    int         entry_alloc;
 } Book_Subbook;
 
 typedef struct {
@@ -61,6 +61,6 @@ typedef struct {
 void book_init(Book* book);
 void book_free(Book* book);
 bool book_export(Book* book, const Font_Context* context, const char path[], bool markup);
-bool book_dump(Book* book, bool pretty_print, FILE* fp);
+bool book_dump(FILE* fp, const Book* book, bool pretty_print);
 
 #endif /* BOOK_H */
diff --git a/main.c b/main.c
index 2b68fd4..a829468 100644
--- a/main.c
+++ b/main.c
@@ -109,7 +109,7 @@ int main(int argc, char *argv[]) {
 
     const bool success =
         book_export(&book, &context, options.dict_path, options.markup) &&
-        book_dump(&book, options.pretty_print, stdout);
+        book_dump(stdout, &book, options.pretty_print);
 
     book_free(&book);