add new function tvb_get_ephemeral_stringz()

[obnox/wireshark/wip.git] / alert_box.c

diff --git a/alert_box.c b/alert_box.c
index d8a18b47db5480956021d9c37e4243ac76a57591..911ae255e5927796b3c533cb3696b8ad6e5de379 100644 (file)
--- 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$
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -35,10 +35,18 @@
 #include <epan/dfilter/dfilter.h>
 
 #include "alert_box.h"
-#include "report_err.h"
 
 #include "simple_dialog.h"
 
+/*
+ * Alert box for general errors.
+ */
+void
+failure_alert_box(const char *msg_format, va_list ap)
+{
+  vsimple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, msg_format, ap);
+}
+
 /*
  * Alert box for a failed attempt to open or create a file.
  * "err" is assumed to be a UNIX-style errno; "for_writing" is TRUE if
@@ -59,22 +67,14 @@ 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.",
+                "An error occurred while reading from the file \"%s\": %s.",
                 filename, strerror(err));
 }
 
@@ -109,7 +109,7 @@ bad_dfilter_alert_box(const char *dftext)
   simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, 
                 "%s%s%s\n"
                 "\n"
-                "The filter expression \"%s\" is not a valid display filter.\n"
+                "The filter expression \"%s\" isn't a valid display filter.\n"
                 "See the help for a description of the display filter syntax.",
                 simple_dialog_primary_start(), dfilter_error_msg,
                 simple_dialog_primary_end(), dftext);