Skip to content

L
linux
Commit 0515ca53 authored by Tzvetomir Stoyanov (VMware)'s avatar Tzvetomir Stoyanov (VMware) Committed by Arnaldo Carvalho de Melo
Browse files
Options

tools lib traceevent: Add prefix tep_ to struct filter_{arg,value_type} 

In order to make libtraceevent into a proper library, variables, data
structures and functions require a unique prefix to prevent name space
conflicts. That prefix will be "tep_". This adds prefix tep_ to
struct filter_arg, enum filter_value_type and all enum's members.
Signed-off-by: default avatarTzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
Cc: linux-trace-devel@vger.kernel.org
Link: http://lkml.kernel.org/r/20180919185723.972818215@goodmis.orgSigned-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 4746d22a
Show whitespace changes
Inline Side-by-side
Showing with 74 additions and 74 deletions
tools/lib/traceevent/event-parse.h
View file @ 0515ca53
...@@ -819,13 +819,13 @@ enum tep_filter_arg_type { ...@@ -819,13 +819,13 @@ enum tep_filter_arg_type {
TEP_FILTER_ARG_STR, TEP_FILTER_ARG_STR,
}; };
enum filter_value_type { enum tep_filter_value_type {
FILTER_NUMBER, TEP_FILTER_NUMBER,
FILTER_STRING, TEP_FILTER_STRING,
FILTER_CHAR TEP_FILTER_CHAR
}; };
struct fliter_arg; struct tep_filter_arg;
struct filter_arg_boolean { struct filter_arg_boolean {
enum tep_filter_boolean_type value; enum tep_filter_boolean_type value;
...@@ -836,7 +836,7 @@ struct filter_arg_field { ...@@ -836,7 +836,7 @@ struct filter_arg_field {
}; };
struct filter_arg_value { struct filter_arg_value {
enum filter_value_type type; enum tep_filter_value_type type;
union { union {
char *str; char *str;
unsigned long long val; unsigned long long val;
...@@ -845,20 +845,20 @@ struct filter_arg_value { ...@@ -845,20 +845,20 @@ struct filter_arg_value {
struct filter_arg_op { struct filter_arg_op {
enum tep_filter_op_type type; enum tep_filter_op_type type;
struct filter_arg *left; struct tep_filter_arg *left;
struct filter_arg *right; struct tep_filter_arg *right;
}; };
struct filter_arg_exp { struct filter_arg_exp {
enum tep_filter_exp_type type; enum tep_filter_exp_type type;
struct filter_arg *left; struct tep_filter_arg *left;
struct filter_arg *right; struct tep_filter_arg *right;
}; };
struct filter_arg_num { struct filter_arg_num {
enum tep_filter_cmp_type type; enum tep_filter_cmp_type type;
struct filter_arg *left; struct tep_filter_arg *left;
struct filter_arg *right; struct tep_filter_arg *right;
}; };
struct filter_arg_str { struct filter_arg_str {
...@@ -869,7 +869,7 @@ struct filter_arg_str { ...@@ -869,7 +869,7 @@ struct filter_arg_str {
regex_t reg; regex_t reg;
}; };
struct filter_arg { struct tep_filter_arg {
enum tep_filter_arg_type type; enum tep_filter_arg_type type;
union { union {
struct filter_arg_boolean boolean; struct filter_arg_boolean boolean;
...@@ -885,7 +885,7 @@ struct filter_arg { ...@@ -885,7 +885,7 @@ struct filter_arg {
struct filter_type { struct filter_type {
int event_id; int event_id;
struct tep_event_format *event; struct tep_event_format *event;
struct filter_arg *filter; struct tep_filter_arg *filter;
}; };
#define TEP_FILTER_ERROR_BUFSZ 1024 #define TEP_FILTER_ERROR_BUFSZ 1024
......
tools/lib/traceevent/parse-filter.c
View file @ 0515ca53
...@@ -180,12 +180,12 @@ struct event_filter *tep_filter_alloc(struct tep_handle *pevent) ...@@ -180,12 +180,12 @@ struct event_filter *tep_filter_alloc(struct tep_handle *pevent)
return filter; return filter;
} }
static struct filter_arg *allocate_arg(void) static struct tep_filter_arg *allocate_arg(void)
{ {
return calloc(1, sizeof(struct filter_arg)); return calloc(1, sizeof(struct tep_filter_arg));
} }
static void free_arg(struct filter_arg *arg) static void free_arg(struct tep_filter_arg *arg)
{ {
if (!arg) if (!arg)
return; return;
...@@ -212,8 +212,8 @@ static void free_arg(struct filter_arg *arg) ...@@ -212,8 +212,8 @@ static void free_arg(struct filter_arg *arg)
break; break;
case TEP_FILTER_ARG_VALUE: case TEP_FILTER_ARG_VALUE:
if (arg->value.type == FILTER_STRING || if (arg->value.type == TEP_FILTER_STRING ||
arg->value.type == FILTER_CHAR) arg->value.type == TEP_FILTER_CHAR)
free(arg->value.str); free(arg->value.str);
break; break;
...@@ -334,10 +334,10 @@ static void free_events(struct event_list *events) ...@@ -334,10 +334,10 @@ static void free_events(struct event_list *events)
static enum tep_errno static enum tep_errno
create_arg_item(struct tep_event_format *event, const char *token, create_arg_item(struct tep_event_format *event, const char *token,
enum tep_event_type type, struct filter_arg **parg, char *error_str) enum tep_event_type type, struct tep_filter_arg **parg, char *error_str)
{ {
struct tep_format_field *field; struct tep_format_field *field;
struct filter_arg *arg; struct tep_filter_arg *arg;
arg = allocate_arg(); arg = allocate_arg();
if (arg == NULL) { if (arg == NULL) {
...@@ -351,7 +351,7 @@ create_arg_item(struct tep_event_format *event, const char *token, ...@@ -351,7 +351,7 @@ create_arg_item(struct tep_event_format *event, const char *token,
case TEP_EVENT_DQUOTE: case TEP_EVENT_DQUOTE:
arg->type = TEP_FILTER_ARG_VALUE; arg->type = TEP_FILTER_ARG_VALUE;
arg->value.type = arg->value.type =
type == TEP_EVENT_DQUOTE ? FILTER_STRING : FILTER_CHAR; type == TEP_EVENT_DQUOTE ? TEP_FILTER_STRING : TEP_FILTER_CHAR;
arg->value.str = strdup(token); arg->value.str = strdup(token);
if (!arg->value.str) { if (!arg->value.str) {
free_arg(arg); free_arg(arg);
...@@ -363,7 +363,7 @@ create_arg_item(struct tep_event_format *event, const char *token, ...@@ -363,7 +363,7 @@ create_arg_item(struct tep_event_format *event, const char *token,
/* if it is a number, then convert it */ /* if it is a number, then convert it */
if (isdigit(token[0])) { if (isdigit(token[0])) {
arg->type = TEP_FILTER_ARG_VALUE; arg->type = TEP_FILTER_ARG_VALUE;
arg->value.type = FILTER_NUMBER; arg->value.type = TEP_FILTER_NUMBER;
arg->value.val = strtoull(token, NULL, 0); arg->value.val = strtoull(token, NULL, 0);
break; break;
} }
...@@ -394,10 +394,10 @@ create_arg_item(struct tep_event_format *event, const char *token, ...@@ -394,10 +394,10 @@ create_arg_item(struct tep_event_format *event, const char *token,
return 0; return 0;
} }
static struct filter_arg * static struct tep_filter_arg *
create_arg_op(enum tep_filter_op_type btype) create_arg_op(enum tep_filter_op_type btype)
{ {
struct filter_arg *arg; struct tep_filter_arg *arg;
arg = allocate_arg(); arg = allocate_arg();
if (!arg) if (!arg)
...@@ -409,10 +409,10 @@ create_arg_op(enum tep_filter_op_type btype) ...@@ -409,10 +409,10 @@ create_arg_op(enum tep_filter_op_type btype)
return arg; return arg;
} }
static struct filter_arg * static struct tep_filter_arg *
create_arg_exp(enum tep_filter_exp_type etype) create_arg_exp(enum tep_filter_exp_type etype)
{ {
struct filter_arg *arg; struct tep_filter_arg *arg;
arg = allocate_arg(); arg = allocate_arg();
if (!arg) if (!arg)
...@@ -424,10 +424,10 @@ create_arg_exp(enum tep_filter_exp_type etype) ...@@ -424,10 +424,10 @@ create_arg_exp(enum tep_filter_exp_type etype)
return arg; return arg;
} }
static struct filter_arg * static struct tep_filter_arg *
create_arg_cmp(enum tep_filter_cmp_type ctype) create_arg_cmp(enum tep_filter_cmp_type ctype)
{ {
struct filter_arg *arg; struct tep_filter_arg *arg;
arg = allocate_arg(); arg = allocate_arg();
if (!arg) if (!arg)
...@@ -441,9 +441,9 @@ create_arg_cmp(enum tep_filter_cmp_type ctype) ...@@ -441,9 +441,9 @@ create_arg_cmp(enum tep_filter_cmp_type ctype)
} }
static enum tep_errno static enum tep_errno
add_right(struct filter_arg *op, struct filter_arg *arg, char *error_str) add_right(struct tep_filter_arg *op, struct tep_filter_arg *arg, char *error_str)
{ {
struct filter_arg *left; struct tep_filter_arg *left;
char *str; char *str;
int op_type; int op_type;
int ret; int ret;
...@@ -481,7 +481,7 @@ add_right(struct filter_arg *op, struct filter_arg *arg, char *error_str) ...@@ -481,7 +481,7 @@ add_right(struct filter_arg *op, struct filter_arg *arg, char *error_str)
* convert this to a string or regex. * convert this to a string or regex.
*/ */
switch (arg->value.type) { switch (arg->value.type) {
case FILTER_CHAR: case TEP_FILTER_CHAR:
/* /*
* A char should be converted to number if * A char should be converted to number if
* the string is 1 byte, and the compare * the string is 1 byte, and the compare
...@@ -490,11 +490,11 @@ add_right(struct filter_arg *op, struct filter_arg *arg, char *error_str) ...@@ -490,11 +490,11 @@ add_right(struct filter_arg *op, struct filter_arg *arg, char *error_str)
if (strlen(arg->value.str) == 1 && if (strlen(arg->value.str) == 1 &&
op->num.type != TEP_FILTER_CMP_REGEX && op->num.type != TEP_FILTER_CMP_REGEX &&
op->num.type != TEP_FILTER_CMP_NOT_REGEX) { op->num.type != TEP_FILTER_CMP_NOT_REGEX) {
arg->value.type = FILTER_NUMBER; arg->value.type = TEP_FILTER_NUMBER;
goto do_int; goto do_int;
} }
/* fall through */ /* fall through */
case FILTER_STRING: case TEP_FILTER_STRING:
/* convert op to a string arg */ /* convert op to a string arg */
op_type = op->num.type; op_type = op->num.type;
...@@ -573,7 +573,7 @@ add_right(struct filter_arg *op, struct filter_arg *arg, char *error_str) ...@@ -573,7 +573,7 @@ add_right(struct filter_arg *op, struct filter_arg *arg, char *error_str)
break; break;
case FILTER_NUMBER: case TEP_FILTER_NUMBER:
do_int: do_int:
switch (op->num.type) { switch (op->num.type) {
...@@ -605,17 +605,17 @@ add_right(struct filter_arg *op, struct filter_arg *arg, char *error_str) ...@@ -605,17 +605,17 @@ add_right(struct filter_arg *op, struct filter_arg *arg, char *error_str)
return TEP_ERRNO__SYNTAX_ERROR; return TEP_ERRNO__SYNTAX_ERROR;
} }
static struct filter_arg * static struct tep_filter_arg *
rotate_op_right(struct filter_arg *a, struct filter_arg *b) rotate_op_right(struct tep_filter_arg *a, struct tep_filter_arg *b)
{ {
struct filter_arg *arg; struct tep_filter_arg *arg;
arg = a->op.right; arg = a->op.right;
a->op.right = b; a->op.right = b;
return arg; return arg;
} }
static enum tep_errno add_left(struct filter_arg *op, struct filter_arg *arg) static enum tep_errno add_left(struct tep_filter_arg *op, struct tep_filter_arg *arg)
{ {
switch (op->type) { switch (op->type) {
case TEP_FILTER_ARG_EXP: case TEP_FILTER_ARG_EXP:
...@@ -720,7 +720,7 @@ static enum op_type process_op(const char *token, ...@@ -720,7 +720,7 @@ static enum op_type process_op(const char *token,
return OP_CMP; return OP_CMP;
} }
static int check_op_done(struct filter_arg *arg) static int check_op_done(struct tep_filter_arg *arg)
{ {
switch (arg->type) { switch (arg->type) {
case TEP_FILTER_ARG_EXP: case TEP_FILTER_ARG_EXP:
...@@ -752,11 +752,11 @@ enum filter_vals { ...@@ -752,11 +752,11 @@ enum filter_vals {
}; };
static enum tep_errno static enum tep_errno
reparent_op_arg(struct filter_arg *parent, struct filter_arg *old_child, reparent_op_arg(struct tep_filter_arg *parent, struct tep_filter_arg *old_child,
struct filter_arg *arg, char *error_str) struct tep_filter_arg *arg, char *error_str)
{ {
struct filter_arg *other_child; struct tep_filter_arg *other_child;
struct filter_arg **ptr; struct tep_filter_arg **ptr;
if (parent->type != TEP_FILTER_ARG_OP && if (parent->type != TEP_FILTER_ARG_OP &&
arg->type != TEP_FILTER_ARG_OP) { arg->type != TEP_FILTER_ARG_OP) {
...@@ -804,7 +804,7 @@ reparent_op_arg(struct filter_arg *parent, struct filter_arg *old_child, ...@@ -804,7 +804,7 @@ reparent_op_arg(struct filter_arg *parent, struct filter_arg *old_child,
} }
/* Returns either filter_vals (success) or tep_errno (failfure) */ /* Returns either filter_vals (success) or tep_errno (failfure) */
static int test_arg(struct filter_arg *parent, struct filter_arg *arg, static int test_arg(struct tep_filter_arg *parent, struct tep_filter_arg *arg,
char *error_str) char *error_str)
{ {
int lval, rval; int lval, rval;
...@@ -904,8 +904,8 @@ static int test_arg(struct filter_arg *parent, struct filter_arg *arg, ...@@ -904,8 +904,8 @@ static int test_arg(struct filter_arg *parent, struct filter_arg *arg,
} }
/* Remove any unknown event fields */ /* Remove any unknown event fields */
static int collapse_tree(struct filter_arg *arg, static int collapse_tree(struct tep_filter_arg *arg,
struct filter_arg **arg_collapsed, char *error_str) struct tep_filter_arg **arg_collapsed, char *error_str)
{ {
int ret; int ret;
...@@ -939,15 +939,15 @@ static int collapse_tree(struct filter_arg *arg, ...@@ -939,15 +939,15 @@ static int collapse_tree(struct filter_arg *arg,
} }
static enum tep_errno static enum tep_errno
process_filter(struct tep_event_format *event, struct filter_arg **parg, process_filter(struct tep_event_format *event, struct tep_filter_arg **parg,
char *error_str, int not) char *error_str, int not)
{ {
enum tep_event_type type; enum tep_event_type type;
char *token = NULL; char *token = NULL;
struct filter_arg *current_op = NULL; struct tep_filter_arg *current_op = NULL;
struct filter_arg *current_exp = NULL; struct tep_filter_arg *current_exp = NULL;
struct filter_arg *left_item = NULL; struct tep_filter_arg *left_item = NULL;
struct filter_arg *arg = NULL; struct tep_filter_arg *arg = NULL;
enum op_type op_type; enum op_type op_type;
enum tep_filter_op_type btype; enum tep_filter_op_type btype;
enum tep_filter_exp_type etype; enum tep_filter_exp_type etype;
...@@ -1180,7 +1180,7 @@ process_filter(struct tep_event_format *event, struct filter_arg **parg, ...@@ -1180,7 +1180,7 @@ process_filter(struct tep_event_format *event, struct filter_arg **parg,
static enum tep_errno static enum tep_errno
process_event(struct tep_event_format *event, const char *filter_str, process_event(struct tep_event_format *event, const char *filter_str,
struct filter_arg **parg, char *error_str) struct tep_filter_arg **parg, char *error_str)
{ {
int ret; int ret;
...@@ -1208,7 +1208,7 @@ filter_event(struct event_filter *filter, struct tep_event_format *event, ...@@ -1208,7 +1208,7 @@ filter_event(struct event_filter *filter, struct tep_event_format *event,
const char *filter_str, char *error_str) const char *filter_str, char *error_str)
{ {
struct filter_type *filter_type; struct filter_type *filter_type;
struct filter_arg *arg; struct tep_filter_arg *arg;
enum tep_errno ret; enum tep_errno ret;
if (filter_str) { if (filter_str) {
...@@ -1449,13 +1449,13 @@ void tep_filter_free(struct event_filter *filter) ...@@ -1449,13 +1449,13 @@ void tep_filter_free(struct event_filter *filter)
free(filter); free(filter);
} }
static char *arg_to_str(struct event_filter *filter, struct filter_arg *arg); static char *arg_to_str(struct event_filter *filter, struct tep_filter_arg *arg);
static int copy_filter_type(struct event_filter *filter, static int copy_filter_type(struct event_filter *filter,
struct event_filter *source, struct event_filter *source,
struct filter_type *filter_type) struct filter_type *filter_type)
{ {
struct filter_arg *arg; struct tep_filter_arg *arg;
struct tep_event_format *event; struct tep_event_format *event;
const char *sys; const char *sys;
const char *name; const char *name;
...@@ -1540,7 +1540,7 @@ int tep_update_trivial(struct event_filter *dest, struct event_filter *source, ...@@ -1540,7 +1540,7 @@ int tep_update_trivial(struct event_filter *dest, struct event_filter *source,
struct tep_handle *dest_pevent; struct tep_handle *dest_pevent;
struct tep_event_format *event; struct tep_event_format *event;
struct filter_type *filter_type; struct filter_type *filter_type;
struct filter_arg *arg; struct tep_filter_arg *arg;
char *str; char *str;
int i; int i;
...@@ -1682,7 +1682,7 @@ int tep_filter_event_has_trivial(struct event_filter *filter, ...@@ -1682,7 +1682,7 @@ int tep_filter_event_has_trivial(struct event_filter *filter,
} }
} }
static int test_filter(struct tep_event_format *event, struct filter_arg *arg, static int test_filter(struct tep_event_format *event, struct tep_filter_arg *arg,
struct tep_record *record, enum tep_errno *err); struct tep_record *record, enum tep_errno *err);
static const char * static const char *
...@@ -1733,11 +1733,11 @@ get_value(struct tep_event_format *event, ...@@ -1733,11 +1733,11 @@ get_value(struct tep_event_format *event,
} }
static unsigned long long static unsigned long long
get_arg_value(struct tep_event_format *event, struct filter_arg *arg, get_arg_value(struct tep_event_format *event, struct tep_filter_arg *arg,
struct tep_record *record, enum tep_errno *err); struct tep_record *record, enum tep_errno *err);
static unsigned long long static unsigned long long
get_exp_value(struct tep_event_format *event, struct filter_arg *arg, get_exp_value(struct tep_event_format *event, struct tep_filter_arg *arg,
struct tep_record *record, enum tep_errno *err) struct tep_record *record, enum tep_errno *err)
{ {
unsigned long long lval, rval; unsigned long long lval, rval;
...@@ -1792,7 +1792,7 @@ get_exp_value(struct tep_event_format *event, struct filter_arg *arg, ...@@ -1792,7 +1792,7 @@ get_exp_value(struct tep_event_format *event, struct filter_arg *arg,
} }
static unsigned long long static unsigned long long
get_arg_value(struct tep_event_format *event, struct filter_arg *arg, get_arg_value(struct tep_event_format *event, struct tep_filter_arg *arg,
struct tep_record *record, enum tep_errno *err) struct tep_record *record, enum tep_errno *err)
{ {
switch (arg->type) { switch (arg->type) {
...@@ -1800,7 +1800,7 @@ get_arg_value(struct tep_event_format *event, struct filter_arg *arg, ...@@ -1800,7 +1800,7 @@ get_arg_value(struct tep_event_format *event, struct filter_arg *arg,
return get_value(event, arg->field.field, record); return get_value(event, arg->field.field, record);
case TEP_FILTER_ARG_VALUE: case TEP_FILTER_ARG_VALUE:
if (arg->value.type != FILTER_NUMBER) { if (arg->value.type != TEP_FILTER_NUMBER) {
if (!*err) if (!*err)
*err = TEP_ERRNO__NOT_A_NUMBER; *err = TEP_ERRNO__NOT_A_NUMBER;
} }
...@@ -1816,7 +1816,7 @@ get_arg_value(struct tep_event_format *event, struct filter_arg *arg, ...@@ -1816,7 +1816,7 @@ get_arg_value(struct tep_event_format *event, struct filter_arg *arg,
return 0; return 0;
} }
static int test_num(struct tep_event_format *event, struct filter_arg *arg, static int test_num(struct tep_event_format *event, struct tep_filter_arg *arg,
struct tep_record *record, enum tep_errno *err) struct tep_record *record, enum tep_errno *err)
{ {
unsigned long long lval, rval; unsigned long long lval, rval;
...@@ -1857,7 +1857,7 @@ static int test_num(struct tep_event_format *event, struct filter_arg *arg, ...@@ -1857,7 +1857,7 @@ static int test_num(struct tep_event_format *event, struct filter_arg *arg,
} }
} }
static const char *get_field_str(struct filter_arg *arg, struct tep_record *record) static const char *get_field_str(struct tep_filter_arg *arg, struct tep_record *record)
{ {
struct tep_event_format *event; struct tep_event_format *event;
struct tep_handle *pevent; struct tep_handle *pevent;
...@@ -1907,7 +1907,7 @@ static const char *get_field_str(struct filter_arg *arg, struct tep_record *reco ...@@ -1907,7 +1907,7 @@ static const char *get_field_str(struct filter_arg *arg, struct tep_record *reco
return val; return val;
} }
static int test_str(struct tep_event_format *event, struct filter_arg *arg, static int test_str(struct tep_event_format *event, struct tep_filter_arg *arg,
struct tep_record *record, enum tep_errno *err) struct tep_record *record, enum tep_errno *err)
{ {
const char *val; const char *val;
...@@ -1938,7 +1938,7 @@ static int test_str(struct tep_event_format *event, struct filter_arg *arg, ...@@ -1938,7 +1938,7 @@ static int test_str(struct tep_event_format *event, struct filter_arg *arg,
} }
} }
static int test_op(struct tep_event_format *event, struct filter_arg *arg, static int test_op(struct tep_event_format *event, struct tep_filter_arg *arg,
struct tep_record *record, enum tep_errno *err) struct tep_record *record, enum tep_errno *err)
{ {
switch (arg->op.type) { switch (arg->op.type) {
...@@ -1960,7 +1960,7 @@ static int test_op(struct tep_event_format *event, struct filter_arg *arg, ...@@ -1960,7 +1960,7 @@ static int test_op(struct tep_event_format *event, struct filter_arg *arg,
} }
} }
static int test_filter(struct tep_event_format *event, struct filter_arg *arg, static int test_filter(struct tep_event_format *event, struct tep_filter_arg *arg,
struct tep_record *record, enum tep_errno *err) struct tep_record *record, enum tep_errno *err)
{ {
if (*err) { if (*err) {
...@@ -2059,7 +2059,7 @@ enum tep_errno tep_filter_match(struct event_filter *filter, ...@@ -2059,7 +2059,7 @@ enum tep_errno tep_filter_match(struct event_filter *filter,
return ret ? TEP_ERRNO__FILTER_MATCH : TEP_ERRNO__FILTER_MISS; return ret ? TEP_ERRNO__FILTER_MATCH : TEP_ERRNO__FILTER_MISS;
} }
static char *op_to_str(struct event_filter *filter, struct filter_arg *arg) static char *op_to_str(struct event_filter *filter, struct tep_filter_arg *arg)
{ {
char *str = NULL; char *str = NULL;
char *left = NULL; char *left = NULL;
...@@ -2163,7 +2163,7 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg) ...@@ -2163,7 +2163,7 @@ static char *op_to_str(struct event_filter *filter, struct filter_arg *arg)
return str; return str;
} }
static char *val_to_str(struct event_filter *filter, struct filter_arg *arg) static char *val_to_str(struct event_filter *filter, struct tep_filter_arg *arg)
{ {
char *str = NULL; char *str = NULL;
...@@ -2172,12 +2172,12 @@ static char *val_to_str(struct event_filter *filter, struct filter_arg *arg) ...@@ -2172,12 +2172,12 @@ static char *val_to_str(struct event_filter *filter, struct filter_arg *arg)
return str; return str;
} }
static char *field_to_str(struct event_filter *filter, struct filter_arg *arg) static char *field_to_str(struct event_filter *filter, struct tep_filter_arg *arg)
{ {
return strdup(arg->field.field->name); return strdup(arg->field.field->name);
} }
static char *exp_to_str(struct event_filter *filter, struct filter_arg *arg) static char *exp_to_str(struct event_filter *filter, struct tep_filter_arg *arg)
{ {
char *lstr; char *lstr;
char *rstr; char *rstr;
...@@ -2233,7 +2233,7 @@ static char *exp_to_str(struct event_filter *filter, struct filter_arg *arg) ...@@ -2233,7 +2233,7 @@ static char *exp_to_str(struct event_filter *filter, struct filter_arg *arg)
return str; return str;
} }
static char *num_to_str(struct event_filter *filter, struct filter_arg *arg) static char *num_to_str(struct event_filter *filter, struct tep_filter_arg *arg)
{ {
char *lstr; char *lstr;
char *rstr; char *rstr;
...@@ -2283,7 +2283,7 @@ static char *num_to_str(struct event_filter *filter, struct filter_arg *arg) ...@@ -2283,7 +2283,7 @@ static char *num_to_str(struct event_filter *filter, struct filter_arg *arg)
return str; return str;
} }
static char *str_to_str(struct event_filter *filter, struct filter_arg *arg) static char *str_to_str(struct event_filter *filter, struct tep_filter_arg *arg)
{ {
char *str = NULL; char *str = NULL;
char *op = NULL; char *op = NULL;
...@@ -2315,7 +2315,7 @@ static char *str_to_str(struct event_filter *filter, struct filter_arg *arg) ...@@ -2315,7 +2315,7 @@ static char *str_to_str(struct event_filter *filter, struct filter_arg *arg)
return str; return str;
} }
static char *arg_to_str(struct event_filter *filter, struct filter_arg *arg) static char *arg_to_str(struct event_filter *filter, struct tep_filter_arg *arg)
{ {
char *str = NULL; char *str = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7