git.samba.org
/
metze
/
wireshark
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8eb8623
)
Oops, wrong pointer comparison.
author
Guy Harris
<guy@alum.mit.edu>
Thu, 17 Feb 2011 08:39:41 +0000
(08:39 -0000)
committer
Guy Harris
<guy@alum.mit.edu>
Thu, 17 Feb 2011 08:39:41 +0000
(08:39 -0000)
svn path=/trunk/; revision=35976
epan/dfilter/dfilter-macro.c
patch
|
blob
|
history
diff --git
a/epan/dfilter/dfilter-macro.c
b/epan/dfilter/dfilter-macro.c
index 7bc3a87d21038d8eb30df4714efaaec3bb3cc826..1012e13d2992a8ec7a1f936dbdf5e7674bdf60e0 100644
(file)
--- 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);