osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

rbm: fix a bunch of used-but-marked-unused warnings 

file-rbm.c:143:34: error: 'tree' was marked unused but was used
        proto_tree_add_int_format_value(tree, hf_rbm_integer, tvb, *offset, len, value, "%d", value);
                                        ^
file-rbm.c:374:23: error: 'offset' was marked unused but was used
        gint offset_start = *offset;
                             ^
file-rbm.c:375:48: error: 'tree' was marked unused but was used
        proto_tree* drb_tree = proto_tree_add_subtree(tree, tvb, *offset, 0, ett_variable, NULL, "Objects");
                                                      ^
file-rbm.c:375:54: error: 'tvb' was marked unused but was used
        proto_tree* drb_tree = proto_tree_add_subtree(tree, tvb, *offset, 0, ett_variable, NULL, "Objects");
                                                            ^
file-rbm.c:375:60: error: 'offset' was marked unused but was used
        proto_tree* drb_tree = proto_tree_add_subtree(tree, tvb, *offset, 0, ett_variable, NULL, "Objects");
                                                                  ^
file-rbm.c:376:21: error: 'tvb' was marked unused but was used
        dissect_rbm_object(tvb, pinfo, drb_tree, offset, NULL, NULL);
                           ^
file-rbm.c:376:26: error: 'pinfo' was marked unused but was used
        dissect_rbm_object(tvb, pinfo, drb_tree, offset, NULL, NULL);
                                ^
file-rbm.c:376:43: error: 'offset' was marked unused but was used
        dissect_rbm_object(tvb, pinfo, drb_tree, offset, NULL, NULL);
                                                 ^
file-rbm.c:377:21: error: 'tvb' was marked unused but was used
        dissect_rbm_object(tvb, pinfo, drb_tree, offset, NULL, NULL);
                           ^
file-rbm.c:377:26: error: 'pinfo' was marked unused but was used
        dissect_rbm_object(tvb, pinfo, drb_tree, offset, NULL, NULL);
                                ^
file-rbm.c:377:43: error: 'offset' was marked unused but was used
        dissect_rbm_object(tvb, pinfo, drb_tree, offset, NULL, NULL);
                                                 ^
file-rbm.c:378:32: error: 'offset' was marked unused but was used
        proto_item_set_len(drb_tree, *offset - offset_start);
                                      ^
file-rbm.c:526:26: error: 'pinfo' was marked unused but was used
                expert_add_info_format(pinfo, tree, &ei_rbm_version_unsupported, "Version %u.%u is not supported (only %u.%u)",

Change-Id: Id255df237c43c313720797a46c0e877f0f7550e0
Reviewed-on: https://code.wireshark.org/review/33370
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
Martin Kaiser 2019-05-26 18:17:53 +02:00 committed by Alexis La Goutte
parent 01768d0264
commit e08937ac44
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/file-rbm.c
View File

@ -134,7 +134,7 @@ void get_rbm_integer(tvbuff_t* tvb, guint offset, gint32* value, guint* len)
}
}
static void dissect_rbm_integer(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree _U_, guint* offset, gchar** value_str)
static void dissect_rbm_integer(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, guint* offset, gchar** value_str)
{
gint32 value = 0;
gint len = 0;
@ -369,7 +369,7 @@ static void dissect_rbm_struct(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tr
dissect_rbm_hash(tvb, pinfo, tree, offset, NULL);
}
static void dissect_rbm_drb(tvbuff_t* tvb _U_, packet_info* pinfo _U_, proto_tree* tree _U_, gint* offset _U_)
static void dissect_rbm_drb(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, gint* offset)
{
gint offset_start = *offset;
proto_tree* drb_tree = proto_tree_add_subtree(tree, tvb, *offset, 0, ett_variable, NULL, "Objects");
@ -509,7 +509,7 @@ static void dissect_rbm_object(tvbuff_t* tvb, packet_info* pinfo, proto_tree* pt
*value = value_local;
}
static gboolean dissect_rbm_header(tvbuff_t* tvb, packet_info* pinfo _U_, proto_tree* tree, gint* offset)
static gboolean dissect_rbm_header(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, gint* offset)
{
guint8 major;
guint8 minor;