diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-03-17 17:06:33 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-03-17 17:06:33 +0000 |
| commit | 2cdade41815dc59024760e3d2e2e0cfe6d0d1d14 (patch) | |
| tree | 7638ecfddbee9a77dde6797674efc933e6772d4b | |
| parent | aeb05a81b91d55d90aa3587f0a653655829918c3 (diff) | |
oid_get_default_mib_path() is present in libwireshark.def. Make sure it's
available even if HAVE_LIBSMI isn't defined.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24667 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | epan/oids.c | 8 | ||||
| -rw-r--r-- | epan/oids.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/epan/oids.c b/epan/oids.c index 2881096728..b76d4c39f3 100644 --- a/epan/oids.c +++ b/epan/oids.c @@ -386,7 +386,7 @@ static inline oid_kind_t smikind(SmiNode* sN, oid_key_t** key_p) { k->name = g_strdup_printf("%s.%s", oid1, oid2); free (oid1); free (oid2); - + k->hfid = -2; k->ft_type = typedata ? typedata->ft_type : FT_BYTES; k->display = typedata ? typedata->display : BASE_NONE; @@ -1025,12 +1025,12 @@ extern void oid_both_from_string(const gchar *oid_str, char** resolved_p, char** *numeric_p = (void*)oid_subid2string(subids,subids_len); } -#ifdef HAVE_LIBSMI /** * Fetch the default OID path. */ extern gchar * oid_get_default_mib_path(void) { +#ifdef HAVE_LIBSMI GString* path_str; gchar *path_ret; char *path; @@ -1063,8 +1063,10 @@ oid_get_default_mib_path(void) { path_ret = path_str->str; g_string_free(path_str, FALSE); return path_ret; -} +#else /* HAVE_LIBSMI */ + return g_strdup(""); #endif +} #ifdef DEBUG_OIDS char* oid_test_a2b(guint32 num_subids, guint32* subids) { diff --git a/epan/oids.h b/epan/oids.h index 0bd7c511a5..3d2d65269e 100644 --- a/epan/oids.h +++ b/epan/oids.h @@ -153,7 +153,6 @@ extern void oid_add(const char* name, guint oid_len, guint32 *subids); extern void oid_add_from_encoded(const char* name, const guint8 *oid, gint oid_len); extern void oid_add_from_string(const char* name, const gchar *oid_str); -#ifdef HAVE_LIBSMI /** * Fetch the default MIB/PIB path * @@ -161,7 +160,6 @@ extern void oid_add_from_string(const char* name, const gchar *oid_str); * g_free()d by the caller. */ extern gchar *oid_get_default_mib_path(void); -#endif extern void oid_add_from_string(const char* name, const gchar *oid_str); |