diff options
| author | João Valverde <j@v6e.pt> | 2021-09-29 18:32:28 +0100 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-09-30 13:59:28 +0000 |
| commit | 5362d0c31b83fd7eb812f3215918504496c2f56a (patch) | |
| tree | 8db56bb5b91a21371aeda3cbb273c953b851f522 /wiretap/pcapng.c | |
| parent | 0173ea0ec1f87f2ab40c45eedb0ca1c1f77eea8e (diff) | |
ws_getopt: Rename struct and macros
This is part of the API and should also be renamed to avoid conflicts.
Diffstat (limited to 'wiretap/pcapng.c')
| -rw-r--r-- | wiretap/pcapng.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index 93589038e8..ca499387d4 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -166,7 +166,7 @@ typedef struct pcapng_option_header_s { /* ... Padding ... */ } pcapng_option_header_t; -struct option { +struct pcapng_option { guint16 type; guint16 value_length; }; @@ -4907,7 +4907,7 @@ pcapng_write_sysdig_event_block(wtap_dumper *wdh, const wtap_rec *rec, guint32 pad_len; #if 0 gboolean have_options = FALSE; - struct option option_hdr; + struct pcapng_option option_hdr; guint32 comment_len = 0, comment_pad_len = 0; #endif guint32 options_total_length = 0; @@ -5375,7 +5375,7 @@ put_nrb_options(wtap_dumper *wdh, guint8 *opt_ptr) { if (wdh->nrb_hdrs && wdh->nrb_hdrs->len > 0) { wtap_block_t nrb_hdr = g_array_index(wdh->nrb_hdrs, wtap_block_t, 0); - struct option option_hdr; + struct pcapng_option option_hdr; wtap_block_foreach_option(nrb_hdr, put_nrb_option, &opt_ptr); |