diff options
| author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2005-09-06 14:18:49 +0000 |
|---|---|---|
| committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2005-09-06 14:18:49 +0000 |
| commit | b9b159713a8572ff6d8cbaa29b2835b2dec1a0b1 (patch) | |
| tree | b87ab37ce9182bb8e760820e24658efed9258c56 /asn1 | |
| parent | 92015a695f4ccbff1118f41027411708c5ed1e9f (diff) | |
| download | wireshark-b9b159713a8572ff6d8cbaa29b2835b2dec1a0b1.tar.gz wireshark-b9b159713a8572ff6d8cbaa29b2835b2dec1a0b1.tar.bz2 wireshark-b9b159713a8572ff6d8cbaa29b2835b2dec1a0b1.zip | |
get rid of few warnings
svn path=/trunk/; revision=15700
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/h225/h225.cnf | 8 | ||||
| -rw-r--r-- | asn1/h245/h245.cnf | 14 |
2 files changed, 12 insertions, 10 deletions
diff --git a/asn1/h225/h225.cnf b/asn1/h225/h225.cnf index 86b373b53a..142f648d28 100644 --- a/asn1/h225/h225.cnf +++ b/asn1/h225/h225.cnf @@ -213,7 +213,7 @@ CallIdentifier/guid guid if (h225_pi->is_destinationInfo == TRUE) { if (value_tvb) { len = tvb_length(value_tvb); - tvb_memcpy(value_tvb, h225_pi->dialedDigits, 0, len); + tvb_memcpy(value_tvb, (guint8*)h225_pi->dialedDigits, 0, len); } h225_pi->dialedDigits[len] = '\0'; h225_pi->is_destinationInfo = FALSE; @@ -223,10 +223,12 @@ CallIdentifier/guid guid #.FN_PARS H245TransportAddress/h245ipAddress/h245ipv4 VAL_PTR = &value_tvb #.FN_BODY H245TransportAddress/h245ipAddress/h245ipv4 - tvbuff_t *value_tvb; + tvbuff_t *value_tvb; + ipv4_address = 0; %(DEFAULT_BODY)s - tvb_memcpy(value_tvb, (char *)&ipv4_address, 0, 4); + if (value_tvb) + tvb_memcpy(value_tvb, (guint8*)&ipv4_address, 0, 4); #.END #---------------------------------------------------------------------------------------- #.FN_PARS H245TransportAddress/h245ipAddress/h245ipv4port diff --git a/asn1/h245/h245.cnf b/asn1/h245/h245.cnf index 162c8b4a21..1b7f77e942 100644 --- a/asn1/h245/h245.cnf +++ b/asn1/h245/h245.cnf @@ -276,14 +276,14 @@ OpenLogicalChannel VAL_PTR = &value_tvb #.FN_BODY UnicastAddress/iPAddress/network - tvbuff_t *value_tvb; + tvbuff_t *value_tvb; %(DEFAULT_BODY)s if ( media_channel ) - tvb_memcpy(value_tvb, (char *)&ipv4_address, 0, 4); + tvb_memcpy(value_tvb, (guint8*)&ipv4_address, 0, 4); if ( media_control_channel ) - tvb_memcpy(value_tvb, (char *)&rtcp_ipv4_address, 0, 4); + tvb_memcpy(value_tvb, (guint8*)&rtcp_ipv4_address, 0, 4); #.END #---------------------------------------------------------------------------------------- @@ -364,7 +364,7 @@ OpenLogicalChannel src_addr.type=AT_IPv4; src_addr.len=4; - src_addr.data=(char *)&ipv4_address; + src_addr.data=(guint8*)&ipv4_address; rtp_add_address(pinfo, &src_addr, ipv4_port, 0, "H245", pinfo->fd->num, NULL); } @@ -373,7 +373,7 @@ OpenLogicalChannel src_addr.type=AT_IPv4; src_addr.len=4; - src_addr.data=(char *)&rtcp_ipv4_address; + src_addr.data=(guint8*)&rtcp_ipv4_address; rtcp_add_address(pinfo, &src_addr, rtcp_ipv4_port, 0, "H245", pinfo->fd->num); } @@ -394,7 +394,7 @@ OpenLogicalChannel src_addr.type=AT_IPv4; src_addr.len=4; - src_addr.data=(char *)&ipv4_address; + src_addr.data=(guint8*)&ipv4_address; rtp_add_address(pinfo, &src_addr, ipv4_port, 0, "H245", pinfo->fd->num, NULL); } @@ -403,7 +403,7 @@ OpenLogicalChannel src_addr.type=AT_IPv4; src_addr.len=4; - src_addr.data=(char *)&rtcp_ipv4_address; + src_addr.data=(guint8*)&rtcp_ipv4_address; rtcp_add_address(pinfo, &src_addr, rtcp_ipv4_port, 0, "H245", pinfo->fd->num); } |