diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-24 02:17:12 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-24 02:17:12 +0000 |
| commit | 8531980952708eb41d8ddd7f407e60d14430d726 (patch) | |
| tree | efec4cfc6d9edccfca49bb2017f1ff63d00cca9e /epan/dissectors/packet-tpncp.c | |
| parent | b11f44c741d94038a83a13b4ac5e09645c50b87b (diff) | |
From Kovarththanan Rajaratnam:
More hf_register_info related cleanup.
svn path=/trunk/; revision=28832
Diffstat (limited to 'epan/dissectors/packet-tpncp.c')
| -rw-r--r-- | epan/dissectors/packet-tpncp.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/epan/dissectors/packet-tpncp.c b/epan/dissectors/packet-tpncp.c index c39a72a93b..a10ebc1421 100644 --- a/epan/dissectors/packet-tpncp.c +++ b/epan/dissectors/packet-tpncp.c @@ -565,7 +565,6 @@ static gint init_tpncp_data_fields_info(tpncp_data_field_info *data_fields_info, tpncp_db_entry[0] = 0; /* Register common fields of hf_register_info struture. */ - hf_entr.hfinfo.display = BASE_DEC; hf_entr.hfinfo.strings = NULL; hf_entr.hfinfo.bitmask = 0x0; hf_entr.hfinfo.blurb = NULL; @@ -594,6 +593,10 @@ static gint init_tpncp_data_fields_info(tpncp_data_field_info *data_fields_info, hf_size--; break; } + + /* Default to decimal display type */ + hf_entr.hfinfo.display = BASE_DEC; + if ((tmp = strtok(tpncp_db_entry, " ")) == NULL) continue; /* Badly formed data base entry - skip corresponding field's registration. */ data_id = atoi(tmp); @@ -646,7 +649,12 @@ static gint init_tpncp_data_fields_info(tpncp_data_field_info *data_fields_info, switch (tpncp_data_field_size) { case 1: case 2: case 3: case 4: case 5: case 6: case 7: case 8: - hf_entr.hfinfo.type = (tpncp_data_field_array_dim)?FT_STRING:((tpncp_data_field_sign)?FT_UINT8:FT_INT8); + if (tpncp_data_field_array_dim) { + hf_entr.hfinfo.type = FT_STRING; + hf_entr.hfinfo.display = BASE_NONE; + } + else + hf_entr.hfinfo.type = (tpncp_data_field_sign)?FT_UINT8:FT_INT8; break; case 16: hf_entr.hfinfo.type = (tpncp_data_field_sign)?FT_UINT16:FT_INT16; |