diff options
author | Guy Harris <guy@alum.mit.edu> | 2004-01-25 21:55:17 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2004-01-25 21:55:17 +0000 |
commit | d6cd61061efe7207b298b5ac40a92e7b86b00b3e (patch) | |
tree | 392720e018248f9cf2b46db00a4a9740ff7d1fca /wiretap/ascend-int.h | |
parent | 34bddb3c1a932632fd0515f7999ed96ef9974611 (diff) |
Have the Wiretap open, read, and seek-and-read routines return, in
addition to an error code, an error info string, for
WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and
WTAP_ERR_BAD_RECORD errors. Replace the error messages logged with
"g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed
strings returned as the error info string, and change the callers of
those routines to, for those errors, put the info string into the
printed message or alert box for the error.
Add messages for cases where those errors were returned without printing
an additional message.
Nobody uses the error code from "cf_read()" - "cf_read()" puts up the
alert box itself for failures; get rid of the error code, so it just
returns a success/failure indication.
Rename "file_read_error_message()" to "cf_read_error_message()", as it
handles read errors from Wiretap, and have it take an error info string
as an argument. (That handles a lot of the work of putting the info
string into the error message.)
Make some variables in "ascend-grammar.y" static.
Check the return value of "erf_read_header()" in "erf_seek_read()".
Get rid of an unused #define in "i4btrace.c".
svn path=/trunk/; revision=9852
Diffstat (limited to 'wiretap/ascend-int.h')
-rw-r--r-- | wiretap/ascend-int.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/wiretap/ascend-int.h b/wiretap/ascend-int.h index acfd94f334..9a506a0e0d 100644 --- a/wiretap/ascend-int.h +++ b/wiretap/ascend-int.h @@ -2,7 +2,7 @@ * 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.10 2004/01/06 20:05:39 guy Exp $ + * $Id: ascend-int.h,v 1.11 2004/01/25 21:55:12 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -34,6 +34,10 @@ typedef struct { guint32 len; } ascend_pkthdr; +extern int at_eof; + +extern gchar *ascend_parse_error; + /* * Pointer to the pseudo-header for the current packet. */ |