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

Fix some more item-related warnings (check_typed_item_calls.py)

Browse source
This commit is contained in:
Martin Mathieson 2023-10-14 13:58:01 +01:00 committed by Gerald Combs
parent f59981450d
commit b42cd0df29
6 changed files with 63 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
epan/dissectors/file-png.c
View file

@ -408,7 +408,7 @@ proto_register_png(void)
NULL, HFILL }
},
{ &hf_png_chunk_type_str,
{ "Chunk", "png.chunk.type",
{ "Type", "png.chunk.type",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }
},

58
epan/dissectors/packet-q2931.c
View file

@ -713,9 +713,9 @@ static const value_string q2931_transfer_capability_vals[] = {
};
static const value_string q2931_susc_clip_vals[] = {
{ 0x00, "Not susceptible to clipping" },
{ 0x20, "Susceptible to clipping" },
{ 0x00, NULL }
{ 0, "Not susceptible to clipping" },
{ 1, "Susceptible to clipping" },
{ 0, NULL }
};
static const value_string q2931_up_conn_config_vals[] = {
@ -797,8 +797,8 @@ static const value_string q2931_uil2_vals[] = {
};
static const value_string q2931_mode_vals[] = {
{ 0x20, "Normal mode" },
{ 0x40, "Extended mode" },
{ 1, "Normal mode" },
{ 2, "Extended mode" },
{ 0, NULL }
};
@ -1292,12 +1292,12 @@ dissect_q2931_call_state_ie(tvbuff_t *tvb, int offset, int len,
* Dissect a (phone) number information element.
*/
static const value_string q2931_number_type_vals[] = {
{ 0x00, "Unknown" },
{ 0x10, "International number" },
{ 0x20, "National number" },
{ 0x30, "Network specific number" },
{ 0x40, "Subscriber number" },
{ 0x60, "Abbreviated number" },
{ 0x0, "Unknown" },
{ 0x1, "International number" },
{ 0x2, "National number" },
{ 0x3, "Network specific number" },
{ 0x4, "Subscriber number" },
{ 0x6, "Abbreviated number" },
{ 0, NULL }
};
@ -1313,9 +1313,9 @@ static const value_string q2931_numbering_plan_vals[] = {
};
static const value_string q2931_presentation_indicator_vals[] = {
{ 0x00, "Presentation allowed" },
{ 0x20, "Presentation restricted" },
{ 0x40, "Number not available" },
{ 0, "Presentation allowed" },
{ 1, "Presentation restricted" },
{ 2, "Number not available" },
{ 0, NULL }
};
@ -1381,15 +1381,15 @@ dissect_q2931_number_ie(tvbuff_t *tvb, packet_info* pinfo, int offset, int len,
* Dissect a party subaddress information element.
*/
static const value_string q2931_subaddress_type_vals[] = {
{ 0x00, "X.213/ISO 8348 NSAP" },
{ 0x10, "User-specified ATM endsystem address" },
{ 0x20, "User-specified" },
{ 0, "X.213/ISO 8348 NSAP" },
{ 1, "User-specified ATM endsystem address" },
{ 2, "User-specified" },
{ 0, NULL }
};
static const value_string q2931_odd_even_indicator_vals[] = {
{ 0x00, "Even number of address signals" },
{ 0x10, "Odd number of address signals" },
{ 0, "Even number of address signals" },
{ 1, "Odd number of address signals" },
{ 0, NULL }
};
@ -1414,9 +1414,9 @@ dissect_q2931_party_subaddr_ie(tvbuff_t *tvb, int offset, int len,
* Dissect a connection identifier information element.
*/
static const value_string q2931_vp_associated_signalling_vals[] = {
{ 0x00, "Yes" },
{ 0x08, "No - explicit indication of VPCI" },
{ 0x00, NULL }
{ 0, "Yes" },
{ 1, "No - explicit indication of VPCI" },
{ 0, NULL }
};
static const value_string q2931_preferred_exclusive_vals[] = {
@ -1582,9 +1582,9 @@ dissect_q2931_bband_sending_compl_ie(tvbuff_t *tvb, packet_info* pinfo, int offs
* Dissect a Transit network selection information element.
*/
static const value_string q2931_netid_type_vals[] = {
{ 0x00, "User specified" },
{ 0x20, "National network identification" },
{ 0x30, "International network identification" },
{ 0, "User specified" },
{ 2, "National network identification" },
{ 3, "International network identification" },
{ 0, NULL }
};
@ -1616,14 +1616,14 @@ dissect_q2931_transit_network_sel_ie(tvbuff_t *tvb, int offset, int len,
* Dissect an OAM traffic descriptor information element.
*/
static const value_string q2931_shaping_indicator_vals[] = {
{ 0x00, "No user specified requirement" },
{ 0x20, "Aggregate shaping of user and OAM cells not allowed" },
{ 0, "No user specified requirement" },
{ 1, "Aggregate shaping of user and OAM cells not allowed" },
{ 0, NULL }
};
static const value_string q2931_user_net_fault_mgmt_vals[] = {
{ 0x00, "No user-originated fault management indications" },
{ 0x01, "User-originated fault management indications, cell rate 1 cell/s" },
{ 0, "No user-originated fault management indications" },
{ 1, "User-originated fault management indications, cell rate 1 cell/s" },
{ 0, NULL }
};

10
epan/dissectors/packet-s7comm_szl_ids.c
View file

@ -22,10 +22,10 @@ static gint hf_s7comm_userdata_szl_partial_list = -1; /* Partial list
static gint hf_s7comm_userdata_szl_id = -1; /* SZL id */
static const value_string szl_module_type_names[] = {
{ 0x0000, "CPU" }, /* Binary: 0000 */
{ 0x0100, "IM" }, /* Binary: 0100 */
{ 0xC000, "CP" }, /* Binary: 1100 */
{ 0x8000, "FM" }, /* Binary: 1000 */
{ 0x0, "CPU" }, /* Binary: 0000 */
{ 0x4, "IM" }, /* Binary: 0100 */
{ 0xc, "CP" }, /* Binary: 1100 */
{ 0x8, "FM" }, /* Binary: 1000 */
{ 0, NULL }
};
static gint hf_s7comm_userdata_szl_id_type = -1;
@ -5766,7 +5766,7 @@ s7comm_register_szl_types(int proto)
{ "Diagnostic type", "s7comm.data.userdata.szl_id.diag_type", FT_UINT16, BASE_HEX, VALS(szl_module_type_names), 0xf000,
NULL, HFILL }},
{ &hf_s7comm_userdata_szl_id_partlist_ex,
{ "Number of the partial list extract", "s7comm.data.userdata.szl_id.partlist_ex", FT_UINT16, BASE_HEX | BASE_EXT_STRING, &szl_id_partlist_ex_names_ext, 0xffff,
{ "Number of the partial list extract", "s7comm.data.userdata.szl_id.partlist_ex", FT_UINT16, BASE_HEX | BASE_EXT_STRING, &szl_id_partlist_ex_names_ext, 0x0,
NULL, HFILL }},
{ &hf_s7comm_userdata_szl_id_partlist_num,
{ "Number of the partial list", "s7comm.data.userdata.szl_id.partlist_num", FT_UINT16, BASE_HEX | BASE_EXT_STRING, &szl_partial_list_names_ext, 0x00ff,

48
epan/dissectors/packet-tn5250.c
View file

@ -601,11 +601,11 @@ static const struct true_false_string tn5250_field_wdsf_cw_bp_flag1_1 = {
#define WTF_BITS 0xC0
static const value_string vals_tn5250_wdsf_cw_tf_flag_orientation[] = {
{ 0x00, "Window Title or Footer is Centered"},
{ 0x40, "Window Title or Footer is Right Justified"},
{ 0x80, "Window Title or Footer is Left Justified"},
{ 0xC0, "Reserved (Window Title or Footer is Centered)"},
{ 0x00, NULL }
{ 0, "Window Title or Footer is Centered"},
{ 1, "Window Title or Footer is Right Justified"},
{ 2, "Window Title or Footer is Left Justified"},
{ 3, "Reserved (Window Title or Footer is Centered)"},
{ 0, NULL }
};
static const struct true_false_string tn5250_field_wdsf_cw_tf_flag_1 = {
@ -651,11 +651,11 @@ static const value_string vals_tn5250_wdsf_ds_flag1_mouse_characteristics[] = {
#define DS_AUTO_ENTER_BITS 0x30
static const value_string vals_tn5250_wdsf_ds_flag1_auto_enter[] = {
{ 0x00, "Selection field is not auto-enter"},
{ 0x20, "Selection field is auto-enter on selection except if double-digit numeric selection is used."},
{ 0x10, "Selection field is auto-enter on selection or deselection except if double-digit numeric selection is used. "},
{ 0x30, "Selection field is auto-enter on selection except if single-digit or double-digit numeric selection is used."},
{ 0x00, NULL }
{ 0, "Selection field is not auto-enter"},
{ 2, "Selection field is auto-enter on selection except if double-digit numeric selection is used."},
{ 1, "Selection field is auto-enter on selection or deselection except if double-digit numeric selection is used. "},
{ 3, "Selection field is auto-enter on selection except if single-digit or double-digit numeric selection is used."},
{ 0, NULL }
};
static const struct true_false_string tn5250_field_wdsf_ds_flag1_1 = {
@ -752,9 +752,9 @@ static const value_string vals_tn5250_wdsf_ds_gdc_indicators[] = {
{ 0x00, NULL }
};
#define DS_SELECTION_TECHNIQUES1 0x20
#define DS_SELECTION_TECHNIQUES2 0x40
#define DS_SELECTION_TECHNIQUES3 0xE0
#define DS_SELECTION_TECHNIQUES1 0x1
#define DS_SELECTION_TECHNIQUES2 0x2
#define DS_SELECTION_TECHNIQUES3 0x7
#define DS_SELECTION_TECHNIQUES_BITS 0xE0
static const value_string vals_tn5250_wdsf_ds_gdc_selection_techniques[] = {
@ -784,11 +784,11 @@ static const value_string vals_tn5250_wdsf_ds_nws_indicators[] = {
{ 0x00, NULL }
};
#define DS_NWS_SELECTION_TECHNIQUES1 0x20
#define DS_NWS_SELECTION_TECHNIQUES2 0x40
#define DS_NWS_SELECTION_TECHNIQUES3 0x80
#define DS_NWS_SELECTION_TECHNIQUES4 0xA0
#define DS_NWS_SELECTION_TECHNIQUES5 0xE0
#define DS_NWS_SELECTION_TECHNIQUES1 0x1
#define DS_NWS_SELECTION_TECHNIQUES2 0x2
#define DS_NWS_SELECTION_TECHNIQUES3 0x4
#define DS_NWS_SELECTION_TECHNIQUES4 0x5
#define DS_NWS_SELECTION_TECHNIQUES5 0x7
#define DS_NWS_SELECTION_TECHNIQUES_BITS 0xE0
static const value_string vals_tn5250_wdsf_ds_nws_selection_techniques[] = {
@ -835,9 +835,9 @@ static const struct true_false_string tn5250_field_wdsf_ds_ct_flag1_5 = {
"No Action"
};
#define DS_NUMERIC_SELECTION_NOT_INCLUDED 0x00
#define DS_NUMERIC_SELECTION_SINGLE_DIGIT 0x40
#define DS_NUMERIC_SELECTION_DOUBLE_DIGIT 0x80
#define DS_NUMERIC_SELECTION_NOT_INCLUDED 0x0
#define DS_NUMERIC_SELECTION_SINGLE_DIGIT 0x1
#define DS_NUMERIC_SELECTION_DOUBLE_DIGIT 0x2
#define DS_NUMERIC_SELECTION_BITS 0xC0
static const value_string vals_tn5250_wdsf_ds_ct_flag1_numeric_selection[] = {
@ -2071,9 +2071,9 @@ static const struct true_false_string tn5250_field_qr_flag1_7 = {
};
static const value_string vals_tn5250_qr_flag2_0to3[] = {
{ 0x10, "24 x 80 Screen Size"},
{ 0x30, "Capable of 24 x 80 and 27 x 132"},
{ 0x00, NULL }
{ 0x1, "24 x 80 Screen Size"},
{ 0x3, "Capable of 24 x 80 and 27 x 132"},
{ 0, NULL }
};
static const struct true_false_string tn5250_field_qr_flag2_4 = {

2
epan/dissectors/packet-userlog.c
View file

@ -231,7 +231,7 @@ proto_register_userlog(void)
},
{ &hf_userlog_header_reserved,
{ "Reserved", "userlog.header_reserved",
{ "Reserved", "userlog.reserved",
FT_BYTES, BASE_NONE,
NULL, 0x0,
NULL, HFILL }

4
tools/check_typed_item_calls.py
View file

@ -303,7 +303,9 @@ class ProtoTreeAddItemCheck(APICheck):
'(skip == 1) ? ENC_BIG_ENDIAN : ENC_LITTLE_ENDIAN',
'pdu_info->sbc', 'pdu_info->mbc',
'seq_info->txt_enc | ENC_NA',
'BASE_SHOW_UTF_8_PRINTABLE'
'BASE_SHOW_UTF_8_PRINTABLE',
'dhcp_secs_endian',
'is_mdns ? ENC_UTF_8|ENC_NA : ENC_ASCII|ENC_NA'
}:
global warnings_found