diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 22:03:00 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 22:03:00 +0000 |
| commit | ae747e4c4b34c2d6889df335a439b9fba77538d0 (patch) | |
| tree | 3586ed7bc3e608af6db8bf6eff87fb3990c45b35 /epan/dissectors/packet-rlogin.c | |
| parent | 7c56677cf9e703e6dde30529b24e27dd2a4960a9 (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48430
Diffstat (limited to 'epan/dissectors/packet-rlogin.c')
| -rw-r--r-- | epan/dissectors/packet-rlogin.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-rlogin.c b/epan/dissectors/packet-rlogin.c index f149f35aa1..6a2b217c4e 100644 --- a/epan/dissectors/packet-rlogin.c +++ b/epan/dissectors/packet-rlogin.c @@ -387,7 +387,7 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info, static void dissect_rlogin(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - struct tcpinfo *tcpinfo = pinfo->private_data; + struct tcpinfo *tcpinfo = (struct tcpinfo *)pinfo->private_data; conversation_t *conversation; rlogin_hash_entry_t *hash_info; guint length; @@ -397,11 +397,11 @@ dissect_rlogin(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) conversation = find_or_create_conversation(pinfo); /* Get or create data associated with this conversation */ - hash_info = conversation_get_proto_data(conversation, proto_rlogin); + hash_info = (rlogin_hash_entry_t *)conversation_get_proto_data(conversation, proto_rlogin); if (!hash_info) { /* Populate new data struct... */ - hash_info = se_alloc(sizeof(rlogin_hash_entry_t)); + hash_info = se_new(rlogin_hash_entry_t); hash_info->state = NONE; hash_info->info_framenum = 0; /* no frame has the number 0 */ hash_info->user_name[0] = '\0'; |