diff options
| author | Evan Huus <eapache@gmail.com> | 2014-02-16 09:05:19 -0500 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-02-16 14:06:13 +0000 |
| commit | 4ca528f5492f5ea695ffc556f683e19a0f62cf11 (patch) | |
| tree | faae8ea6896527a7e65397c32d3d7598609b1195 /ui/gtk/compare_stat.c | |
| parent | 4f7d3ea15fdbbf8002d364671989d87cdf1f0ff4 (diff) | |
| download | wireshark-4ca528f5492f5ea695ffc556f683e19a0f62cf11.tar.gz | |
Add explicit casts to fix OSX10.5 Buildbot
Change-Id: I13fa3d6af3d0fddc367835fc05efdbe106b991e6
Reviewed-on: https://code.wireshark.org/review/228
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'ui/gtk/compare_stat.c')
| -rw-r--r-- | ui/gtk/compare_stat.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c index 194028ada9..9fd7352036 100644 --- a/ui/gtk/compare_stat.c +++ b/ui/gtk/compare_stat.c @@ -256,7 +256,7 @@ call_foreach_count_ip_id(gpointer key _U_, gpointer value, gpointer arg) pinfo->fd=(frame_data*)ep_alloc(sizeof(frame_data)); pinfo->fd->num = fInfo->num; - fInfoTemp=(frame_info *)g_hash_table_lookup(cs->ip_id_set, GINT_TO_POINTER(fInfo->id)); + fInfoTemp=(frame_info *)g_hash_table_lookup(cs->ip_id_set, GINT_TO_POINTER((gint)fInfo->id)); if(fInfoTemp==NULL){ /* Detect ongoing package loss */ if((cs->last_hit==FALSE)&&(cs->start_ongoing_hits>compare_start)&&(cs->stop_ongoing_hits<compare_stop)){ @@ -269,7 +269,7 @@ call_foreach_count_ip_id(gpointer key _U_, gpointer value, gpointer arg) cs->last_hit=FALSE; fInfo->fg->count=1; - g_hash_table_insert(cs->ip_id_set, GINT_TO_POINTER(fInfo->id), fInfo); + g_hash_table_insert(cs->ip_id_set, GINT_TO_POINTER((gint)fInfo->id), fInfo); } else { /* Detect ongoing package hits, special behavior if start is set to 0 */ if((cs->last_hit||(compare_start==0))&&(cs->start_ongoing_hits<compare_start||(compare_start==0))){ @@ -304,7 +304,7 @@ call_foreach_count_ip_id(gpointer key _U_, gpointer value, gpointer arg) nstime_add(&fInfo->delta, &delta); time_stat_update(&cs->stats, &delta, pinfo); } - g_hash_table_insert(cs->ip_id_set, GINT_TO_POINTER(fInfo->id), fInfo); + g_hash_table_insert(cs->ip_id_set, GINT_TO_POINTER((gint)fInfo->id), fInfo); } /* collect TTL's */ @@ -326,27 +326,27 @@ call_foreach_new_order(gpointer key _U_, gpointer value, gpointer arg) frame_info *fInfo=(frame_info*)value, *fInfoTemp; /* overwrite Info column for new ordering */ - fInfoTemp=(frame_info *)g_hash_table_lookup(cs->nr_set, GINT_TO_POINTER(fInfo->id)); + fInfoTemp=(frame_info *)g_hash_table_lookup(cs->nr_set, GINT_TO_POINTER((gint)fInfo->id)); if(fInfoTemp==NULL){ if(TTL_method==FALSE){ if((ADDRESSES_EQUAL(&cs->eth_dst, &fInfo->dl_dst)) || (ADDRESSES_EQUAL(&cs->eth_src, &fInfo->dl_dst))){ - g_hash_table_insert(cs->nr_set, GINT_TO_POINTER(fInfo->id), fInfo); + g_hash_table_insert(cs->nr_set, GINT_TO_POINTER((gint)fInfo->id), fInfo); fInfo->zebra_time=cs->zebra_time; cs->zebra_time.nsecs=cs->zebra_time.nsecs + MERGED_FILES; } else { cs->zebra_time.nsecs++; - g_hash_table_insert(cs->nr_set, GINT_TO_POINTER(fInfo->id), fInfo); + g_hash_table_insert(cs->nr_set, GINT_TO_POINTER((gint)fInfo->id), fInfo); fInfo->zebra_time=cs->zebra_time; cs->zebra_time.nsecs++; } } else { if((g_array_index(cs->ip_ttl_list, guint8, 0)==fInfo->ip_ttl) || (g_array_index(cs->ip_ttl_list, guint8, 1)==fInfo->ip_ttl)){ - g_hash_table_insert(cs->nr_set, GINT_TO_POINTER(fInfo->id), fInfo); + g_hash_table_insert(cs->nr_set, GINT_TO_POINTER((gint)fInfo->id), fInfo); fInfo->zebra_time=cs->zebra_time; cs->zebra_time.nsecs=cs->zebra_time.nsecs + MERGED_FILES; } else { cs->zebra_time.nsecs++; - g_hash_table_insert(cs->nr_set, GINT_TO_POINTER(fInfo->id), fInfo); + g_hash_table_insert(cs->nr_set, GINT_TO_POINTER((gint)fInfo->id), fInfo); fInfo->zebra_time=cs->zebra_time; cs->zebra_time.nsecs++; } |