diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-05-29 23:40:12 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-05-29 23:40:12 +0000 |
| commit | ff886fb34975f5aea61da44401e22168deb2f315 (patch) | |
| tree | 6972941aa757d6b7da04f0f89a5add8e43cbd783 /wiretap | |
| parent | e48e45777e105ae4cc1a649f8403ece7899be821 (diff) | |
Fix the types of k12text_read() and k12text_seek_read() to match what
the types of read and seek_read routines in Wiretap are supposed to be,
and get rid of the casts of pointers to those functions (type problems
should be fixed, not papered over with casts, whenver possible).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25393 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/k12text.l | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/wiretap/k12text.l b/wiretap/k12text.l index 1c440176df..0967cab63d 100644 --- a/wiretap/k12text.l +++ b/wiretap/k12text.l @@ -145,7 +145,7 @@ static void finalize_frame(void) { ok_frame = TRUE; } -static gboolean k12text_read(wtap *wth, int *err, const gchar ** err_info _U_, gint64 *data_offset) { +static gboolean k12text_read(wtap *wth, int *err, char ** err_info _U_, gint64 *data_offset) { gint64 start_offset = cum_offset; encap = WTAP_ENCAP_UNKNOWN; @@ -181,7 +181,7 @@ static gboolean k12text_read(wtap *wth, int *err, const gchar ** err_info _U_, g return TRUE; } -static gboolean k12text_seek_read(wtap *wth, gint64 seek_off, union wtap_pseudo_header *pseudo_header _U_, guchar *pd, int length, int *err, const gchar **err_info) { +static gboolean k12text_seek_read(wtap *wth, gint64 seek_off, union wtap_pseudo_header *pseudo_header _U_, guint8 *pd, int length, int *err, char **err_info) { gint64 save_offset = cum_offset; ok_frame = FALSE; @@ -234,8 +234,8 @@ int k12text_open(wtap *wth, int *err, gchar **err_info _U_) { wth->file_type = WTAP_FILE_K12TEXT; wth->file_encap = WTAP_ENCAP_PER_PACKET; wth->snapshot_length = 0; - wth->subtype_read = (void*)k12text_read; - wth->subtype_seek_read = (void*)k12text_seek_read; + 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; |