navigine/jq
1
0 Fork 0
mirror of https://github.com/jqlang/jq.git synced 2026-10-30 10:06:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce number of msg callback typedefs

Browse Source
This commit is contained in:
Nicolas Williams committed 2015-02-13 15:58:02 -06:00
1 parent 0d414471bb
commit a83a9e0bc2
5 files changed
+17 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

builtin.c
+2 -2
View File
@@ -895,11 +895,11 @@ static jv f_input(jq_state *jq, jv input) {
} }
static jv f_debug(jq_state *jq, jv input) { static jv f_debug(jq_state *jq, jv input) {
jq_debug_cb cb; jq_msg_cb cb;
void *data; void *data;
jq_get_debug_cb(jq, &cb, &data); jq_get_debug_cb(jq, &cb, &data);
if (cb != NULL) if (cb != NULL)
cb(jq, data, jv_copy(input)); cb(data, jv_copy(input));
return input; return input;
} }
execute.c
+6 -6
View File
@@ -24,7 +24,7 @@ struct jq_state {
void *nomem_handler_data; void *nomem_handler_data;
struct bytecode* bc; struct bytecode* bc;
jq_err_cb err_cb; jq_msg_cb err_cb;
void *err_cb_data; void *err_cb_data;
jv error; jv error;
@@ -42,7 +42,7 @@ struct jq_state {
jv attrs; jv attrs;
jq_input_cb input_cb; jq_input_cb input_cb;
void *input_cb_data; void *input_cb_data;
jq_debug_cb debug_cb; jq_msg_cb debug_cb;
void *debug_cb_data; void *debug_cb_data;
}; };
@@ -879,7 +879,7 @@ jq_state *jq_init(void) {
return jq; return jq;
} }
void jq_set_error_cb(jq_state *jq, jq_err_cb cb, void *data) { void jq_set_error_cb(jq_state *jq, jq_msg_cb cb, void *data) {
if (cb == NULL) { if (cb == NULL) {
jq->err_cb = default_err_cb; jq->err_cb = default_err_cb;
jq->err_cb_data = stderr; jq->err_cb_data = stderr;
@@ -889,7 +889,7 @@ void jq_set_error_cb(jq_state *jq, jq_err_cb cb, void *data) {
} }
} }
void jq_get_error_cb(jq_state *jq, jq_err_cb *cb, void **data) { void jq_get_error_cb(jq_state *jq, jq_msg_cb *cb, void **data) {
*cb = jq->err_cb; *cb = jq->err_cb;
*data = jq->err_cb_data; *data = jq->err_cb_data;
} }
@@ -1082,12 +1082,12 @@ void jq_get_input_cb(jq_state *jq, jq_input_cb *cb, void **data) {
*data = jq->input_cb_data; *data = jq->input_cb_data;
} }
void jq_set_debug_cb(jq_state *jq, jq_debug_cb cb, void *data) { void jq_set_debug_cb(jq_state *jq, jq_msg_cb cb, void *data) {
jq->debug_cb = cb; jq->debug_cb = cb;
jq->debug_cb_data = data; jq->debug_cb_data = data;
} }
void jq_get_debug_cb(jq_state *jq, jq_debug_cb *cb, void **data) { void jq_get_debug_cb(jq_state *jq, jq_msg_cb *cb, void **data) {
*cb = jq->debug_cb; *cb = jq->debug_cb;
*data = jq->debug_cb_data; *data = jq->debug_cb_data;
} }
jq.h
+6 -7
View File
@@ -7,11 +7,11 @@
enum {JQ_DEBUG_TRACE = 1}; enum {JQ_DEBUG_TRACE = 1};
typedef struct jq_state jq_state; typedef struct jq_state jq_state;
typedef void (*jq_err_cb)(void *, jv); typedef void (*jq_msg_cb)(void *, jv);
jq_state *jq_init(void); jq_state *jq_init(void);
void jq_set_error_cb(jq_state *, jq_err_cb, void *); void jq_set_error_cb(jq_state *, jq_msg_cb, void *);
void jq_get_error_cb(jq_state *, jq_err_cb *, void **); void jq_get_error_cb(jq_state *, jq_msg_cb *, void **);
void jq_set_nomem_handler(jq_state *, void (*)(void *), void *); void jq_set_nomem_handler(jq_state *, void (*)(void *), void *);
jv jq_format_error(jv msg); jv jq_format_error(jv msg);
void jq_report_error(jq_state *, jv); void jq_report_error(jq_state *, jv);
@@ -26,9 +26,8 @@ typedef jv (*jq_input_cb)(jq_state *, void *);
void jq_set_input_cb(jq_state *, jq_input_cb, void *); void jq_set_input_cb(jq_state *, jq_input_cb, void *);
void jq_get_input_cb(jq_state *, jq_input_cb *, void **); void jq_get_input_cb(jq_state *, jq_input_cb *, void **);
typedef void (*jq_debug_cb)(jq_state *, void *, jv); void jq_set_debug_cb(jq_state *, jq_msg_cb, void *);
void jq_set_debug_cb(jq_state *, jq_debug_cb, void *); void jq_get_debug_cb(jq_state *, jq_msg_cb *, void **);
void jq_get_debug_cb(jq_state *, jq_debug_cb *, void **);
void jq_set_attrs(jq_state *, jv); void jq_set_attrs(jq_state *, jv);
jv jq_get_attrs(jq_state *); jv jq_get_attrs(jq_state *);
@@ -40,7 +39,7 @@ jv jq_get_attr(jq_state *, jv);
typedef struct jq_util_input_state *jq_util_input_state; typedef struct jq_util_input_state *jq_util_input_state;
jq_util_input_state jq_util_input_init(jq_err_cb, void *); jq_util_input_state jq_util_input_init(jq_msg_cb, void *);
void jq_util_input_set_parser(jq_util_input_state, jv_parser *, int); void jq_util_input_set_parser(jq_util_input_state, jv_parser *, int);
void jq_util_input_free(jq_util_input_state *); void jq_util_input_free(jq_util_input_state *);
void jq_util_input_add_input(jq_util_input_state, jv); void jq_util_input_add_input(jq_util_input_state, jv);
main.c
+1 -1
View File
@@ -140,7 +140,7 @@ static int process(jq_state *jq, jv value, int flags, int dumpopts) {
return ret; return ret;
} }
static void debug_cb(jq_state *jq, void *data, jv input) { static void debug_cb(void *data, jv input) {
int dumpopts = *(int *)data; int dumpopts = *(int *)data;
jv_dumpf(JV_ARRAY(jv_string("DEBUG:"), input), stderr, dumpopts & ~(JV_PRINT_PRETTY)); jv_dumpf(JV_ARRAY(jv_string("DEBUG:"), input), stderr, dumpopts & ~(JV_PRINT_PRETTY));
fprintf(stderr, "\n"); fprintf(stderr, "\n");
util.c
+2 -2
View File
@@ -146,7 +146,7 @@ not_this:
} }
struct jq_util_input_state { struct jq_util_input_state {
jq_err_cb err_cb; jq_msg_cb err_cb;
void *err_cb_data; void *err_cb_data;
jv_parser *parser; jv_parser *parser;
FILE* current_input; FILE* current_input;
@@ -162,7 +162,7 @@ static void fprinter(void *data, jv fname) {
} }
// If parser == NULL -> RAW // If parser == NULL -> RAW
jq_util_input_state jq_util_input_init(jq_err_cb err_cb, void *err_cb_data) { jq_util_input_state jq_util_input_init(jq_msg_cb err_cb, void *err_cb_data) {
if (err_cb == NULL) { if (err_cb == NULL) {
err_cb = fprinter; err_cb = fprinter;
err_cb_data = stderr; err_cb_data = stderr;