Fix benign bugs in some proto_tree_add_item() 'encoding' args;

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39351 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c
index 7eefd08c74c4353b26786e44057f53974cceaa67..ec5bf6cd81dd040566bc8454297c3e2bf539305e 100644 (file)
--- a/epan/dissectors/packet-3g-a11.c
+++ b/epan/dissectors/packet-3g-a11.c
@@ -1087,7 +1087,7 @@ static void dissect_fwd_qosinfo(tvbuff_t* tvb, int offset, proto_tree* ext_tree)
 
             /* Flow Priority */
             proto_tree_add_item(exts_tree1, hf_a11_fqi_flow_priority, tvb,offset+clen , 1, ENC_BIG_ENDIAN);
-                       
+
             /*  Num of QoS attribute sets */
             proto_tree_add_item(exts_tree1, hf_a11_fqi_num_qos_attribute_set, tvb, offset+clen, 1, ENC_BIG_ENDIAN);
 
@@ -1098,7 +1098,7 @@ static void dissect_fwd_qosinfo(tvbuff_t* tvb, int offset, proto_tree* ext_tree)
             /* QoS attribute set */
             ti2 = proto_tree_add_text(exts_tree1, tvb, offset+clen, 4, "QoS Attribute Set");
             exts_tree2 = proto_item_add_subtree(ti2, ett_a11_fqi_qos_attribute_set);
-                       
+
             /* QoS attribute setid */
             proto_tree_add_item(exts_tree2, hf_a11_fqi_qos_attribute_setid, tvb, offset+clen, 2, ENC_BIG_ENDIAN);
             clen++;
@@ -1401,7 +1401,7 @@ dissect_a11_extensions( tvbuff_t *tvb, int offset, proto_tree *tree)
                                             "Unknown Extension %u"));
         ext_tree = proto_item_add_subtree(ti, ett_a11_ext);
 
-        proto_tree_add_item(ext_tree, hf_a11_ext_type, tvb, offset, 1, ext_type);
+        proto_tree_add_item(ext_tree, hf_a11_ext_type, tvb, offset, 1, ENC_BIG_ENDIAN);
         offset++;
 
         if (ext_type == SS_EXT) {

diff --git a/epan/dissectors/packet-9p.c b/epan/dissectors/packet-9p.c
index 5303ede55e1f15bf273567fd7d11200ad532d7db..a1cb9ada5062c859d83a6cd4b585d78622f1ce62 100644 (file)
--- a/epan/dissectors/packet-9p.c
+++ b/epan/dissectors/packet-9p.c
@@ -580,7 +580,7 @@ static void dissect_9P_mode(tvbuff_t * tvb,  proto_item * item,int offset)
                return;
        proto_tree_add_boolean(mode_tree, hf_9P_mode_c, tvb, offset, 1, mode);
        proto_tree_add_boolean(mode_tree, hf_9P_mode_t, tvb, offset, 1, mode);
-       proto_tree_add_item(mode_tree, hf_9P_mode_rwx, tvb, offset, 1, mode);
+       proto_tree_add_item(mode_tree, hf_9P_mode_rwx, tvb, offset, 1, ENC_NA);
 }
 
 /* dissect 9P Qid */

diff --git a/epan/dissectors/packet-aim-messaging.c b/epan/dissectors/packet-aim-messaging.c
index 238cf83558aea0dda716398545648d966b2e3586..65dc765b77400b44b9b341419740c5b101f67f8d 100644 (file)
--- a/epan/dissectors/packet-aim-messaging.c
+++ b/epan/dissectors/packet-aim-messaging.c
@@ -495,7 +495,7 @@ dissect_aim_rendezvous_extended_message(tvbuff_t *tvb, proto_tree *msg_tree)
        /* message_type = tvb_get_guint8(tvb, offset); */
        proto_tree_add_item(msg_tree, hf_aim_rendezvous_extended_data_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1;
        message_flags = tvb_get_guint8(tvb, offset);
-       ti_flags = proto_tree_add_item(msg_tree, hf_aim_rendezvous_extended_data_message_flags, tvb, offset, 1, message_flags);
+       ti_flags = proto_tree_add_item(msg_tree, hf_aim_rendezvous_extended_data_message_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
        flags_entry = proto_item_add_subtree(ti_flags, ett_aim_extended_data_message_flags);
        proto_tree_add_boolean(flags_entry, hf_aim_rendezvous_extended_data_message_flags_normal, tvb, offset, 1, message_flags);
        proto_tree_add_boolean(flags_entry, hf_aim_rendezvous_extended_data_message_flags_auto, tvb, offset, 1, message_flags);

diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c
index ab247ea9c0a2f198f92bc907a57d923077c00b1f..9e4fefef8fb12ddc4843641db38262f1c7689ec1 100644 (file)
--- a/epan/dissectors/packet-dec-dnart.c
+++ b/epan/dissectors/packet-dec-dnart.c
@@ -506,7 +506,7 @@ dissect_dec_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         offset++;
     } else {
         proto_tree_add_item(flags_tree, hf_dec_rt_short_msg,
-                tvb, offset, 1, msg_flags);
+                tvb, offset, 1, ENC_LITTLE_ENDIAN);
         proto_tree_add_boolean(flags_tree, hf_dec_rt_rqr, tvb,
                     offset, 1, msg_flags);
         proto_tree_add_boolean(flags_tree, hf_dec_rt_rts, tvb,

diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c
index 0fb93df786c909e3db79e5f8307749e1bce9958e..547e6175a0ab22a52a443c70dafec6cc7d355c64 100644 (file)
--- a/epan/dissectors/packet-iscsi.c
+++ b/epan/dissectors/packet-iscsi.c
@@ -1393,7 +1393,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off
                proto_tree *tt = proto_item_add_subtree(tf, ett_iscsi_Flags);
 #endif
 
-               proto_tree_add_item(ti, hf_iscsi_snack_type, tvb, offset + 1, 1, b);
+               proto_tree_add_item(ti, hf_iscsi_snack_type, tvb, offset + 1, 1, ENC_BIG_ENDIAN);
            }
            if(iscsi_protocol_version > ISCSI_PROTOCOL_DRAFT09) {
                proto_tree_add_item(ti, hf_iscsi_TotalAHSLength, tvb, offset + 4, 1, ENC_BIG_ENDIAN);

diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c
index d05851668767e863a26888912d5c3530a8771aa4..338317756addfa034c3d024c110e744b5fce21f8 100644 (file)
--- a/epan/dissectors/packet-sbus.c
+++ b/epan/dissectors/packet-sbus.c
@@ -655,7 +655,6 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        guint8 sbus_web_aid;
        guint8 sbus_web_seq;
        guint8 sbus_rdwr_type;
-       guint8 sbus_rdwr_sequence;
        guint8 sbus_rdwr_block_tlg;
        guint8 sbus_rdwr_block_type;
        guint8 sbus_rdwr_ack_nak;
@@ -1176,19 +1175,17 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                                    sbus_web_size = tvb_get_guint8(tvb,offset);
                                    proto_tree_add_item(sbus_tree,
                                                        hf_sbus_web_size, tvb, offset,
-                                                       1, sbus_web_size);
+                                                       1, ENC_BIG_ENDIAN);
                                    offset += 1;
 
-                                   sbus_web_aid = tvb_get_guint8(tvb,offset);
                                    proto_tree_add_item(sbus_tree,
                                                        hf_sbus_web_aid, tvb, offset,
-                                                       1, sbus_web_aid);
+                                                       1, ENC_BIG_ENDIAN);
                                    offset += 1;
 
