alex/zero-epwing
1
Fork 0
Code Releases Activity

WIP

Browse Source
This commit is contained in:
Alex Yatskov 2016-11-20 17:49:50 -08:00
parent f6a10aecc2
commit 3aeee4b0ee
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gaiji.c
View File

@ -105,7 +105,7 @@ static void encode_sequence(char output[], int size, const char utf8[]) {
* Exported functions * Exported functions
*/ */
const Gaiji_Context* gaiji_select_context(const char name[]) { const Gaiji_Context* gaiji_context_select(const char name[]) {
for (unsigned i = 0; i < ARRSIZE(gaiji_contexts); ++i) { for (unsigned i = 0; i < ARRSIZE(gaiji_contexts); ++i) {
const Gaiji_Context* context = gaiji_contexts + i; const Gaiji_Context* context = gaiji_contexts + i;
if (strcmp(context->name, name) == 0) { if (strcmp(context->name, name) == 0) {
@ -116,7 +116,7 @@ const Gaiji_Context* gaiji_select_context(const char name[]) {
return NULL; return NULL;
} }
void gaiji_build_stub(char output[], int size, int code, const Gaiji_Context* context, Gaiji_Width width) { void gaiji_stub_encode(char output[], int size, int code, const Gaiji_Context* context, Gaiji_Width width) {
do { do {
if (context == NULL) { if (context == NULL) {
break; break;
@ -153,7 +153,7 @@ void gaiji_build_stub(char output[], int size, int code, const Gaiji_Context* co
output[size - 1] = 0; output[size - 1] = 0;
} }
void gaiji_fixup_stub(char output[], int size, const char input[]) { void gaiji_stub_decode(char output[], int size, const char input[]) {
const char* ptr_in = input; const char* ptr_in = input;
char* ptr_out = output; char* ptr_out = output;
bool decode = false; bool decode = false;

10
gaiji.h
View File

@ -23,8 +23,8 @@
* Constants * Constants
*/ */
#define MAX_UTF8_BYTES 9 #define MAX_UTF8_BYTES 9
#define MAX_STUB_BYTES 32 #define MAX_STUB_BYTES 32
#define MAX_CONTEXT_NAME 256 #define MAX_CONTEXT_NAME 256
/* /*
@ -53,8 +53,8 @@ typedef enum {
* Functions * Functions
*/ */
const Gaiji_Context* gaiji_select_context(const char name[]); const Gaiji_Context* gaiji_context_select(const char name[]);
void gaiji_build_stub(char output[], int size, int code, const Gaiji_Context* context, Gaiji_Width width); void gaiji_stub_encode(char output[], int size, int code, const Gaiji_Context* context, Gaiji_Width width);
void gaiji_fixup_stub(char output[], int size, const char input[]); void gaiji_stub_decode(char output[], int size, const char input[]);
#endif /* GAIJI_H */ #endif /* GAIJI_H */

4
hooks.c
View File

@ -107,7 +107,7 @@ static EB_Error_Code hook_narrow_font( /* EB_HOOK_NARROW_FONT */
assert(argc > 0); assert(argc > 0);
char stub[MAX_STUB_BYTES]; char stub[MAX_STUB_BYTES];
gaiji_build_stub(stub, ARRSIZE(stub), argv[0], container, GAIJI_WIDTH_NARROW); gaiji_stub_encode(stub, ARRSIZE(stub), argv[0], container, GAIJI_WIDTH_NARROW);
eb_write_text_string(book, stub); eb_write_text_string(book, stub);
return 0; return 0;
@ -126,7 +126,7 @@ static EB_Error_Code hook_wide_font( /* EB_HOOK_WIDE_FONT */
assert(argc > 0); assert(argc > 0);
char stub[MAX_STUB_BYTES]; char stub[MAX_STUB_BYTES];
gaiji_build_stub(stub, ARRSIZE(stub), argv[0], container, GAIJI_WIDTH_WIDE); gaiji_stub_encode(stub, ARRSIZE(stub), argv[0], container, GAIJI_WIDTH_WIDE);
eb_write_text_string(book, stub); eb_write_text_string(book, stub);
return 0; return 0;

2
main.c
View File

@ -79,7 +79,7 @@ static void export_subbook(Subbook* subbook, EB_Book* eb_book, EB_Hookset* eb_ho
char title[EB_MAX_TITLE_LENGTH + 1]; char title[EB_MAX_TITLE_LENGTH + 1];
if (eb_subbook_title(eb_book, title) == EB_SUCCESS) { if (eb_subbook_title(eb_book, title) == EB_SUCCESS) {
subbook->title = eucjp_to_utf8(title); subbook->title = eucjp_to_utf8(title);
context = *gaiji_select_context(subbook->title); context = *gaiji_context_select(subbook->title);
} }
if (eb_have_copyright(eb_book)) { if (eb_have_copyright(eb_book)) {

2
util.c
View File

@ -124,7 +124,7 @@ char* read_book_data(EB_Book* book, EB_Hookset* hookset, Gaiji_Context* context,
return NULL; return NULL;
} }
gaiji_fixup_stub(result, strlen(result) + 1, result); gaiji_stub_decode(result, strlen(result) + 1, result);
return result; return result;
} }