aboutsummaryrefslogtreecommitdiffstats
path: root/ui/cli/tap-icmpv6stat.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2013-03-06 17:35:11 +0000
committerAnders Broman <anders.broman@ericsson.com>2013-03-06 17:35:11 +0000
commit7990a0e4d0a7d3046be11164c98fae3e578477ca (patch)
tree0d70167b77c40aca949d8ced1698f3b622415f20 /ui/cli/tap-icmpv6stat.c
parentc6231cc4c4f4c9a7e311b989fffd8ebb777bec1c (diff)
Use explicit casts.
svn path=/trunk/; revision=48137
Diffstat (limited to 'ui/cli/tap-icmpv6stat.c')
-rw-r--r--ui/cli/tap-icmpv6stat.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/cli/tap-icmpv6stat.c b/ui/cli/tap-icmpv6stat.c
index 610d98d993..20cfb1b061 100644
--- a/ui/cli/tap-icmpv6stat.c
+++ b/ui/cli/tap-icmpv6stat.c
@@ -68,7 +68,7 @@ typedef struct _icmpv6stat_t {
static void
icmpv6stat_reset(void *tapdata)
{
- icmpv6stat_t *icmpv6stat = tapdata;
+ icmpv6stat_t *icmpv6stat = (icmpv6stat_t *)tapdata;
g_slist_free(icmpv6stat->rt_list);
memset(icmpv6stat, 0, sizeof(icmpv6stat_t));
@@ -116,7 +116,7 @@ static gint compare_doubles(gconstpointer a, gconstpointer b)
static int
icmpv6stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data)
{
- icmpv6stat_t *icmpv6stat = tapdata;
+ icmpv6stat_t *icmpv6stat = (icmpv6stat_t *)tapdata;
const icmp_transaction_t *trans = data;
double resp_time, *rt;
@@ -125,7 +125,7 @@ icmpv6stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_
if (trans->resp_frame) {
resp_time = nstime_to_msec(&trans->resp_time);
- rt = g_malloc(sizeof(double));
+ rt = g_new(double,1);
if (rt == NULL)
return 0;
*rt = resp_time;
@@ -223,7 +223,7 @@ static void compute_stats(icmpv6stat_t *icmpv6stat, double *mean, double *med, d
static void
icmpv6stat_draw(void *tapdata)
{
- icmpv6stat_t *icmpv6stat = tapdata;
+ icmpv6stat_t *icmpv6stat = (icmpv6stat_t *)tapdata;
unsigned int lost;
double mean, sdev, med;
@@ -270,7 +270,7 @@ icmpv6stat_init(const char *optarg, void* userdata _U_)
if (strstr(optarg, "icmpv6,srt,"))
filter = optarg + strlen("icmpv6,srt,");
- icmpv6stat = g_try_malloc(sizeof(icmpv6stat_t));
+ icmpv6stat = (icmpv6stat_t *)g_try_malloc(sizeof(icmpv6stat_t));
if (icmpv6stat == NULL) {
fprintf(stderr, "tshark: g_try_malloc() fatal error.\n");
exit(1);