diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2018-12-18 23:47:33 +0100 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-12-18 23:41:41 +0000 |
| commit | afc1265b63cfd3388af2745da9c8a66cb81f2b45 (patch) | |
| tree | 734f8f0c3fa1a73427ce9788ee1af9a6c373e6a5 | |
| parent | 053f47fdefc9bcb36983129b77b7e1754d4304bb (diff) | |
writecap: rename pcapng_write_session_block to _section_block
The pcapng file format specification speaks of a secion block, not
a session block. Let the function name reflect the proper name of
the block it writes.
Change-Id: Id399fae3648c93f4750fedaa297b18f95f2bb96f
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/31099
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | dumpcap.c | 2 | ||||
| -rw-r--r-- | extcap/sdjournal.c | 2 | ||||
| -rw-r--r-- | text2pcap.c | 2 | ||||
| -rw-r--r-- | writecap/pcapio.c | 2 | ||||
| -rw-r--r-- | writecap/pcapio.h | 2 |
5 files changed, 5 insertions, 5 deletions
@@ -3027,7 +3027,7 @@ capture_loop_init_pcapng_output(capture_options *capture_opts, loop_data *ld) GString *cpu_info_str = g_string_new(""); get_cpu_info(cpu_info_str); - successful = pcapng_write_session_header_block(ld->pdh, + successful = pcapng_write_section_header_block(ld->pdh, (const char *)capture_opts->capture_comment, /* Comment */ cpu_info_str->str, /* HW */ os_info_str->str, /* OS */ diff --git a/extcap/sdjournal.c b/extcap/sdjournal.c index 1431761581..ecc6cb52a5 100644 --- a/extcap/sdjournal.c +++ b/extcap/sdjournal.c @@ -209,7 +209,7 @@ static int sdj_start_export(const int start_from_entries, const gboolean start_f appname = g_strdup_printf(SDJOURNAL_EXTCAP_INTERFACE " (Wireshark) %s.%s.%s", SDJOURNAL_VERSION_MAJOR, SDJOURNAL_VERSION_MINOR, SDJOURNAL_VERSION_RELEASE); - success = pcapng_write_session_header_block(fp, + success = pcapng_write_section_header_block(fp, NULL, /* Comment */ NULL, /* HW */ NULL, /* OS */ diff --git a/text2pcap.c b/text2pcap.c index 4d0732329b..1ac2442d31 100644 --- a/text2pcap.c +++ b/text2pcap.c @@ -879,7 +879,7 @@ write_file_header (void) char *comment; comment = g_strdup_printf("Generated from input file %s.", input_filename); - success = pcapng_write_session_header_block(output_file, + success = pcapng_write_section_header_block(output_file, comment, NULL, /* HW */ NULL, /* OS */ diff --git a/writecap/pcapio.c b/writecap/pcapio.c index 9e0d4689e6..1fbbe145b3 100644 --- a/writecap/pcapio.c +++ b/writecap/pcapio.c @@ -303,7 +303,7 @@ pcapng_write_block(FILE* pfile, } gboolean -pcapng_write_session_header_block(FILE* pfile, +pcapng_write_section_header_block(FILE* pfile, const char *comment, const char *hw, const char *os, diff --git a/writecap/pcapio.h b/writecap/pcapio.h index 165850f16a..52c0fc6241 100644 --- a/writecap/pcapio.h +++ b/writecap/pcapio.h @@ -43,7 +43,7 @@ pcapng_write_block(FILE* pfile, * */ extern gboolean -pcapng_write_session_header_block(FILE* pfile, /**< Write information */ +pcapng_write_section_header_block(FILE* pfile, /**< Write information */ const char *comment, /**< Comment on the section, Optinon 1 opt_comment * A UTF-8 string containing a comment that is associated to the current block. */ |