aboutsummaryrefslogtreecommitdiffstats
path: root/epan/proto.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2017-04-18 15:27:28 -0700
committerGuy Harris <guy@alum.mit.edu>2017-04-18 22:28:07 +0000
commit913f9fb35335acd30aa231b00b23fd8f0dc379fb (patch)
tree01c6efe0aa401ea0c83507083cec853456ddcc77 /epan/proto.c
parentc9088466253f53bb29602810b7f4ad5fca627f92 (diff)
Rename BASE_VALS_NO_UNKNOWN to BASE_SPECIAL_VALS.
It makes it a bit clearer what its purpose is - to allow a value_string to be used for numeric rather than enumerated fields, giving certain values of the field a special meaning. Change the explanation in the documentation to match as well. Change-Id: Id07b22eee996b79ea5f3473928d29adcabe09bf3 Reviewed-on: https://code.wireshark.org/review/21209 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/proto.c')
-rw-r--r--epan/proto.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/proto.c b/epan/proto.c
index a8f8e5c212..ed1dbfab4a 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -7118,10 +7118,10 @@ tmp_fld_check_assert(header_field_info *hfinfo)
hfinfo->name, hfinfo->abbrev,
ftype_name(hfinfo->type));
}
- if (hfinfo->display & BASE_VALS_NO_UNKNOWN) {
+ if (hfinfo->display & BASE_SPECIAL_VALS) {
g_error("Field '%s' (%s) is an integral value (%s)"
" that is being displayed as BASE_NONE but"
- " with BASE_VALS_NO_UNKNOWN",
+ " with BASE_SPECIAL_VALS",
hfinfo->name, hfinfo->abbrev,
ftype_name(hfinfo->type));
}
@@ -8279,7 +8279,7 @@ fill_label_number(field_info *fi, gchar *label_str, gboolean is_signed)
const char *val_str = hf_try_val_to_str(value, hfinfo);
out = hfinfo_number_vals_format(hfinfo, buf, value);
- if (hfinfo->display & BASE_VALS_NO_UNKNOWN) {
+ if (hfinfo->display & BASE_SPECIAL_VALS) {
/*
* Unique values only display value_string string
* if there is a match. Otherwise it's just a number