diff options
| author | Guy Harris <guy@alum.mit.edu> | 2005-08-20 18:17:36 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2005-08-20 18:17:36 +0000 |
| commit | eadcfd642afa5bc71ae3c16679943ae0d0710d2e (patch) | |
| tree | 0b4e07bc37ff1d8030967906b535705b9a9072a1 /asn1/acse | |
| parent | a749379d3ce529f33d47dafbfac46e302e50f22a (diff) | |
| download | wireshark-eadcfd642afa5bc71ae3c16679943ae0d0710d2e.tar.gz | |
There's no longer a need to individually remove items from
acse_ctx_oid_table - destroying the hash table will destroy the hash
table items, and the destroy function no longer has any work to do
because the OID strings are now allocated with se_strdup() (and thus get
freed when the capture is closed).
Regenerate packet-acse.c, which also regenerates acse-exp.cnf.
svn path=/trunk/; revision=15480
Diffstat (limited to 'asn1/acse')
| -rw-r--r-- | asn1/acse/acse-exp.cnf | 4 | ||||
| -rw-r--r-- | asn1/acse/packet-acse-template.c | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/asn1/acse/acse-exp.cnf b/asn1/acse/acse-exp.cnf index b30eecd335..26f1126f8b 100644 --- a/asn1/acse/acse-exp.cnf +++ b/asn1/acse/acse-exp.cnf @@ -1,7 +1,7 @@ #.IMPORT_TAG EXTERNAL BER_CLASS_UNI 8 -AP_title BER_CLASS_UNI -1/*choice*/ -AE_qualifier BER_CLASS_UNI -1/*choice*/ +AP_title BER_CLASS_ANY/*choice*/ -1/*choice*/ +AE_qualifier BER_CLASS_ANY/*choice*/ -1/*choice*/ AE_invocation_identifier BER_CLASS_UNI BER_UNI_TAG_INTEGER AP_invocation_identifier BER_CLASS_UNI BER_UNI_TAG_INTEGER #.END diff --git a/asn1/acse/packet-acse-template.c b/asn1/acse/packet-acse-template.c index 7e6b2b7cf5..82e95d69b8 100644 --- a/asn1/acse/packet-acse-template.c +++ b/asn1/acse/packet-acse-template.c @@ -80,11 +80,6 @@ typedef struct _acse_ctx_oid_t { } acse_ctx_oid_t; static GHashTable *acse_ctx_oid_table = NULL; -static gboolean -free_all_ctx_oid_strings(gpointer key_arg, gpointer value _U_, gpointer user_data _U_) -{ - return TRUE; -} static guint acse_ctx_oid_hash(gconstpointer k) { @@ -104,8 +99,6 @@ static void acse_init(void) { if( acse_ctx_oid_table ){ - g_hash_table_foreach_remove(acse_ctx_oid_table, - free_all_ctx_oid_strings, NULL); g_hash_table_destroy(acse_ctx_oid_table); acse_ctx_oid_table = NULL; } |