diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2005-03-23 00:09:12 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2005-03-23 00:09:12 +0000 |
| commit | 79daa1e80ee9ee42a25fdf1119feedc423709b36 (patch) | |
| tree | c6b568e7eec9f8fad37a1168e121c05f21b0113a /epan/conversation.c | |
| parent | 58e7915cc0f4a115bba7c616825f330bd917d695 (diff) | |
| download | wireshark-79daa1e80ee9ee42a25fdf1119feedc423709b36.tar.gz wireshark-79daa1e80ee9ee42a25fdf1119feedc423709b36.tar.bz2 wireshark-79daa1e80ee9ee42a25fdf1119feedc423709b36.zip | |
use DISSECTOR_ASSERT instead of g_assert
svn path=/trunk/; revision=13871
Diffstat (limited to 'epan/conversation.c')
| -rw-r--r-- | epan/conversation.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/conversation.c b/epan/conversation.c index de64f75789..17fb491aef 100644 --- a/epan/conversation.c +++ b/epan/conversation.c @@ -535,7 +535,7 @@ conversation_new(guint32 setup_frame, address *addr1, address *addr2, port_type guint32 port1, guint32 port2, guint options) { /* - g_assert(!(options | CONVERSATION_TEMPLATE) || ((options | (NO_ADDR2 | NO_PORT2 | NO_PORT2_FORCE))) && + DISSECTOR_ASSERT(!(options | CONVERSATION_TEMPLATE) || ((options | (NO_ADDR2 | NO_PORT2 | NO_PORT2_FORCE))) && "A conversation template may not be constructed without wildcard options"); */ GHashTable* hashtable; @@ -614,7 +614,7 @@ conversation_new(guint32 setup_frame, address *addr1, address *addr2, port_type void conversation_set_port2(conversation_t *conv, guint32 port) { - g_assert(!(conv->options & CONVERSATION_TEMPLATE) && + DISSECTOR_ASSERT(!(conv->options & CONVERSATION_TEMPLATE) && "Use the conversation_create_from_template function when the CONVERSATION_TEMPLATE bit is set in the options mask"); /* @@ -648,7 +648,7 @@ conversation_set_port2(conversation_t *conv, guint32 port) void conversation_set_addr2(conversation_t *conv, address *addr) { - g_assert(!(conv->options & CONVERSATION_TEMPLATE) && + DISSECTOR_ASSERT(!(conv->options & CONVERSATION_TEMPLATE) && "Use the conversation_create_from_template function when the CONVERSATION_TEMPLATE bit is set in the options mask"); /* |