osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Add missing includes 

Remove not needed include
emem -> wmem

svn path=/trunk/; revision=51984
This commit is contained in:
Jörg Mayer 2013-09-12 20:38:07 +00:00
parent efe18f199c
commit 884b61f987
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
epan/dissectors/packet-v120.c
View File

@ -28,7 +28,6 @@
#include <glib.h>
#include <epan/packet.h>
#include <epan/xdlc.h>
#include <epan/emem.h>
static int proto_v120 = -1;
static int hf_v120_address = -1;

3
epan/dissectors/packet-vcdu.c
View File

@ -29,6 +29,7 @@
#include <glib.h>
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/wmem/wmem.h>
#include <epan/uat.h>
/* Initialize the protocol and registered fields */
@ -174,7 +175,7 @@ vcdu_uat_data_update_cb(void *p, const char **err) {
uat_channel_t *ud = (uat_channel_t *)p;
if (ud->channel >= 64) {
*err = ep_strdup_printf("Channel must be between 0-63.");
*err = wmem_strdup_printf(wmem_packet_scope(), "Channel must be between 0-63.");
return;
}
}

6
epan/dissectors/packet-vnc.c
View File

@ -47,7 +47,7 @@
#include <glib.h>
#include <epan/conversation.h>
#include <epan/emem.h>
#include <epan/wmem/wmem.h>
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/expert.h>
@ -843,7 +843,7 @@ dissect_vnc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
* there yet */
per_conversation_info = (vnc_conversation_t *)conversation_get_proto_data(conversation, proto_vnc);
if(!per_conversation_info) {
per_conversation_info = se_new(vnc_conversation_t);
per_conversation_info = wmem_new(wmem_file_scope(), vnc_conversation_t);
per_conversation_info->vnc_next_state = VNC_SESSION_STATE_SERVER_VERSION;
per_conversation_info->security_type_selected = VNC_SECURITY_TYPE_INVALID;
@ -1011,7 +1011,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset,
per_packet_info = (vnc_packet_t *)p_get_proto_data(pinfo->fd, proto_vnc, 0);
if(!per_packet_info) {
per_packet_info = se_new(vnc_packet_t);
per_packet_info = wmem_new(wmem_file_scope(), vnc_packet_t);
per_packet_info->state = per_conversation_info->vnc_next_state;
per_packet_info->preferred_encoding = -1;

1
epan/dissectors/packet-vxi11.c
View File

@ -29,6 +29,7 @@
#include "config.h"
#include "packet-rpc.h"
#include <epan/emem.h>
/*
* For the protocol specifications, see