Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support logger without variable argument list #276

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+64 −0
Open

Support logger without variable argument list #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ce907d
Accept logger without variable argument list
school510587 Jul 22, 2017
809debc
Test chewing_set_logger2 with NULL parameters
school510587 Jul 22, 2017
016873b
Rename chewing_set_logger2 to chewing_set_logger_without_varglist
school510587 Aug 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions include/chewingio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,9 @@ CHEWING_API int chewing_get_phoneSeqLen(const ChewingContext *ctx);
CHEWING_API void chewing_set_logger(ChewingContext *ctx,
void (*logger) (void *data, int level, const char *fmt, ...), void *data);

CHEWING_API void chewing_set_logger_without_varglist(ChewingContext *ctx,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The suffix without_varglist is too long. I would expected to revise the use of API instead.

void (*logger2) (void *data, int level, const char *msg), void *data);

CHEWING_API int chewing_userphrase_enumerate(ChewingContext *ctx);

CHEWING_API int chewing_userphrase_has_next(ChewingContext *ctx, unsigned int *phrase_len, unsigned int *bopomofo_len);
Expand Down
58 changes: 58 additions & 0 deletions src/chewingio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,29 @@ static void chooseCandidate(ChewingContext *ctx, int toSelect, int key_buf_curso
}
}

typedef struct {
void (*logger) (void *data, int level, const char *msg);
void *data;
} Data4NoVarArgListLogger;

static void Logger4NoVarArgList(void *data, int level, const char *fmt, ...)
{
Data4NoVarArgListLogger *all_data = (Data4NoVarArgListLogger*)data;
char *msg;
int sz;
va_list vl;

va_start(vl, fmt);
sz = vsnprintf(NULL, 0, fmt, vl);
if (sz > 0) {
msg = ALC(char, sz + 1);
vsnprintf(msg, sz + 1, fmt, vl);
all_data->logger(all_data->data, level, msg);
free(msg);
}
va_end(vl);
}

static void NullLogger(void *data UNUSED, int level UNUSED, const char *fmt UNUSED, ...)
{
}
Expand Down Expand Up @@ -394,6 +417,8 @@ CHEWING_API void chewing_delete(ChewingContext *ctx)
TerminateUserphrase(ctx->data);
TerminateTree(ctx->data);
TerminateDict(ctx->data);
if (ctx->data->logger == Logger4NoVarArgList)
free(ctx->data->loggerData);
free(ctx->data);
}

Expand Down Expand Up @@ -1876,6 +1901,9 @@ CHEWING_API void chewing_set_logger(ChewingContext *ctx,

LOG_API("");

if (ctx->data->logger == Logger4NoVarArgList)
free(ctx->data->loggerData);

if (!logger) {
logger = NullLogger;
data = 0;
Expand All @@ -1884,6 +1912,36 @@ CHEWING_API void chewing_set_logger(ChewingContext *ctx,
ctx->data->loggerData = data;
}

CHEWING_API void chewing_set_logger_without_varglist(ChewingContext *ctx,
void (*logger2) (void *data, int level, const char *msg), void *data2)
{
ChewingData *pgdata;
void (*logger) (void *data, int level, const char *fmt, ...) = NullLogger;
void *data = 0;

if (!ctx) {
return;
}
pgdata = ctx->data;

LOG_API("");

if (ctx->data->logger == Logger4NoVarArgList)
free(ctx->data->loggerData);

if (logger2) {
Data4NoVarArgListLogger *all_data;

logger = Logger4NoVarArgList;
all_data = ALC(Data4NoVarArgListLogger, 1);
all_data->logger = logger2;
all_data->data = data2;
data = all_data;
}
ctx->data->logger = logger;
ctx->data->loggerData = data;
}

CHEWING_API int chewing_userphrase_enumerate(ChewingContext *ctx)
{
ChewingData *pgdata;
Expand Down
3 changes: 3 additions & 0 deletions test/test-logger.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ void test_set_null_logger()
chewing_set_logger(ctx, NULL, 0);
type_keystroke_by_string(ctx, "hk4g4");

chewing_set_logger_without_varglist(ctx, NULL, 0);
type_keystroke_by_string(ctx, "hk4g4");

chewing_delete(ctx);
}

Expand Down