Revert r35132 so that a better fix can be implemented that doesn't break

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

diff --git a/alert_box.c b/alert_box.c
index 4df5296f9ce52461479236e65d681c67d583a323..1ac91e2337773f2176b12baf133ff71f0f84d9b2 100644 (file)
--- a/alert_box.c
+++ b/alert_box.c
@@ -2,10 +2,10 @@
  * Routines to put up various "standard" alert boxes used in multiple
  * places
  *
- * $Id: alert_box.c,v 1.3 2004/02/11 01:37:11 guy Exp $
+ * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
@@ -27,6 +27,8 @@
 # include "config.h"
 #endif
 
+#include <string.h>
+
 #include <glib.h>
 
 #include <epan/filesystem.h>
@@ -36,6 +38,15 @@
 
 #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
@@ -46,7 +57,7 @@
  * various HIGs suggest that you should, for example, suggest that the
  * user remove files if the file system is full.  Perhaps that's because
  * they're providing guidelines for people less sophisticated than the
- * typical Ethereal user is, but....
+ * typical Wireshark user is, but....
  */
 void
 open_failure_alert_box(const char *filename, int err, gboolean for_writing)
@@ -55,6 +66,18 @@ open_failure_alert_box(const char *filename, int err, gboolean for_writing)
                 file_open_error_message(err, for_writing), filename);
 }
 
+/*
+ * Alert box for a failed attempt to read a file.
+ * "err" is assumed to be a UNIX-style errno.
+ */
+void
+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.",
+                filename, strerror(err));
+}
+
 /*
  * Alert box for a failed attempt to write to a file.
  * "err" is assumed to be a UNIX-style errno.
@@ -63,7 +86,7 @@ open_failure_alert_box(const char *filename, int err, gboolean for_writing)
  * various HIGs suggest that you should, for example, suggest that the
  * user remove files if the file system is full.  Perhaps that's because
  * they're providing guidelines for people less sophisticated than the
- * typical Ethereal user is, but....
+ * typical Wireshark user is, but....
  */
 void
 write_failure_alert_box(const char *filename, int err)
@@ -86,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);