forked from osmocom/wireshark
Update to handle the changed epan_init() API, with a "general failure"
routine added. Add a missing newline to the end of read failure messages. svn path=/trunk/; revision=10619
This commit is contained in:
parent
5fe1168180
commit
64e8678959
27
dftest.c
27
dftest.c
|
@ -1,6 +1,6 @@
|
||||||
/* dftest.c.c
|
/* dftest.c.c
|
||||||
*
|
*
|
||||||
* $Id: dftest.c,v 1.10 2004/03/23 21:19:55 guy Exp $
|
* $Id: dftest.c,v 1.11 2004/04/17 01:05:00 guy Exp $
|
||||||
*
|
*
|
||||||
* Ethereal - Network traffic analyzer
|
* Ethereal - Network traffic analyzer
|
||||||
* By Gerald Combs <gerald@ethereal.com>
|
* By Gerald Combs <gerald@ethereal.com>
|
||||||
|
@ -50,6 +50,7 @@
|
||||||
|
|
||||||
packet_info pi;
|
packet_info pi;
|
||||||
|
|
||||||
|
static void failure_message(const char *msg_format, va_list ap);
|
||||||
static void open_failure_message(const char *filename, int err,
|
static void open_failure_message(const char *filename, int err,
|
||||||
gboolean for_writing);
|
gboolean for_writing);
|
||||||
static void read_failure_message(const char *filename, int err);
|
static void read_failure_message(const char *filename, int err);
|
||||||
|
@ -72,7 +73,7 @@ main(int argc, char **argv)
|
||||||
in case any dissectors register preferences. */
|
in case any dissectors register preferences. */
|
||||||
epan_init(PLUGIN_DIR,register_all_protocols,
|
epan_init(PLUGIN_DIR,register_all_protocols,
|
||||||
register_all_protocol_handoffs,
|
register_all_protocol_handoffs,
|
||||||
open_failure_message, read_failure_message);
|
failure_message, open_failure_message, read_failure_message);
|
||||||
|
|
||||||
/* now register the preferences for any non-dissector modules.
|
/* now register the preferences for any non-dissector modules.
|
||||||
we must do that before we read the preferences as well. */
|
we must do that before we read the preferences as well. */
|
||||||
|
@ -140,18 +141,26 @@ main(int argc, char **argv)
|
||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* General errors are reported with an console message in "dftest".
|
||||||
|
*/
|
||||||
|
static void
|
||||||
|
failure_message(const char *msg_format, va_list ap)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "dftest: ");
|
||||||
|
vfprintf(stderr, msg_format, ap);
|
||||||
|
fprintf(stderr, "\n");
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Open/create errors are reported with an console message in "dftest".
|
* Open/create errors are reported with an console message in "dftest".
|
||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
open_failure_message(const char *filename, int err, gboolean for_writing)
|
open_failure_message(const char *filename, int err, gboolean for_writing)
|
||||||
{
|
{
|
||||||
char *errmsg;
|
fprintf(stderr, "dftest: ");
|
||||||
|
fprintf(stderr, file_open_error_message(err, for_writing), filename);
|
||||||
errmsg = g_strdup_printf(file_open_error_message(err, for_writing),
|
fprintf(stderr, "\n");
|
||||||
filename);
|
|
||||||
fprintf(stderr, "dftest: %s\n", errmsg);
|
|
||||||
g_free(errmsg);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -160,6 +169,6 @@ open_failure_message(const char *filename, int err, gboolean for_writing)
|
||||||
static void
|
static void
|
||||||
read_failure_message(const char *filename, int err)
|
read_failure_message(const char *filename, int err)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "dftest: An error occurred while reading from the file \"%s\": %s.",
|
fprintf(stderr, "dftest: An error occurred while reading from the file \"%s\": %s.\n",
|
||||||
filename, strerror(err));
|
filename, strerror(err));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue