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

1 files changed, 14 insertions, 9 deletions

diff --git a/wiretap/airopeek9.c b/wiretap/airopeek9.c
index 81ad4a61c4..777628934a 100644
--- a/wiretap/airopeek9.c
+++ b/wiretap/airopeek9.c
@@ -1,7 +1,7 @@
 /* airopeek9.c
  * Routines for opening AiroPeek V9 files
  *
- * $Id: airopeek9.c,v 1.3 2003/12/03 19:47:36 guy Exp $
+ * $Id: airopeek9.c,v 1.4 2004/01/25 21:55:12 guy Exp $
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -69,9 +69,11 @@ typedef struct airopeek_utime {
 
 static const unsigned int mac2unix = 2082844800u;
 
-static gboolean airopeek_read_v9(wtap *wth, int *err, long *data_offset);
+static gboolean airopeek_read_v9(wtap *wth, int *err, gchar **err_info,
+    long *data_offset);
 static gboolean airopeek_seek_read_v9(wtap *wth, long seek_off,
-    union wtap_pseudo_header *pseudo_header, guchar *pd, int length, int *err);
+    union wtap_pseudo_header *pseudo_header, guchar *pd, int length,
+    int *err, gchar **err_info);
 
 static int wtap_file_read_pattern (wtap *wth, char *pattern, int *err)
 {
@@ -162,7 +164,7 @@ static int wtap_file_read_number (wtap *wth, guint32 *num, int *err)
 }
 
 
-int airopeek9_open(wtap *wth, int *err)
+int airopeek9_open(wtap *wth, int *err, gchar **err_info)
 {
     airopeek_section_header_t ap_hdr;
     int ret;
@@ -199,8 +201,9 @@ int airopeek9_open(wtap *wth, int *err)
     /* If we got this far, we assume it's an AiroPeek V9 file. */
     if (fileVersion != 9) {
 	/* We only support version 9 and later. */
-	g_message("airopeekv9: version %u unsupported", fileVersion);
 	*err = WTAP_ERR_UNSUPPORTED;
+	*err_info = g_strdup_printf("airopeekv9: version %u unsupported",
+	    fileVersion);
 	return -1;
     }
 
@@ -218,8 +221,8 @@ int airopeek9_open(wtap *wth, int *err)
     if (ret == -1)
 	return -1;
     if (ret == 0) {
-	g_message("airopeekv9: <MediaType> tag not found");
 	*err = WTAP_ERR_UNSUPPORTED;
+	*err_info = g_strdup("airopeekv9: <MediaType> tag not found");
 	return -1;
     }
     /* XXX - this appears to be 0, which is also the media type for
@@ -229,8 +232,8 @@ int airopeek9_open(wtap *wth, int *err)
     if (ret == -1)
 	return -1;
     if (ret == 0) {
-	g_message("airopeekv9: <MediaType> value not found");
 	*err = WTAP_ERR_UNSUPPORTED;
+	*err_info = g_strdup("airopeekv9: <MediaType> value not found");
 	return -1;
     }
 
@@ -264,7 +267,8 @@ int airopeek9_open(wtap *wth, int *err)
     return 1;
 }
 
-static gboolean airopeek_read_v9(wtap *wth, int *err, long *data_offset)
+static gboolean airopeek_read_v9(wtap *wth, int *err, gchar **err_info _U_,
+    long *data_offset)
 {
     guchar ap_pkt[AIROPEEK_V9_PKT_SIZE];
     guint32 length;
@@ -341,7 +345,8 @@ static gboolean airopeek_read_v9(wtap *wth, int *err, long *data_offset)
 
 static gboolean
 airopeek_seek_read_v9(wtap *wth, long seek_off,
-    union wtap_pseudo_header *pseudo_header, guchar *pd, int length, int *err)
+    union wtap_pseudo_header *pseudo_header, guchar *pd, int length,
+    int *err, gchar **err_info _U_)
 {
     guchar ap_pkt[AIROPEEK_V9_PKT_SIZE];