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/erf.h | |
parent | 34bddb3c1a932632fd0515f7999ed96ef9974611 (diff) | |
download | wireshark-d6cd61061efe7207b298b5ac40a92e7b86b00b3e.tar.gz |
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/erf.h')
-rw-r--r-- | wiretap/erf.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/erf.h b/wiretap/erf.h index ff9daa2dbd..2c1e404de1 100644 --- a/wiretap/erf.h +++ b/wiretap/erf.h @@ -32,7 +32,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * -* $Id: erf.h,v 1.1 2003/08/26 07:10:38 guy Exp $ +* $Id: erf.h,v 1.2 2004/01/25 21:55:13 guy Exp $ */ #ifndef __W_ERF_H__ @@ -96,6 +96,6 @@ typedef struct erf_record { #define HDLC_WLEN(h, e) (g_htons((h)->wlen)) #define HDLC_SLEN(h, e) min(HDLC_WLEN(h, e), g_htons((h)->rlen) - sizeof(*(h))) -int erf_open(wtap *wth, int *err); +int erf_open(wtap *wth, int *err, gchar **err_info); #endif /* __W_ERF_H__ */ |