diff options
author | Guy Harris <guy@alum.mit.edu> | 2018-11-15 20:06:36 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2018-11-16 09:20:36 +0000 |
commit | a1372f6d017cb9798dce7de5e25d329c82a2da79 (patch) | |
tree | 4588e90f67d25c13f4b944242328b901e0a27514 /wiretap/wtap.c | |
parent | e12753d5f6e6f474af9934e8102cb4190aaa5846 (diff) |
Use an enum for compression types in various interfaces.
This:
1) means that we don't have to flag the compression argument with a
comment to indicate what it means (FALSE doesn't obviously say "not
compressed", WTAP_UNCOMPRESSED does);
2) leaves space in the interfaces in question for additional compression
types.
(No, this is not part 1 of an implementation of additional compression
types, it's just an API cleanup. Implementing additional compression
types involves significant work in libwiretap, as well as UI changes to
replace "compress the file" checkboxes with something to indicate *how*
to compress the file, or to always use some other form of compression).
Change-Id: I1d23dc720be10158e6b34f97baa247ba8a537abf
Reviewed-on: https://code.wireshark.org/review/30660
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/wtap.c')
-rw-r--r-- | wiretap/wtap.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 4f73628393..3b7c31891f 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -77,10 +77,13 @@ wtap_file_type_subtype(wtap *wth) return wth->file_type_subtype; } -gboolean -wtap_iscompressed(wtap *wth) +wtap_compression_type +wtap_get_compression_type(wtap *wth) { - return file_iscompressed((wth->fh == NULL) ? wth->random_fh : wth->fh); + gboolean is_compressed; + + is_compressed = file_iscompressed((wth->fh == NULL) ? wth->random_fh : wth->fh); + return is_compressed ? WTAP_GZIP_COMPRESSED : WTAP_UNCOMPRESSED; } guint |