diff options
author | Guy Harris <guy@alum.mit.edu> | 2004-03-23 21:19:58 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2004-03-23 21:19:58 +0000 |
commit | 121f06fab70d77c4babb512924b2b8d3c3921944 (patch) | |
tree | 9dba3131d845040ea0ab402a8b3e4a5147d5d315 /plugins | |
parent | bf1315c25615bdd7d5ebff4245d8ba37b525871e (diff) | |
download | wireshark-121f06fab70d77c4babb512924b2b8d3c3921944.tar.gz wireshark-121f06fab70d77c4babb512924b2b8d3c3921944.tar.bz2 wireshark-121f06fab70d77c4babb512924b2b8d3c3921944.zip |
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.
svn path=/trunk/; revision=10470
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/asn1/packet-asn1.c | 4 | ||||
-rw-r--r-- | plugins/plugin_api.h | 4 | ||||
-rw-r--r-- | plugins/plugin_api_list.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c index 1efcdcaf06..2c87ae2c0b 100644 --- a/plugins/asn1/packet-asn1.c +++ b/plugins/asn1/packet-asn1.c @@ -3,7 +3,7 @@ * * Copyright (c) 2003 by Matthijs Melchior <matthijs.melchior@xs4all.nl> * - * $Id: packet-asn1.c,v 1.21 2004/03/02 23:45:34 jmayer Exp $ + * $Id: packet-asn1.c,v 1.22 2004/03/23 21:19:58 guy Exp $ * * A plugin for: * @@ -82,8 +82,8 @@ #include "prefs.h" #include <epan/strutil.h> #include <epan/filesystem.h> +#include <epan/report_err.h> #include "asn1.h" -#include "report_err.h" #include "simple_dialog.h" #include "plugins/plugin_api_defs.h" diff --git a/plugins/plugin_api.h b/plugins/plugin_api.h index b47f713aed..15a49461a6 100644 --- a/plugins/plugin_api.h +++ b/plugins/plugin_api.h @@ -1,7 +1,7 @@ /* plugin_api.h * Routines for Ethereal plugins. * - * $Id: plugin_api.h,v 1.60 2004/03/04 07:07:03 guy Exp $ + * $Id: plugin_api.h,v 1.61 2004/03/23 21:19:57 guy Exp $ * * Ethereal - Network traffic analyzer * Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -45,6 +45,7 @@ #include <epan/packet.h> #include <epan/conversation.h> +#include <epan/report_err.h> #include "prefs.h" #include "reassemble.h" #include "packet-giop.h" @@ -57,7 +58,6 @@ #include "xdlc.h" #include "epan/except.h" #include "epan/filesystem.h" -#include "report_err.h" #include "plugin_table.h" diff --git a/plugins/plugin_api_list.c b/plugins/plugin_api_list.c index d522687524..28bc0c1ea4 100644 --- a/plugins/plugin_api_list.c +++ b/plugins/plugin_api_list.c @@ -1,7 +1,7 @@ /* plugin_api_list.c * Used to generate various included files for plugin API * - * $Id: plugin_api_list.c,v 1.30 2004/03/04 07:07:03 guy Exp $ + * $Id: plugin_api_list.c,v 1.31 2004/03/23 21:19:57 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -29,6 +29,8 @@ #include <epan/packet.h> #include <epan/conversation.h> #include <epan/filesystem.h> +#include <epan/report_err.h> +#include <epan/except.h> #include "prefs.h" #include "reassemble.h" #include "packet-giop.h" @@ -39,8 +41,6 @@ #include "tap.h" #include "asn1.h" #include "xdlc.h" -#include "epan/except.h" -#include "report_err.h" gint check_col(column_info*, gint); void col_clear(column_info*, gint); |