From f9037afd448447bfda1050e5cb843193362d84e3 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Thu, 1 May 2003 21:10:43 +0000 Subject: From Matthijs Melchior: don't export functions also implemented as macros, and do export "except_pop()" and "except_setup_try()". svn path=/trunk/; revision=7628 --- epan/plugins.c | 8 +++----- plugins/plugin_api.c | 8 +++----- plugins/plugin_api.h | 8 +++----- plugins/plugin_api_decls.h | 8 +++----- plugins/plugin_table.h | 8 +++----- 5 files changed, 15 insertions(+), 25 deletions(-) diff --git a/epan/plugins.c b/epan/plugins.c index 86d5201855..a90f8cb78c 100644 --- a/epan/plugins.c +++ b/epan/plugins.c @@ -1,7 +1,7 @@ /* plugins.c * plugin routines * - * $Id: plugins.c,v 1.69 2003/05/01 18:05:27 guy Exp $ + * $Id: plugins.c,v 1.70 2003/05/01 21:10:42 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -527,14 +527,12 @@ init_plugins(const char *plugin_dir) patable.p_except_throwd = except_throwd; patable.p_except_throwf = except_throwf; patable.p_except_unhandled_catcher = except_unhandled_catcher; - patable.p_except_code = except_code; - patable.p_except_group = except_group; - patable.p_except_message = except_message; - patable.p_except_data = except_data; patable.p_except_take_data = except_take_data; patable.p_except_set_allocator = except_set_allocator; patable.p_except_alloc = except_alloc; patable.p_except_free = except_free; + patable.p_except_pop = except_pop; + patable.p_except_setup_try = except_setup_try; #endif #ifdef WIN32 diff --git a/plugins/plugin_api.c b/plugins/plugin_api.c index 25ea89ee96..2efba30562 100644 --- a/plugins/plugin_api.c +++ b/plugins/plugin_api.c @@ -1,7 +1,7 @@ /* plugin_api.c * Routines for Ethereal plugins. * - * $Id: plugin_api.c,v 1.49 2003/04/30 23:40:43 guy Exp $ + * $Id: plugin_api.c,v 1.50 2003/05/01 21:10:43 guy Exp $ * * Ethereal - Network traffic analyzer * Copyright 2000 by Gilbert Ramirez @@ -248,12 +248,10 @@ plugin_address_table_init(plugin_address_table_t *pat) p_except_throwd = pat->p_except_throwd; p_except_throwf = pat->p_except_throwf; p_except_unhandled_catcher = pat->p_except_unhandled_catcher; - p_except_code = pat->p_except_code; - p_except_group = pat->p_except_group; - p_except_message = pat->p_except_message; - p_except_data = pat->p_except_data; p_except_take_data = pat->p_except_take_data; p_except_set_allocator = pat->p_except_set_allocator; p_except_alloc = pat->p_except_alloc; p_except_free = pat->p_except_free; + p_except_pop = pat->p_except_pop; + p_except_setup_try = pat->p_except_setup_try; } diff --git a/plugins/plugin_api.h b/plugins/plugin_api.h index 95dafb69d9..1cddf69574 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.50 2003/04/30 23:40:43 guy Exp $ + * $Id: plugin_api.h,v 1.51 2003/05/01 21:10:43 guy Exp $ * * Ethereal - Network traffic analyzer * Copyright 2000 by Gilbert Ramirez @@ -278,14 +278,12 @@ #define except_throwd (*p_except_throwd) #define except_throwf (*p_except_throwf) #define except_unhandled_catcher (*p_except_unhandled_catcher) -#define except_code (*p_except_code) -#define except_group (*p_except_group) -#define except_message (*p_except_message) -#define except_data (*p_except_data) #define except_take_data (*p_except_take_data) #define except_set_allocator (*p_except_set_allocator) #define except_alloc (*p_except_alloc) #define except_free (*p_except_free) +#define except_pop (*p_except_pop) +#define except_setup_try (*p_except_setup_try) #endif diff --git a/plugins/plugin_api_decls.h b/plugins/plugin_api_decls.h index dfc3f7b9f9..10a734e17b 100644 --- a/plugins/plugin_api_decls.h +++ b/plugins/plugin_api_decls.h @@ -2,7 +2,7 @@ * Declarations of a list of "p_" names; included in various places * to declare them as variables or as function members. * - * $Id: plugin_api_decls.h,v 1.12 2003/04/30 23:40:43 guy Exp $ + * $Id: plugin_api_decls.h,v 1.13 2003/05/01 21:10:43 guy Exp $ * * Ethereal - Network traffic analyzer * Copyright 2000 by Gilbert Ramirez @@ -287,11 +287,9 @@ addr_except_rethrow p_except_rethrow; addr_except_throwd p_except_throwd; addr_except_throwf p_except_throwf; addr_except_unhandled_catcher p_except_unhandled_catcher; -addr_except_code p_except_code; -addr_except_group p_except_group; -addr_except_message p_except_message; -addr_except_data p_except_data; addr_except_take_data p_except_take_data; addr_except_set_allocator p_except_set_allocator; addr_except_alloc p_except_alloc; addr_except_free p_except_free; +addr_except_pop p_except_pop; +addr_except_setup_try p_except_setup_try; diff --git a/plugins/plugin_table.h b/plugins/plugin_table.h index bd71c1c7aa..05be705fcb 100644 --- a/plugins/plugin_table.h +++ b/plugins/plugin_table.h @@ -1,7 +1,7 @@ /* plugin_table.h * Table of exported addresses for Ethereal plugins. * - * $Id: plugin_table.h,v 1.62 2003/04/30 23:40:43 guy Exp $ + * $Id: plugin_table.h,v 1.63 2003/05/01 21:10:43 guy Exp $ * * Ethereal - Network traffic analyzer * Copyright 2000 by Gilbert Ramirez @@ -324,14 +324,12 @@ typedef void (*addr_except_rethrow)(except_t *); typedef void (*addr_except_throwd)(long, long, const char *, void *); typedef void (*addr_except_throwf)(long, long, const char *, ...); typedef void (*(*addr_except_unhandled_catcher)(void (*)(except_t *)))(except_t *); -typedef unsigned long (*addr_except_code)(except_t *); -typedef unsigned long (*addr_except_group)(except_t *); -typedef const char *(*addr_except_message)(except_t *); -typedef void *(*addr_except_data)(except_t *); typedef void *(*addr_except_take_data)(except_t *); typedef void (*addr_except_set_allocator)(void *(*)(size_t), void (*)(void *)); typedef void *(*addr_except_alloc)(size_t); typedef void (*addr_except_free)(void *); +typedef struct except_stacknode *(*addr_except_pop)(void); +typedef void (*addr_except_setup_try)(struct except_stacknode *, struct except_catch *, const except_id_t [], size_t); typedef struct { -- cgit v1.2.3