diff options
author | Anders Broman <anders.broman@ericsson.com> | 2013-03-18 22:38:56 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-18 22:38:56 +0000 |
commit | d8bd66c29163c447a9d9a5cf8418b94cd3f9b7cf (patch) | |
tree | b011e092bd379a5b77663c8228b348166b5e0abd /epan/dissectors/packet-tpncp.c | |
parent | 60c7db179643f47e05e67ef9a1e53abd8a9c6d8a (diff) |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48409
Diffstat (limited to 'epan/dissectors/packet-tpncp.c')
-rw-r--r-- | epan/dissectors/packet-tpncp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-tpncp.c b/epan/dissectors/packet-tpncp.c index d6ae0b5c55..3c85ab78ac 100644 --- a/epan/dissectors/packet-tpncp.c +++ b/epan/dissectors/packet-tpncp.c @@ -345,9 +345,9 @@ static gint fill_tpncp_id_vals(value_string string[], FILE *file) { gint i = 0, tpncp_id = 0; gchar *tpncp_name = NULL, *line_in_file = NULL; - line_in_file = ep_alloc(MAX_TPNCP_DB_ENTRY_LEN); + line_in_file = (gchar *)ep_alloc(MAX_TPNCP_DB_ENTRY_LEN); line_in_file[0] = 0; - tpncp_name = ep_alloc(MAX_TPNCP_DB_ENTRY_LEN); + tpncp_name = (gchar *)ep_alloc(MAX_TPNCP_DB_ENTRY_LEN); tpncp_name[0] = 0; while (fgets(line_in_file, MAX_TPNCP_DB_ENTRY_LEN, file) != NULL) { @@ -377,13 +377,13 @@ static gint fill_enums_id_vals(FILE *file) { gchar *line_in_file = NULL, *enum_name = NULL, *enum_type = NULL, *enum_str = NULL; - line_in_file = ep_alloc(MAX_TPNCP_DB_ENTRY_LEN); + line_in_file = (gchar *)ep_alloc(MAX_TPNCP_DB_ENTRY_LEN); line_in_file[0] = 0; - enum_name = ep_alloc(MAX_TPNCP_DB_ENTRY_LEN); + enum_name = (gchar *)ep_alloc(MAX_TPNCP_DB_ENTRY_LEN); enum_name[0] = 0; - enum_type = ep_alloc(MAX_TPNCP_DB_ENTRY_LEN); + enum_type = (gchar *)ep_alloc(MAX_TPNCP_DB_ENTRY_LEN); enum_type[0] = 0; - enum_str = ep_alloc(MAX_TPNCP_DB_ENTRY_LEN); + enum_str = (gchar *)ep_alloc(MAX_TPNCP_DB_ENTRY_LEN); enum_str[0] = 0; while (fgets(line_in_file, MAX_TPNCP_DB_ENTRY_LEN, file) != NULL) { @@ -572,11 +572,11 @@ static gint init_tpncp_data_fields_info(tpncp_data_field_info *data_fields_info, } }; - tpncp_db_entry = ep_alloc(MAX_TPNCP_DB_ENTRY_LEN); + tpncp_db_entry = (gchar *)ep_alloc(MAX_TPNCP_DB_ENTRY_LEN); tpncp_db_entry[0] = 0; /* Register common fields of hf_register_info struture. */ - hf_entr.hfinfo.type = 0; + hf_entr.hfinfo.type = FT_NONE; hf_entr.hfinfo.strings = NULL; hf_entr.hfinfo.bitmask = 0x0; hf_entr.hfinfo.blurb = NULL; |