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 /file.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 'file.h')
| -rw-r--r-- | file.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,7 +1,7 @@ /* file.h * Definitions for file structures and routines * - * $Id: file.h,v 1.114 2004/01/25 00:58:12 guy Exp $ + * $Id: file.h,v 1.115 2004/01/25 21:55:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -44,7 +44,7 @@ typedef enum { int cf_open(char *, gboolean, capture_file *); void cf_close(capture_file *); -read_status_t cf_read(capture_file *, int *); +read_status_t cf_read(capture_file *); int cf_start_tail(char *, gboolean, capture_file *); read_status_t cf_continue_tail(capture_file *, int, int *); read_status_t cf_finish_tail(capture_file *, int *); @@ -100,6 +100,6 @@ int file_mv(char *from, char *to); /* Copies a file. Returns 0 on failure, 1 on success */ int file_cp(char *from, char *to); -char *file_read_error_message(int); +char *cf_read_error_message(int, gchar *); #endif /* file.h */ |