diff options
-rw-r--r-- | wiretap/ascend-grammar.y | 8 | ||||
-rw-r--r-- | wiretap/ascend-int.h | 7 | ||||
-rw-r--r-- | wiretap/ascend-scanner.l | 5 |
3 files changed, 9 insertions, 11 deletions
diff --git a/wiretap/ascend-grammar.y b/wiretap/ascend-grammar.y index 75f3998103..8a32a2ec02 100644 --- a/wiretap/ascend-grammar.y +++ b/wiretap/ascend-grammar.y @@ -1,7 +1,7 @@ %{ /* ascend-grammar.y * - * $Id: ascend-grammar.y,v 1.24 2002/03/02 20:41:07 guy Exp $ + * $Id: ascend-grammar.y,v 1.25 2004/01/06 20:05:39 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -126,14 +126,14 @@ unsigned int bcur = 0, bcount; guint32 start_time, secs, usecs, caplen, wirelen; ascend_pkthdr *header; struct ascend_phdr *pseudo_header; -char *pkt_data; +guint8 *pkt_data; %} %union { gchar *s; guint32 d; -char b; +guint8 b; } %token <s> STRING KEYWORD WDD_DATE WDD_CHUNK COUNTER @@ -378,7 +378,7 @@ init_parse_ascend() /* Parse the capture file. Return the offset of the next packet, or zero if there is none. */ int -parse_ascend(FILE_T fh, void *pd, struct ascend_phdr *phdr, +parse_ascend(FILE_T fh, guint8 *pd, struct ascend_phdr *phdr, ascend_pkthdr *hdr, int len) { /* yydebug = 1; */ diff --git a/wiretap/ascend-int.h b/wiretap/ascend-int.h index d7d7e0181b..acfd94f334 100644 --- a/wiretap/ascend-int.h +++ b/wiretap/ascend-int.h @@ -2,13 +2,12 @@ * Definitions for routines common to multiple modules in the Lucent/Ascend * capture file reading code code, but not used outside that code. * - * $Id: ascend-int.h,v 1.9 2002/08/28 20:30:44 jmayer Exp $ + * $Id: ascend-int.h,v 1.10 2004/01/06 20:05:39 guy Exp $ * * Ethereal - Network traffic analyzer - * By Gerald Combs <gerald@zing.org> + * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs * - * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 @@ -45,7 +44,7 @@ int ascendlex(void); void init_parse_ascend(void); void ascend_init_lexer(FILE_T fh); -int parse_ascend(FILE_T fh, void *pd, struct ascend_phdr *phdr, +int parse_ascend(FILE_T fh, guint8 *pd, struct ascend_phdr *phdr, ascend_pkthdr *hdr, int len); #endif /* ! __ASCEND_INT_H__ */ diff --git a/wiretap/ascend-scanner.l b/wiretap/ascend-scanner.l index 86b860c22e..c5b9e55d10 100644 --- a/wiretap/ascend-scanner.l +++ b/wiretap/ascend-scanner.l @@ -1,7 +1,7 @@ %{ /* ascend-scanner.l * - * $Id: ascend-scanner.l,v 1.26 2003/10/03 21:12:49 jmayer Exp $ + * $Id: ascend-scanner.l,v 1.27 2004/01/06 20:05:39 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -19,7 +19,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * */ #ifdef HAVE_CONFIG_H @@ -187,7 +186,7 @@ WDD_TYPE "type "[^\n\r\t ]+ } <sc_gen_byte>{H}{2} { - ascendlval.b = strtol(ascendtext, NULL, 16); + ascendlval.b = (guint8)strtol(ascendtext, NULL, 16); return HEXBYTE; } |