-                                   sbus_web_seq = tvb_get_guint8(tvb,offset);
                                    proto_tree_add_item(sbus_tree,
                                                        hf_sbus_web_seq, tvb, offset,
-                                                       1, sbus_web_seq);
+                                                       1, ENC_BIG_ENDIAN);
                                    offset += 1;
 
                                    if (sbus_web_size > 1) {
@@ -1221,7 +1218,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                                    sbus_rdwr_type = tvb_get_guint8(tvb,offset);
                                    proto_tree_add_item(sbus_tree,
                                                        hf_sbus_rdwr_telegram_type, tvb, offset,
-                                                       1, sbus_rdwr_type);
+                                                       1, ENC_BIG_ENDIAN);
                                    offset += 1;
                                    switch(sbus_rdwr_type) {
                                           case SBUS_WR_START_OF_STREAM:
@@ -1271,19 +1268,17 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                                                  }
                                                  break;
                                           case SBUS_WR_BLOCK_DATA_STREAM:
-                                                 sbus_rdwr_sequence = tvb_get_guint8(tvb,offset);
                                                  proto_tree_add_item(sbus_tree,
                                                                      hf_sbus_rdwr_telegram_sequence, tvb, offset,
-                                                                     1, sbus_rdwr_sequence);
+                                                                     1, ENC_BIG_ENDIAN);
                                                  offset += 1;
                                                  /*do not display a field for block data (skip)*/
                                                  offset += (sbus_rdwr_length-1);
                                                  break;
                                           case SBUS_WR_BLOCK_END_OF_STREAM:
-                                                 sbus_rdwr_sequence = tvb_get_guint8(tvb,offset);
                                                  proto_tree_add_item(sbus_tree,
                                                                      hf_sbus_rdwr_telegram_sequence, tvb, offset,
-                                                                     1, sbus_rdwr_sequence);
+                                                                     1, ENC_BIG_ENDIAN);
                                                  offset += 1;
                                                  /*do not display a field for block data (skip it)*/
                                                  offset += (sbus_rdwr_length-5);
@@ -1716,20 +1711,18 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                                    sbus_web_size = tvb_get_guint8(tvb,offset);
                                    proto_tree_add_item(sbus_tree,
                                                        hf_sbus_web_size, tvb, offset,
-                                                       1, sbus_web_size);
+                                                       1, ENC_BIG_ENDIAN);
                                    offset += 1;
 
-                                   sbus_web_aid = tvb_get_guint8(tvb,offset);
                                    proto_tree_add_item(sbus_tree,
                                                        hf_sbus_web_aid, tvb, offset,
-                                                       1, sbus_web_aid);
+                                                       1, ENC_BIG_ENDIAN);
                                    offset += 1;
 
                                    if (sbus_web_size > 1) {
-                                          sbus_web_seq = tvb_get_guint8(tvb,offset);
                                           proto_tree_add_item(sbus_tree,
                                                               hf_sbus_web_seq, tvb, offset,
-                                                              1, sbus_web_seq);
+                                                              1, ENC_BIG_ENDIAN);
                                           offset += 1;
 
                                           dt = proto_tree_add_text(sbus_tree, tvb, offset,
@@ -1750,7 +1743,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                                    sbus_rdwr_length = tvb_get_guint8(tvb,offset);
                                    proto_tree_add_item(sbus_tree,
                                                        hf_sbus_rdwr_block_length, tvb, offset,
-                                                       1, sbus_rdwr_length);
+                                                       1, ENC_BIG_ENDIAN);
                                    offset += 1;
                                    hi = proto_tree_add_item(sbus_tree,
                                                             hf_sbus_rdwr_acknakcode, tvb, offset,