From b6fd85bd19fd2674f817b372e850dcc5b3caec48 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 11 Nov 2015 11:54:21 -0800 Subject: [PATCH] Put wtap_dump_open() right before wtap_dump_open_ng(). That matches what we do with the other two pairs of dump opening routines. Change-Id: I0e6e475573c3a8d4ab6cf991d0aadc14150af233 Reviewed-on: https://code.wireshark.org/review/11744 Reviewed-by: Guy Harris --- wiretap/file_access.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/wiretap/file_access.c b/wiretap/file_access.c index 53f66411e6..14c9b81b96 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -2133,13 +2133,6 @@ static WFILE_T wtap_dump_file_open(wtap_dumper *wdh, const char *filename); static WFILE_T wtap_dump_file_fdopen(wtap_dumper *wdh, int fd); static int wtap_dump_file_close(wtap_dumper *wdh); -wtap_dumper * -wtap_dump_open(const char *filename, int file_type_subtype, int encap, - int snaplen, gboolean compressed, int *err) -{ - return wtap_dump_open_ng(filename, file_type_subtype, encap,snaplen, compressed, NULL, NULL, NULL, err); -} - static wtap_dumper * wtap_dump_init_dumper(int file_type_subtype, int encap, int snaplen, gboolean compressed, wtapng_section_t *shb_hdr, wtapng_iface_descriptions_t *idb_inf, @@ -2203,6 +2196,13 @@ wtap_dump_init_dumper(int file_type_subtype, int encap, int snaplen, gboolean co return wdh; } +wtap_dumper * +wtap_dump_open(const char *filename, int file_type_subtype, int encap, + int snaplen, gboolean compressed, int *err) +{ + return wtap_dump_open_ng(filename, file_type_subtype, encap,snaplen, compressed, NULL, NULL, NULL, err); +} + wtap_dumper * wtap_dump_open_ng(const char *filename, int file_type_subtype, int encap, int snaplen, gboolean compressed, wtapng_section_t *shb_hdr, wtapng_iface_descriptions_t *idb_inf,