diff options
| author | Guy Harris <guy@alum.mit.edu> | 2010-02-26 07:59:54 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2010-02-26 07:59:54 +0000 |
| commit | 17392a865ac79a9f631e63652dff45b6bb1c64d2 (patch) | |
| tree | 42c7ec409a0e898eea7c0ebf4ba34f2f633797b6 /wiretap/k12text.l | |
| parent | c4dd5ca6f3bb794c9f1736adf8a8f02c641a76e6 (diff) | |
Move the definitions of all the private data structures out of
wtap-int.h, and change the unions of pointers to those private data
structures into just void *'s.
Have the generic wtap close routine free up the private data, rather
than the type-specific close routine, just as the wtap_dumper close
routine does for its private data. Get rid of close routines that don't
do anything any more.
svn path=/trunk/; revision=32015
Diffstat (limited to 'wiretap/k12text.l')
| -rw-r--r-- | wiretap/k12text.l | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/wiretap/k12text.l b/wiretap/k12text.l index d8bded1911..0bfa8fc8ff 100644 --- a/wiretap/k12text.l +++ b/wiretap/k12text.l @@ -295,10 +295,6 @@ static gboolean k12text_seek_read(wtap *wth, gint64 seek_off, union wtap_pseudo_ return TRUE; } -static void k12text_close(wtap *wth _U_) { - (void)0; -} - int k12text_open(wtap *wth, int *err, gchar **err_info _U_) { k12text_reset(wth->fh); /* init lexer buffer and vars set by lexer */ @@ -318,8 +314,6 @@ int k12text_open(wtap *wth, int *err, gchar **err_info _U_) { wth->snapshot_length = 0; wth->subtype_read = k12text_read; wth->subtype_seek_read = k12text_seek_read; - wth->subtype_close = k12text_close; - wth->capture.generic = NULL; wth->tsprecision = WTAP_FILE_TSPREC_NSEC; return 1; @@ -382,10 +376,6 @@ static gboolean k12text_dump(wtap_dumper *wdh _U_, const struct wtap_pkthdr *phd } -static gboolean k12text_dump_close(wtap_dumper *wdh _U_ , int *err _U_) { - return TRUE; -} - gboolean k12text_dump_open(wtap_dumper *wdh, gboolean cant_seek, int *err) { if (cant_seek) { @@ -394,7 +384,6 @@ gboolean k12text_dump_open(wtap_dumper *wdh, gboolean cant_seek, int *err) { } wdh->subtype_write = k12text_dump; - wdh->subtype_close = k12text_dump_close; return TRUE; } |