diff options
author | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2006-05-11 16:42:38 +0000 |
---|---|---|
committer | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2006-05-11 16:42:38 +0000 |
commit | 6c381119a94f8ba487b6fd67736a17ce1cd01612 (patch) | |
tree | 1de83b1eeea4c8f44d0d01a36a7748a9ea6cb545 /epan | |
parent | 7186c6481cf3e2ac9642355287a198706c9a7752 (diff) |
Removal of useless "Field Information" introduced in r18125
svn path=/trunk/; revision=18133
Diffstat (limited to 'epan')
-rw-r--r-- | epan/libethereal.def | 1 | ||||
-rw-r--r-- | epan/oid_resolv.c | 29 | ||||
-rw-r--r-- | epan/oid_resolv.h | 5 |
3 files changed, 0 insertions, 35 deletions
diff --git a/epan/libethereal.def b/epan/libethereal.def index d73cdc76ce..a6a118e4b7 100644 --- a/epan/libethereal.def +++ b/epan/libethereal.def @@ -347,7 +347,6 @@ get_hostname6 get_host_ipaddr get_host_ipaddr6 get_manuf_name_if_known -get_oid_url get_persconffile_path get_plugins_global_dir get_plugins_pers_dir diff --git a/epan/oid_resolv.c b/epan/oid_resolv.c index cda4e31137..73e530a92c 100644 --- a/epan/oid_resolv.c +++ b/epan/oid_resolv.c @@ -35,9 +35,6 @@ static GHashTable *oid_table = NULL; -/* this should be configurable - but where ? */ -static const gchar *oid_url_template = "http://www.alvestrand.no/objectid/%s.html"; - void oid_resolv_init(void) { oid_table = g_hash_table_new(g_str_hash, g_str_equal); } @@ -98,29 +95,3 @@ extern void add_oid_name(const guint8 *oid, gint oid_len, const gchar *name) { extern void add_oid_str_name(const gchar *oid_str, const gchar *name) { g_hash_table_insert(oid_table, (gpointer)g_strdup(oid_str), (gpointer)name); } - -gboolean get_oid_url(field_info *finfo, gchar **ret_url) -{ - const char *oid; - - if(finfo && (finfo->hfinfo->type == FT_OID) && - (oid_url_template != NULL) && (*oid_url_template != NULL)) { - if(ret_url) { - /* return the URL */ - oid = oid_to_str(tvb_get_ptr(finfo->ds_tvb, finfo->start, finfo->length), - finfo->length); - - /* the URL will be freed */ - *ret_url = g_strdup_printf(oid_url_template, oid); - return TRUE; - } else { - /* return TRUE if we are configured to return URLs */ - - if((oid_url_template != NULL) && (*oid_url_template != NULL)) - return TRUE; - - } - } - - return FALSE; -} diff --git a/epan/oid_resolv.h b/epan/oid_resolv.h index 3886755585..7176a65efe 100644 --- a/epan/oid_resolv.h +++ b/epan/oid_resolv.h @@ -32,8 +32,6 @@ #ifndef __OID_RESOLV_H__ #define __OID_RESOLV_H__ -#include <epan/proto.h> - /* init and clenup funcions called from epan.h */ extern void oid_resolv_init(void); extern void oid_resolv_cleanup(void); @@ -48,8 +46,5 @@ extern const gchar *get_oid_str_name(const gchar *oid_str); extern void add_oid_name(const guint8 *oid, gint oid_len, const gchar *name); extern void add_oid_str_name(const gchar *oid_str, const gchar *name); -/* get a URL for an OID in the given field */ -/* if ret_url is NULL, just return TRUE if we are configured to provide one */ -extern gboolean get_oid_url(field_info *finfo, gchar **ret_url); #endif /* __OID_RESOLV_H__ */ |