diff options
author | Guy Harris <guy@alum.mit.edu> | 2014-11-29 14:43:22 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2014-11-29 22:44:29 +0000 |
commit | 81ab6012fe1ae14b9d7719035b8156368fa48c7e (patch) | |
tree | b49d0f01b1ab64432444bc882bf61d7d57c91381 /epan/print.h | |
parent | 05516b0c928ca7178ba4285dd8381b63e772cb53 (diff) |
Clean up routine names, don't pass capture_file into libwireshark.
Give all routines in epan/print.c that write a particular format a name
beginning with write_{formatname}.
If routines write columns, rather than the raw protocol tree, don't give
it a name containing proto_tree.
Get rid of empty preamble/finale routines.
For CSV, the preamble routine writes out column titles, so call it
write_csv_column_titles().
For C arrays, the body routine writes out raw hex data, so call it
write_carrays_hex_data().
capture_file isn't a structure defined by libwireshark, so don't make it
an argument passed into libwireshark.
Change-Id: I5a7e04de9382cf51a59d9d9802f815b8b3558332
Reviewed-on: https://code.wireshark.org/review/5536
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/print.h')
-rw-r--r-- | epan/print.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/epan/print.h b/epan/print.h index 37a4a08204..95bc6a9da2 100644 --- a/epan/print.h +++ b/epan/print.h @@ -105,23 +105,20 @@ WS_DLL_PUBLIC gboolean proto_tree_print(print_args_t *print_args, WS_DLL_PUBLIC gboolean print_hex_data(print_stream_t *stream, epan_dissect_t *edt); WS_DLL_PUBLIC void write_pdml_preamble(FILE *fh, const gchar* filename); -WS_DLL_PUBLIC void proto_tree_write_pdml(epan_dissect_t *edt, FILE *fh); +WS_DLL_PUBLIC void write_pdml_proto_tree(epan_dissect_t *edt, FILE *fh); WS_DLL_PUBLIC void write_pdml_finale(FILE *fh); -WS_DLL_PUBLIC void write_psml_preamble(capture_file *cf, FILE *fh); -WS_DLL_PUBLIC void proto_tree_write_psml(epan_dissect_t *edt, FILE *fh); +WS_DLL_PUBLIC void write_psml_preamble(column_info *cinfo, FILE *fh); +WS_DLL_PUBLIC void write_psml_columns(epan_dissect_t *edt, FILE *fh); WS_DLL_PUBLIC void write_psml_finale(FILE *fh); -WS_DLL_PUBLIC void write_csv_preamble(capture_file *cf, FILE *fh); -WS_DLL_PUBLIC void proto_tree_write_csv(epan_dissect_t *edt, FILE *fh); -WS_DLL_PUBLIC void write_csv_finale(FILE *fh); +WS_DLL_PUBLIC void write_csv_column_titles(column_info *cinfo, FILE *fh); +WS_DLL_PUBLIC void write_csv_columns(epan_dissect_t *edt, FILE *fh); -WS_DLL_PUBLIC void write_carrays_preamble(FILE *fh); -WS_DLL_PUBLIC void proto_tree_write_carrays(guint32 num, FILE *fh, epan_dissect_t *edt); -WS_DLL_PUBLIC void write_carrays_finale(FILE *fh); +WS_DLL_PUBLIC void write_carrays_hex_data(guint32 num, FILE *fh, epan_dissect_t *edt); WS_DLL_PUBLIC void write_fields_preamble(output_fields_t* fields, FILE *fh); -WS_DLL_PUBLIC void proto_tree_write_fields(output_fields_t* fields, epan_dissect_t *edt, column_info *cinfo, FILE *fh); +WS_DLL_PUBLIC void write_fields_proto_tree(output_fields_t* fields, epan_dissect_t *edt, column_info *cinfo, FILE *fh); WS_DLL_PUBLIC void write_fields_finale(output_fields_t* fields, FILE *fh); WS_DLL_PUBLIC gchar* get_node_field_value(field_info* fi, epan_dissect_t* edt); |