summaryrefslogtreecommitdiff
path: root/epan/dfilter
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2011-02-17 08:15:05 +0000
committerGuy Harris <guy@alum.mit.edu>2011-02-17 08:15:05 +0000
commit8eb8623b15bd5870ffb86d76b9f396d4ccf0537f (patch)
tree6ff832bdf203817e6c2cf882b7bb8ef64eb74516 /epan/dfilter
parent3884e987b6a791032acfc1fde9cda00f8fb0b0d1 (diff)
downloadwireshark-8eb8623b15bd5870ffb86d76b9f396d4ccf0537f.tar.gz
OK, let's try a couple more explicit checks against NULL, to see whether
that de-confuses Microsoft's code analyzer. svn path=/trunk/; revision=35975
Diffstat (limited to 'epan/dfilter')
-rw-r--r--epan/dfilter/dfilter-macro.c2
-rw-r--r--epan/dfilter/dfilter.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/epan/dfilter/dfilter-macro.c b/epan/dfilter/dfilter-macro.c
index 40d1f4193e..7bc3a87d21 100644
--- a/epan/dfilter/dfilter-macro.c
+++ b/epan/dfilter/dfilter-macro.c
@@ -171,7 +171,7 @@ static gchar* dfilter_macro_resolve(gchar* name, gchar** args, const gchar** err
if (!m) {
if (fvt_cache && (e = g_hash_table_lookup(fvt_cache,name) )) {
- if(e->usable) {
+ if(e->usable != NULL) {
return e->repr;
} else {
*error = ep_strdup_printf("macro '%s' is unusable", name);
diff --git a/epan/dfilter/dfilter.c b/epan/dfilter/dfilter.c
index 143693123d..21a4b51e2e 100644
--- a/epan/dfilter/dfilter.c
+++ b/epan/dfilter/dfilter.c
@@ -223,7 +223,7 @@ dfilter_compile(const gchar *text, dfilter_t **dfp)
g_assert(dfp);
- if (!text) {
+ if (text == NULL) {
*dfp = NULL;
return FALSE;
}