Add a new "file_open_error_message()" routine in "epan/filesystem.c", to

translate UNIX errno values to a somewhat friendly message format
string.

Rename "file_open_error_message()" in "file.c" to
"cf_open_error_message()", make "cf_open_error_message()" use the new
"file_open_error_message()" for UNIX errno values, have "do_capture()"
in "capture.c" use "file_open_error_message()" to report errors from
"open()", and make "cf_open_error_message()" static as nothing outside
"file.c" uses it.

Do similar stuff in "tethereal.c".


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

1 files changed, 3 insertions, 2 deletions

diff --git a/capture.c b/capture.c
index 9bb8407a39..6a04b9e7b8 100644
--- a/capture.c
+++ b/capture.c
@@ -1,7 +1,7 @@
 /* capture.c
  * Routines for packet capture windows
  *
- * $Id: capture.c,v 1.226 2004/01/22 20:45:49 guy Exp $
+ * $Id: capture.c,v 1.227 2004/01/24 01:44:28 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -130,6 +130,7 @@
 
 #include <epan/packet.h>
 #include <epan/dfilter/dfilter.h>
+#include <epan/filesystem.h>
 #include "file.h"
 #include "capture.h"
 #include "util.h"
@@ -322,7 +323,7 @@ do_capture(const char *save_file)
         ringbuf_error_cleanup();
       }
       simple_dialog(ESD_TYPE_CRIT, NULL,
-	file_open_error_message(errno, TRUE, WTAP_FILE_PCAP), capfile_name);
+	file_open_error_message(errno, TRUE), capfile_name);
     }
     g_free(capfile_name);
     return FALSE;