|
@@ -1534,7 +1534,7 @@ int tep_filter_copy(struct tep_event_filter *dest, struct tep_event_filter *sour
|
|
|
* events may have still been updated on error.
|
|
|
*/
|
|
|
int tep_update_trivial(struct tep_event_filter *dest, struct tep_event_filter *source,
|
|
|
- enum filter_trivial_type type)
|
|
|
+ enum tep_filter_trivial_type type)
|
|
|
{
|
|
|
struct tep_handle *src_pevent;
|
|
|
struct tep_handle *dest_pevent;
|
|
@@ -1556,8 +1556,8 @@ int tep_update_trivial(struct tep_event_filter *dest, struct tep_event_filter *s
|
|
|
arg = filter_type->filter;
|
|
|
if (arg->type != TEP_FILTER_ARG_BOOLEAN)
|
|
|
continue;
|
|
|
- if ((arg->boolean.value && type == FILTER_TRIVIAL_FALSE) ||
|
|
|
- (!arg->boolean.value && type == FILTER_TRIVIAL_TRUE))
|
|
|
+ if ((arg->boolean.value && type == TEP_FILTER_TRIVIAL_FALSE) ||
|
|
|
+ (!arg->boolean.value && type == TEP_FILTER_TRIVIAL_TRUE))
|
|
|
continue;
|
|
|
|
|
|
event = filter_type->event;
|
|
@@ -1593,7 +1593,7 @@ int tep_update_trivial(struct tep_event_filter *dest, struct tep_event_filter *s
|
|
|
* Returns 0 on success and -1 if there was a problem.
|
|
|
*/
|
|
|
int tep_filter_clear_trivial(struct tep_event_filter *filter,
|
|
|
- enum filter_trivial_type type)
|
|
|
+ enum tep_filter_trivial_type type)
|
|
|
{
|
|
|
struct tep_filter_type *filter_type;
|
|
|
int count = 0;
|
|
@@ -1614,11 +1614,11 @@ int tep_filter_clear_trivial(struct tep_event_filter *filter,
|
|
|
if (filter_type->filter->type != TEP_FILTER_ARG_BOOLEAN)
|
|
|
continue;
|
|
|
switch (type) {
|
|
|
- case FILTER_TRIVIAL_FALSE:
|
|
|
+ case TEP_FILTER_TRIVIAL_FALSE:
|
|
|
if (filter_type->filter->boolean.value)
|
|
|
continue;
|
|
|
break;
|
|
|
- case FILTER_TRIVIAL_TRUE:
|
|
|
+ case TEP_FILTER_TRIVIAL_TRUE:
|
|
|
if (!filter_type->filter->boolean.value)
|
|
|
continue;
|
|
|
default:
|
|
@@ -1656,7 +1656,7 @@ int tep_filter_clear_trivial(struct tep_event_filter *filter,
|
|
|
*/
|
|
|
int tep_filter_event_has_trivial(struct tep_event_filter *filter,
|
|
|
int event_id,
|
|
|
- enum filter_trivial_type type)
|
|
|
+ enum tep_filter_trivial_type type)
|
|
|
{
|
|
|
struct tep_filter_type *filter_type;
|
|
|
|
|
@@ -1672,10 +1672,10 @@ int tep_filter_event_has_trivial(struct tep_event_filter *filter,
|
|
|
return 0;
|
|
|
|
|
|
switch (type) {
|
|
|
- case FILTER_TRIVIAL_FALSE:
|
|
|
+ case TEP_FILTER_TRIVIAL_FALSE:
|
|
|
return !filter_type->filter->boolean.value;
|
|
|
|
|
|
- case FILTER_TRIVIAL_TRUE:
|
|
|
+ case TEP_FILTER_TRIVIAL_TRUE:
|
|
|
return filter_type->filter->boolean.value;
|
|
|
default:
|
|
|
return 1;
|
|
@@ -2409,8 +2409,8 @@ int tep_filter_compare(struct tep_event_filter *filter1, struct tep_event_filter
|
|
|
if (filter_type1->filter->type != filter_type2->filter->type)
|
|
|
break;
|
|
|
switch (filter_type1->filter->type) {
|
|
|
- case FILTER_TRIVIAL_FALSE:
|
|
|
- case FILTER_TRIVIAL_TRUE:
|
|
|
+ case TEP_FILTER_TRIVIAL_FALSE:
|
|
|
+ case TEP_FILTER_TRIVIAL_TRUE:
|
|
|
/* trivial types just need the type compared */
|
|
|
continue;
|
|
|
default:
|