diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2017-04-25 11:36:18 +0200 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2017-04-25 11:26:44 +0000 |
| commit | 907d05da84f97b893887416d453a540a793c9ec5 (patch) | |
| tree | 328040bd0eedf2315e948655a9307b7e3d2b1b2e | |
| parent | 0d3da40fcd4ccd4618e7ae06b9ba1e8eefbc88e6 (diff) | |
| download | wireshark-907d05da84f97b893887416d453a540a793c9ec5.tar.gz | |
print: Avoid shadowing a global variable
Change-Id: I9c04bc1d6fc5511d404987dd94eee342e0d75442
Reviewed-on: https://code.wireshark.org/review/21332
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
| -rw-r--r-- | epan/print.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/print.c b/epan/print.c index 90710f5afb..90648fe04a 100644 --- a/epan/print.c +++ b/epan/print.c @@ -135,7 +135,7 @@ void print_cache_field_handles(void) } gboolean -proto_tree_print(print_dissections_e print_dissections, gboolean print_hex_data, +proto_tree_print(print_dissections_e print_dissections, gboolean print_hex, epan_dissect_t *edt, GHashTable *output_only_tables, print_stream_t *stream) { @@ -150,7 +150,7 @@ proto_tree_print(print_dissections_e print_dissections, gboolean print_hex_data, data.print_dissections = print_dissections; /* If we're printing the entire packet in hex, don't print uninterpreted data fields in hex as well. */ - data.print_hex_for_data = !print_hex_data; + data.print_hex_for_data = !print_hex; data.output_only_tables = output_only_tables; proto_tree_children_foreach(edt->tree, proto_tree_print_node, &data); @@ -340,7 +340,7 @@ write_pdml_proto_tree(output_fields_t* fields, gchar **protocolfilter, pf_flags void write_json_proto_tree(output_fields_t* fields, print_dissections_e print_dissections, - gboolean print_hex_data, gchar **protocolfilter, + gboolean print_hex, gchar **protocolfilter, pf_flags protocolfilter_flags, epan_dissect_t *edt, FILE *fh) { @@ -378,7 +378,7 @@ write_json_proto_tree(output_fields_t* fields, data.src_list = edt->pi.data_src; data.filter = protocolfilter; data.filter_flags = protocolfilter_flags; - data.print_hex = print_hex_data; + data.print_hex = print_hex; data.print_text = TRUE; if (print_dissections == print_dissections_none) { data.print_text = FALSE; @@ -399,7 +399,7 @@ write_json_proto_tree(output_fields_t* fields, void write_ek_proto_tree(output_fields_t* fields, - gboolean print_hex_data, gchar **protocolfilter, + gboolean print_hex, gchar **protocolfilter, pf_flags protocolfilter_flags, epan_dissect_t *edt, FILE *fh) { @@ -429,7 +429,7 @@ write_ek_proto_tree(output_fields_t* fields, data.src_list = edt->pi.data_src; data.filter = protocolfilter; data.filter_flags = protocolfilter_flags; - data.print_hex = print_hex_data; + data.print_hex = print_hex; proto_tree_children_foreach(edt->tree, proto_tree_write_node_ek, &data); |