diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2011-10-28 20:13:56 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2011-10-28 20:13:56 +0000 |
commit | 46c3fe054750d1e662d48e062450cbfa6a8e1335 (patch) | |
tree | 4a45249045cb68a5b4fa1837e124b262a1b15c48 /epan | |
parent | 338cb689a6ffe947ab1b617e7489e7ed2605e0e7 (diff) |
Prefer previous error message if not having hfinfo->strings,
because this may give more interesting information.
svn path=/trunk/; revision=39658
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dfilter/semcheck.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/epan/dfilter/semcheck.c b/epan/dfilter/semcheck.c index 194f328e34..c4199e1290 100644 --- a/epan/dfilter/semcheck.c +++ b/epan/dfilter/semcheck.c @@ -195,11 +195,6 @@ mk_fvalue_from_val_string(header_field_info *hfinfo, char *s) g_assert_not_reached(); } - /* Reset the dfilter error message, since *something* interesting - * will happen, and the error message will be more interesting than - * any error message I happen to have now. */ - dfilter_error_msg = NULL; - /* TRUE/FALSE *always* exist for FT_BOOLEAN. */ if (hfinfo->type == FT_BOOLEAN) { if (hfinfo->strings) { @@ -213,6 +208,7 @@ mk_fvalue_from_val_string(header_field_info *hfinfo, char *s) return mk_uint32_fvalue(FALSE); } else { + dfilter_error_msg = NULL; /* Prefer this error message */ dfilter_fail("\"%s\" cannot be found among the possible values for %s.", s, hfinfo->abbrev); return NULL; @@ -226,10 +222,14 @@ mk_fvalue_from_val_string(header_field_info *hfinfo, char *s) return NULL; } + /* Reset the dfilter error message, since *something* interesting + * will happen, and the error message will be more interesting than + * any error message I happen to have now. */ + dfilter_error_msg = NULL; + if (hfinfo->display & BASE_RANGE_STRING) { dfilter_fail("\"%s\" cannot accept [range] strings as values.", hfinfo->abbrev); - return NULL; } else if (hfinfo->display == BASE_CUSTOM) { /* If a user wants to match against a custom string, we would @@ -240,7 +240,6 @@ mk_fvalue_from_val_string(header_field_info *hfinfo, char *s) */ dfilter_fail("\"%s\" cannot accept [custom] strings as values.", hfinfo->abbrev); - return NULL; } else { const value_string *vals = hfinfo->strings; |