diff options
author | Guy Harris <guy@alum.mit.edu> | 2011-04-12 00:44:44 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2011-04-12 00:44:44 +0000 |
commit | 2b8ebd389bf1d706d6922940e69b89ff038bf9df (patch) | |
tree | 598ee6dae4cbe95a2d65910302f56df5c2dbf832 /wiretap/netxray.c | |
parent | 793d683575966d990ce2e819bac5e1c214c6a9fa (diff) |
"This file format can't be written to a pipe" and "this file format
can't be saved in compress form" are both equivalent to "this file file
format requires seeking when writing it". Change the "can compress"
Boolean in the file format table to "writing requires seeking", give all
the entries the proper value, and do the checks for attempting to write
a file format to a pipe or write it in compressed format to common code.
This means we don't need to pass the "can't seek" flag to the dump open
routines.
svn path=/trunk/; revision=36575
Diffstat (limited to 'wiretap/netxray.c')
-rw-r--r-- | wiretap/netxray.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/wiretap/netxray.c b/wiretap/netxray.c index e08a952cb9..32f5120764 100644 --- a/wiretap/netxray.c +++ b/wiretap/netxray.c @@ -1508,18 +1508,10 @@ int netxray_dump_can_write_encap_1_1(int encap) /* Returns TRUE on success, FALSE on failure; sets "*err" to an error code on failure */ -gboolean netxray_dump_open_1_1(wtap_dumper *wdh, gboolean cant_seek, int *err) +gboolean netxray_dump_open_1_1(wtap_dumper *wdh, int *err) { netxray_dump_t *netxray; - /* This is a NetXRay file. We can't fill in some fields in the header - until all the packets have been written, so we can't write to a - pipe. */ - if (cant_seek) { - *err = WTAP_ERR_CANT_WRITE_TO_PIPE; - return FALSE; - } - wdh->subtype_write = netxray_dump_1_1; wdh->subtype_close = netxray_dump_close_1_1; @@ -1676,18 +1668,10 @@ int netxray_dump_can_write_encap_2_0(int encap) /* Returns TRUE on success, FALSE on failure; sets "*err" to an error code on failure */ -gboolean netxray_dump_open_2_0(wtap_dumper *wdh, gboolean cant_seek, int *err) +gboolean netxray_dump_open_2_0(wtap_dumper *wdh, int *err) { netxray_dump_t *netxray; - /* This is a NetXRay file. We can't fill in some fields in the header - until all the packets have been written, so we can't write to a - pipe. */ - if (cant_seek) { - *err = WTAP_ERR_CANT_WRITE_TO_PIPE; - return FALSE; - } - wdh->subtype_write = netxray_dump_2_0; wdh->subtype_close = netxray_dump_close_2_0; |