parse-events: Fix field_is_string()

The field_is_string() function always returns true because it checks for
!strstr(...), which returns 0 if it does not match. Thus the

!strstr("char") || !strstr("u8") || !strstr("s8")

One would fail and the entire code would end up being true.

Also move the field_is_dynamic out of the field_is_string() condition because a
field may be dynamic without being a string.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

1 files changed, 5 insertions, 6 deletions

diff --git a/parse-events.c b/parse-events.c
index b2941c3..ea7f5dd 100644
--- a/parse-events.c
+++ b/parse-events.c
@@ -1131,8 +1131,8 @@ static int event_read_id(void)
 static int field_is_string(struct format_field *field)
 {
         if ((field->flags & FIELD_IS_ARRAY) &&
-            (!strstr(field->type, "char") || !strstr(field->type, "u8") ||
-             !strstr(field->type, "s8")))
+            (strstr(field->type, "char") || strstr(field->type, "u8") ||
+             strstr(field->type, "s8")))
                 return 1;
 
         return 0;
@@ -1293,11 +1293,10 @@ static int event_read_fields(struct event_format *event, struct format_field **f
                         free(brackets);
                 }
 
-                if (field_is_string(field)) {
+                if (field_is_string(field))
                         field->flags |= FIELD_IS_STRING;
-                        if (field_is_dynamic(field))
-                                field->flags |= FIELD_IS_DYNAMIC;
-                }
+                if (field_is_dynamic(field))
+                        field->flags |= FIELD_IS_DYNAMIC;
 
                 if (test_type_token(type, token,  EVENT_OP, ";"))
                         goto fail;