summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/libwireshark0.symbols1
-rw-r--r--epan/proto.c11
-rw-r--r--epan/to_str.c11
-rw-r--r--epan/to_str.h2
4 files changed, 11 insertions, 14 deletions
diff --git a/debian/libwireshark0.symbols b/debian/libwireshark0.symbols
index 0e01908d51..a32d22a510 100644
--- a/debian/libwireshark0.symbols
+++ b/debian/libwireshark0.symbols
@@ -223,7 +223,6 @@ libwireshark.so.0 libwireshark0 #MINVER#
decode_as_default_populate_list@Base 1.12.0~rc1
decode_as_default_reset@Base 1.12.0~rc1
decode_as_list@Base 1.12.0~rc1
- decode_bitfield_value@Base 1.9.1
decode_bits_in_field@Base 1.9.1
decode_dcerpc_add_show_list@Base 1.12.0~rc1
decode_dcerpc_reset_all@Base 1.12.0~rc1
diff --git a/epan/proto.c b/epan/proto.c
index d22e41539a..cbc761c0e5 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -3334,6 +3334,17 @@ proto_tree_set_boolean(field_info *fi, guint64 value)
proto_tree_set_uint64(fi, value);
}
+static char *
+decode_bitfield_value(char *buf, const guint64 val, const guint64 mask, const int width)
+{
+ char *p;
+
+ p = other_decode_bitfield_value(buf, val, mask, width);
+ p = g_stpcpy(p, " = ");
+
+ return p;
+}
+
/* Add a FT_FLOAT to a proto_tree */
proto_item *
proto_tree_add_float(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
diff --git a/epan/to_str.c b/epan/to_str.c
index 64e7c666f9..ca72e2f104 100644
--- a/epan/to_str.c
+++ b/epan/to_str.c
@@ -1034,17 +1034,6 @@ other_decode_bitfield_value(char *buf, const guint64 val, const guint64 mask, co
return p;
}
-char *
-decode_bitfield_value(char *buf, const guint64 val, const guint64 mask, const int width)
-{
- char *p;
-
- p = other_decode_bitfield_value(buf, val, mask, width);
- p = g_stpcpy(p, " = ");
-
- return p;
-}
-
/*
This function is very fast and this function is called a lot.
XXX update the address_to_str stuff to use this function.
diff --git a/epan/to_str.h b/epan/to_str.h
index 3f1643bc01..4b409d6dec 100644
--- a/epan/to_str.h
+++ b/epan/to_str.h
@@ -92,8 +92,6 @@ WS_DLL_PUBLIC char *decode_bits_in_field(const guint bit_offset, const gint no_o
WS_DLL_PUBLIC char *other_decode_bitfield_value(char *buf, const guint64 val, const guint64 mask,
const int width);
-WS_DLL_PUBLIC char *decode_bitfield_value(char *buf, const guint64 val, const guint64 mask,
- const int width);
WS_DLL_PUBLIC const gchar* port_type_to_str (port_type type);