From: Guy Harris <guy@alum.mit.edu>
Date: Thu, 17 Feb 2011 08:39:41 +0000 (-0000)
Subject: Oops, wrong pointer comparison.
X-Git-Url: http://git.samba.org/?p=metze%2Fwireshark%2Fwip.git;a=commitdiff_plain;h=71b71d920e11b6698feaae3a4d7318b93c296547

Oops, wrong pointer comparison.

svn path=/trunk/; revision=35976
---

diff --git a/epan/dfilter/dfilter-macro.c b/epan/dfilter/dfilter-macro.c
index 7bc3a87d21..1012e13d29 100644
--- a/epan/dfilter/dfilter-macro.c
+++ b/epan/dfilter/dfilter-macro.c
@@ -170,8 +170,9 @@ 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 != NULL) {
+		if (fvt_cache &&
+		    (e = g_hash_table_lookup(fvt_cache,name)) != NULL) {
+			if(e->usable) {
 				return e->repr;
 			} else {
 				*error = ep_strdup_printf("macro '%s' is unusable", name);