diff options
author | Guy Harris <guy@alum.mit.edu> | 2014-11-29 15:01:34 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2014-11-29 23:02:02 +0000 |
commit | e28a847eb53bb0669e77eb99f0856c1a34022163 (patch) | |
tree | a3a78214a41a1bfd1fa45a5021657ac779d01eb1 /tfshark.c | |
parent | 81ab6012fe1ae14b9d7719035b8156368fa48c7e (diff) |
Fix tfshark.c to match changes to epan/print.[ch].
Change-Id: I765cd0dbb5451b578ccabd221afc477a6559e60c
Reviewed-on: https://code.wireshark.org/review/5537
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'tfshark.c')
-rw-r--r-- | tfshark.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -2142,13 +2142,13 @@ write_preamble(capture_file *cf) switch (output_action) { case WRITE_TEXT: - return print_preamble(print_stream, cf ? cf->filename : NULL, get_ws_vcs_version_info()); + return print_preamble(print_stream, cf->filename, get_ws_vcs_version_info()); case WRITE_XML: if (print_details) - write_pdml_preamble(stdout, cf ? cf->filename : NULL); + write_pdml_preamble(stdout, cf->filename); else - write_psml_preamble(cf, stdout); + write_psml_preamble(&cf->cinfo, stdout); return !ferror(stdout); case WRITE_FIELDS: @@ -2453,7 +2453,7 @@ print_packet(capture_file *cf, epan_dissect_t *edt) break; case WRITE_XML: - proto_tree_write_psml(edt, stdout); + write_psml_columns(edt, stdout); return !ferror(stdout); case WRITE_FIELDS: /*No non-verbose "fields" format */ g_assert_not_reached(); @@ -2487,11 +2487,11 @@ print_packet(capture_file *cf, epan_dissect_t *edt) break; case WRITE_XML: - proto_tree_write_pdml(edt, stdout); + write_pdml_proto_tree(edt, stdout); printf("\n"); return !ferror(stdout); case WRITE_FIELDS: - proto_tree_write_fields(output_fields, edt, &cf->cinfo, stdout); + write_fields_proto_tree(output_fields, edt, &cf->cinfo, stdout); printf("\n"); return !ferror(stdout); } |