[PATCH 15/25] dynamic_debug: remove explicit foo != NULL checks.

Jim Cromie
2011-07-25T21:46:09Z

Reduce != NULL relational tests to their 0/1 equivalents.
Done separately to preserve code-move character of previous patch.
No generated code difference.

Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
---
lib/dynamic_debug.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index c0a5d20..0c25ba0 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -147,19 +147,17 @@ static bool query_matches_callsite(struct _ddebug *dp,
const struct ddebug_query *query)
{
/* match against the source filename */
- if (query->filename != NULL &&
+ if (query->filename &&
strcmp(query->filename, dp->filename) &&
strcmp(query->filename, basename(dp->filename)))
return false;

/* match against the function */
- if (query->function != NULL &&
- strcmp(query->function, dp->function))
+ if (query->function && strcmp(query->function, dp->function))
return false;

/* match against the format */
- if (query->format != NULL &&
- strstr(dp->format, query->format) == NULL)
+ if (query->format && !strstr(dp->format, query->format))
return false;

/* match against the line number range */
--
1.7.4.1