Make "epan_init()" take, as additional arguments, pointers to routines

that dissectors should call to report file open and read errors, and
have "report_open_failure()" and "report_read_failure()" call through
those pointers, rather than being defined and exported by the
application using libethereal - instead, the application would define
those functions and pass pointers to them to 'epan_init()".

Move "report_err.h" to the epan directory, as the functions it declares
are now part of the libethereal API.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10470 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 4 insertions, 13 deletions

diff --git a/alert_box.c b/alert_box.c
index d8a18b47db..2bb611fa83 100644
--- a/alert_box.c
+++ b/alert_box.c
@@ -2,7 +2,7 @@
  * Routines to put up various "standard" alert boxes used in multiple
  * places
  *
- * $Id: alert_box.c,v 1.4 2004/02/21 02:15:05 guy Exp $
+ * $Id: alert_box.c,v 1.5 2004/03/23 21:19:55 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -35,7 +35,6 @@
 #include <epan/dfilter/dfilter.h>
 
 #include "alert_box.h"
-#include "report_err.h"
 
 #include "simple_dialog.h"
 
@@ -59,19 +58,11 @@ open_failure_alert_box(const char *filename, int err, gboolean for_writing)
 }
 
 /*
- * Open/create errors are reported with an alert box in Ethereal.
- */
-void
-report_open_failure(const char *filename, int err, gboolean for_writing)
-{
-  open_failure_alert_box(filename, err, for_writing);
-}
-
-/*
- * Read errors are reported with an alert box in Ethereal.
+ * Alert box for a failed attempt to read a file.
+ * "err" is assumed to be a UNIX-style errno.
  */
 void
-report_read_failure(const char *filename, int err)
+read_failure_alert_box(const char *filename, int err)
 {
   simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
 		"An error occurred while reading from the file \"%s\": %s.",