diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-01-18 13:02:15 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-01-18 21:02:40 +0000 |
| commit | 050bc7d100e9846663ac2c14eadde15e9cd9fdb9 (patch) | |
| tree | 29b58df68f42d396d1507e89df1e9d8631713368 /epan/conversation.c | |
| parent | 929d41c6856139168c441a14498210d31574de97 (diff) | |
Update some comments to reflect reality.
Get rid of references to ep_ and se_ allocation in code that now uses
wmem allocation instead.
Fix API documentation of conversation_table.h routines to reflect that
as well - some APIs changed to pass wmem scopes.
Also, zbee_sec_key_hash() now takes the output buffer as an argument and
just returns it, and nobody actually uses the return value, so change it
to return void.
Change-Id: Ife1ec675a9322fd0f0be306a9d639ec17aad1c7a
Reviewed-on: https://code.wireshark.org/review/6636
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/conversation.c')
| -rw-r--r-- | epan/conversation.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/conversation.c b/epan/conversation.c index aa66996ef0..859555187e 100644 --- a/epan/conversation.c +++ b/epan/conversation.c @@ -466,7 +466,7 @@ free_data_list(gpointer value) { conversation_t *conv = (conversation_t *)value; - /* TODO: se_slist? */ + /* TODO: file scoped wmem_list? There's no singly-linked wmem_ list */ g_slist_free(conv->data_list); /* Not really necessary, but... */ @@ -482,7 +482,8 @@ conversation_cleanup(void) { /* Clean up the hash tables, but only after freeing any proto_data * that may be hanging off the conversations. - * The conversation keys are se_ allocated so we don't have to clean them up. + * The conversation keys are wmem-allocated with file scope so we + * don't have to clean them up. */ conversation_keys = NULL; if (conversation_hashtable_exact != NULL) { |