diff options
| author | Luis Ontanon <luis.ontanon@gmail.com> | 2007-05-03 18:32:52 +0000 |
|---|---|---|
| committer | Luis Ontanon <luis.ontanon@gmail.com> | 2007-05-03 18:32:52 +0000 |
| commit | bb7e52fcd8a9d01e8c37d1ee78eb3570a7cbaee1 (patch) | |
| tree | 7413d1e6061c499f7868d04451fce217cd0f35a2 /wiretap | |
| parent | c1688f561259a0dd423829432b3bf7e43ca14ffa (diff) | |
| download | wireshark-bb7e52fcd8a9d01e8c37d1ee78eb3570a7cbaee1.tar.gz wireshark-bb7e52fcd8a9d01e8c37d1ee78eb3570a7cbaee1.tar.bz2 wireshark-bb7e52fcd8a9d01e8c37d1ee78eb3570a7cbaee1.zip | |
will this finally get rid of the warnigs?
svn path=/trunk/; revision=21666
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/k12text.l | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/wiretap/k12text.l b/wiretap/k12text.l index d6bc6b12fd..53bb467b7b 100644 --- a/wiretap/k12text.l +++ b/wiretap/k12text.l @@ -131,7 +131,7 @@ static void finalize_frame(void) { ok_frame = TRUE;
}
-static gboolean k12text_read(wtap *wth, int *err, gchar **err_info _U_, gint64 *data_offset) {
+static gboolean k12text_read(wtap *wth, int *err, const gchar ** err_info _U_, gint64 *data_offset) {
gint64 start_offset = cum_offset;
encap = WTAP_ENCAP_UNKNOWN;
@@ -145,7 +145,7 @@ static gboolean k12text_read(wtap *wth, int *err, gchar **err_info _U_, gint64 * *err_info = NULL;
*err = 0;
} else {
- *err_info = (void*)error_str;
+ *err_info = error_str;
*err = WTAP_ERR_BAD_RECORD;
}
return FALSE;
@@ -167,7 +167,7 @@ static gboolean k12text_read(wtap *wth, int *err, gchar **err_info _U_, gint64 * 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, gchar **err_info) {
+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) {
gint64 save_offset = cum_offset;
ok_frame = FALSE;
@@ -184,7 +184,7 @@ static gboolean k12text_seek_read(wtap *wth, gint64 seek_off, union wtap_pseudo_ yylex();
if (ok_frame == FALSE) {
- *err_info = (void*)error_str;
+ *err_info = error_str;
*err = WTAP_ERR_BAD_RECORD;
return FALSE;
}
@@ -220,8 +220,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 = k12text_read;
- wth->subtype_seek_read = k12text_seek_read;
+ wth->subtype_read = (void*)k12text_read;
+ wth->subtype_seek_read = (void*)k12text_seek_read;
wth->subtype_close = k12text_close;
wth->capture.generic = NULL;
wth->tsprecision = WTAP_FILE_TSPREC_NSEC;
|