aboutsummaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7>2007-03-21 03:26:26 +0000
committerulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7>2007-03-21 03:26:26 +0000
commit6323389677d115eb79a2912a39bdc38781b8f58d (patch)
tree17c4ab8485e38fe59442c67b85967aaff666312c /gtk
parent4bee37672257da89eae7ebd1fb26a5a9e0dc4eb9 (diff)
fix all warnings in gtk dir & set the "treat all warnings as errors" MSVC flag
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21080 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk')
-rw-r--r--gtk/Makefile.nmake2
-rw-r--r--gtk/compat_macros.h2
-rw-r--r--gtk/filter_dlg.c4
-rw-r--r--gtk/io_stat.c23
-rw-r--r--gtk/mcast_stream.c16
-rw-r--r--gtk/packet_list.c4
-rw-r--r--gtk/rtp_player.c2
-rw-r--r--gtk/rtp_stream.c8
-rw-r--r--gtk/sctp_byte_graph_dlg.c36
-rw-r--r--gtk/sctp_graph_dlg.c40
-rw-r--r--gtk/tcp_graph.c8
-rw-r--r--gtk/voip_calls.c36
12 files changed, 88 insertions, 93 deletions
diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake
index 9381b2b46d..9ab577f026 100644
--- a/gtk/Makefile.nmake
+++ b/gtk/Makefile.nmake
@@ -7,7 +7,7 @@ include ..\config.nmake
############### no need to modify below this line #########
-CFLAGS=-DHAVE_CONFIG_H /I.. /I../wiretap $(GTK_CFLAGS) $(GNUTLS_CFLAGS) \
+CFLAGS=-WX -DHAVE_CONFIG_H /I.. /I../wiretap $(GTK_CFLAGS) $(GNUTLS_CFLAGS) \
/I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \
/I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \
/I$(PCAP_DIR)\include $(NET_SNMP_CFLAGS) \
diff --git a/gtk/compat_macros.h b/gtk/compat_macros.h
index c4d1062146..db048160ec 100644
--- a/gtk/compat_macros.h
+++ b/gtk/compat_macros.h
@@ -111,6 +111,7 @@ gtk_widget_set_usize(GTK_WIDGET(widget), width, height)
* handlers to be run.
*/
#define SIGNAL_EMIT_BY_NAME gtk_signal_emit_by_name
+#define SIGNAL_EMIT_OBJECT(object) GTK_OBJECT(object)
/** This function aborts a signal's current emission. It will prevent the
* default method from running, if the signal was GTK_RUN_LAST and you
@@ -304,6 +305,7 @@ g_object_get_data(G_OBJECT(widget), key)
gtk_widget_set_size_request(GTK_WIDGET(widget), width, height)
#define SIGNAL_EMIT_BY_NAME g_signal_emit_by_name
+#define SIGNAL_EMIT_OBJECT(object) G_OBJECT(object)
#define SIGNAL_EMIT_STOP_BY_NAME(widget, name) \
g_signal_stop_emission_by_name(G_OBJECT(widget), name)
diff --git a/gtk/filter_dlg.c b/gtk/filter_dlg.c
index 2fa01d7804..12f5484fbd 100644
--- a/gtk/filter_dlg.c
+++ b/gtk/filter_dlg.c
@@ -775,7 +775,7 @@ filter_dlg_dclick(GtkWidget *filter_l, gpointer main_w_arg, gpointer activate)
/*
* Yes - do so.
*/
- SIGNAL_EMIT_BY_NAME(parent_filter_te, "activate", NULL);
+ SIGNAL_EMIT_BY_NAME(SIGNAL_EMIT_OBJECT(parent_filter_te), "activate", NULL);
}
}
}
@@ -867,7 +867,7 @@ filter_apply(GtkWidget *main_w, gboolean destroy)
* to destroy it.
*/
if (construct_args->activate_on_ok) {
- SIGNAL_EMIT_BY_NAME(parent_filter_te, "activate", NULL);
+ SIGNAL_EMIT_BY_NAME(SIGNAL_EMIT_OBJECT(parent_filter_te), "activate", NULL);
}
}
}
diff --git a/gtk/io_stat.c b/gtk/io_stat.c
index d94df0fa52..92ce77d27c 100644
--- a/gtk/io_stat.c
+++ b/gtk/io_stat.c
@@ -246,7 +246,7 @@ gtk_iostat_packet(void *g, packet_info *pinfo, epan_dissect_t *edt, const void *
if(time_delta.secs<0){
return FALSE;
}
- idx=(time_delta.secs*1000+time_delta.nsecs/1000000)/git->io->interval;
+ idx=(int) ((time_delta.secs*1000+time_delta.nsecs/1000000)/git->io->interval);
/* some sanity checks */
if((idx<0)||(idx>=NUM_IO_ITEMS)){
@@ -318,11 +318,7 @@ gtk_iostat_packet(void *g, packet_info *pinfo, epan_dissect_t *edt, const void *
new_time=fvalue_get(&((field_info *)gp->pdata[0])->value);
switch(git->calc_type){
-#ifdef G_HAVE_UINT64
guint64 t, pt; /* time in us */
-#else
- guint32 t, pt;
-#endif
int i;
case CALC_TYPE_LOAD:
/* it is a LOAD calculation of a relative time field.
@@ -340,7 +336,7 @@ gtk_iostat_packet(void *g, packet_info *pinfo, epan_dissect_t *edt, const void *
pt=t;
}
while(t){
- git->items[i].time_tot.nsecs+=pt*1000;
+ git->items[i].time_tot.nsecs+=(int) (pt*1000);
if(git->items[i].time_tot.nsecs>1000000000){
git->items[i].time_tot.secs++;
git->items[i].time_tot.nsecs-=1000000000;
@@ -453,30 +449,27 @@ get_it_value(io_stat_t *io, int graph_id, int idx)
value=it->frames;
break;
case CALC_TYPE_MAX:
- value=it->time_max.secs*1000000+it->time_max.nsecs/1000;
+ value=(guint32) (it->time_max.secs*1000000+it->time_max.nsecs/1000);
break;
case CALC_TYPE_MIN:
- value=it->time_min.secs*1000000+it->time_min.nsecs/1000;
+ value=(guint32) (it->time_min.secs*1000000+it->time_min.nsecs/1000);
break;
case CALC_TYPE_SUM:
- value=it->time_tot.secs*1000000+it->time_tot.nsecs/1000;
+ value=(guint32) (it->time_tot.secs*1000000+it->time_tot.nsecs/1000);
break;
case CALC_TYPE_AVG:
if(it->frames){
-#ifdef G_HAVE_UINT64
guint64 t; /* time in us */
-#else
- guint32 t;
-#endif
+
t=it->time_tot.secs;
t=t*1000000+it->time_tot.nsecs/1000;
- value=t/it->frames;
+ value=(guint32) (t/it->frames);
} else {
value=0;
}
break;
case CALC_TYPE_LOAD:
- value=(it->time_tot.secs*1000000+it->time_tot.nsecs/1000)/io->interval;
+ value=(guint32) ((it->time_tot.secs*1000000+it->time_tot.nsecs/1000)/io->interval);
break;
default:
break;
diff --git a/gtk/mcast_stream.c b/gtk/mcast_stream.c
index e91cab21af..427837b014 100644
--- a/gtk/mcast_stream.c
+++ b/gtk/mcast_stream.c
@@ -187,9 +187,9 @@ static int mcaststream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt
tmp_strinfo.npackets = 0;
tmp_strinfo.apackets = 0;
tmp_strinfo.first_frame_num = pinfo->fd->num;
- tmp_strinfo.start_sec = pinfo->fd->abs_ts.secs;
+ tmp_strinfo.start_sec = (guint32) pinfo->fd->abs_ts.secs;
tmp_strinfo.start_usec = pinfo->fd->abs_ts.nsecs/1000;
- tmp_strinfo.start_rel_sec = pinfo->fd->rel_ts.secs;
+ tmp_strinfo.start_rel_sec = (guint32) pinfo->fd->rel_ts.secs;
tmp_strinfo.start_rel_usec = pinfo->fd->rel_ts.nsecs/1000;
tmp_strinfo.vlan_id = 0;
@@ -222,7 +222,7 @@ static int mcaststream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt
tapinfo->allstreams = g_malloc(sizeof(mcast_stream_info_t));
tapinfo->allstreams->element.buff =
(struct timeval *)g_malloc(buffsize * sizeof(struct timeval));
- tapinfo->allstreams->start_rel_sec = pinfo->fd->rel_ts.secs;
+ tapinfo->allstreams->start_rel_sec = (guint32) pinfo->fd->rel_ts.secs;
tapinfo->allstreams->start_rel_usec = pinfo->fd->rel_ts.nsecs/1000;
tapinfo->allstreams->total_bytes = 0;
tapinfo->allstreams->element.first=0;
@@ -241,7 +241,7 @@ static int mcaststream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt
}
/* time between first and last packet in the group */
- strinfo->stop_rel_sec = pinfo->fd->rel_ts.secs;
+ strinfo->stop_rel_sec = (guint32) pinfo->fd->rel_ts.secs;
strinfo->stop_rel_usec = pinfo->fd->rel_ts.nsecs/1000;
deltatime = ((float)((strinfo->stop_rel_sec * 1000000 + strinfo->stop_rel_usec)
- (strinfo->start_rel_sec*1000000 + strinfo->start_rel_usec)))/1000000;
@@ -253,10 +253,10 @@ static int mcaststream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt
/* increment the packets counter for this stream and calculate average pps */
++(strinfo->npackets);
- strinfo->apackets = strinfo->npackets / deltatime;
+ strinfo->apackets = (guint32) (strinfo->npackets / deltatime);
/* time between first and last packet in any group */
- tapinfo->allstreams->stop_rel_sec = pinfo->fd->rel_ts.secs;
+ tapinfo->allstreams->stop_rel_sec = (guint32) pinfo->fd->rel_ts.secs;
tapinfo->allstreams->stop_rel_usec = pinfo->fd->rel_ts.nsecs/1000;
deltatime = ((float)((tapinfo->allstreams->stop_rel_sec * 1000000 + tapinfo->allstreams->stop_rel_usec)
- (tapinfo->allstreams->start_rel_sec*1000000 + tapinfo->allstreams->start_rel_usec)))/1000000;
@@ -386,7 +386,7 @@ void buffusagecalc(mcast_stream_info_t *strinfo, packet_info *pinfo, double empt
strinfo->element.buffusage+=pinfo->fd->pkt_len;
/* bytes cleared from buffer */
- strinfo->element.buffusage-=(timeelapsed * emptyspeed / 8);
+ strinfo->element.buffusage-= (guint32) (timeelapsed * emptyspeed / 8);
if(strinfo->element.buffusage < 0) strinfo->element.buffusage=0;
if(strinfo->element.buffusage > strinfo->element.topbuffusage)
@@ -421,7 +421,7 @@ void slidingwindow(mcast_stream_info_t *strinfo, packet_info *pinfo)
}
/* burst count */
- buffer[strinfo->element.last].tv_sec = pinfo->fd->rel_ts.secs;
+ buffer[strinfo->element.last].tv_sec = (guint32) pinfo->fd->rel_ts.secs;
buffer[strinfo->element.last].tv_usec = pinfo->fd->rel_ts.nsecs/1000;
while(comparetimes((struct timeval *)&(buffer[strinfo->element.first]),
(struct timeval *)&(buffer[strinfo->element.last]), burstint)){
diff --git a/gtk/packet_list.c b/gtk/packet_list.c
index 0fda137f03..b4808aa1d6 100644
--- a/gtk/packet_list.c
+++ b/gtk/packet_list.c
@@ -704,7 +704,7 @@ packet_list_thaw(void)
void
packet_list_select_row(gint row)
{
- SIGNAL_EMIT_BY_NAME(packet_list, "select_row", row);
+ SIGNAL_EMIT_BY_NAME(SIGNAL_EMIT_OBJECT(packet_list), "select_row", row);
}
static void
@@ -713,7 +713,7 @@ packet_list_next_prev(gboolean next)
#if GTK_MAJOR_VERSION >= 2
GtkWidget *focus = gtk_window_get_focus(GTK_WINDOW(top_level));
#endif
- SIGNAL_EMIT_BY_NAME(packet_list, "scroll_vertical",
+ SIGNAL_EMIT_BY_NAME(SIGNAL_EMIT_OBJECT(packet_list), "scroll_vertical",
next ? GTK_SCROLL_STEP_FORWARD : GTK_SCROLL_STEP_BACKWARD, 0.0);
#if GTK_MAJOR_VERSION >= 2
/* Set the focus back where it was */
diff --git a/gtk/rtp_player.c b/gtk/rtp_player.c
index 38f116d510..386090ebd3 100644
--- a/gtk/rtp_player.c
+++ b/gtk/rtp_player.c
@@ -1011,7 +1011,7 @@ static int paCallback( void *inputBuffer, void *outputBuffer,
PaTimestamp outTime, void *userData)
{
#else /* PORTAUDIO_API_1 */
-static int paCallback( void *inputBuffer, void *outputBuffer,
+static int paCallback( const void *inputBuffer, void *outputBuffer,
unsigned long framesPerBuffer,
const PaStreamCallbackTimeInfo* outTime,
PaStreamCallbackFlags statusFlags,
diff --git a/gtk/rtp_stream.c b/gtk/rtp_stream.c
index 61ac216b78..68acf3ecdf 100644
--- a/gtk/rtp_stream.c
+++ b/gtk/rtp_stream.c
@@ -230,9 +230,9 @@ static int rtpstream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _
if (!strinfo) {
tmp_strinfo.npackets = 0;
tmp_strinfo.first_frame_num = pinfo->fd->num;
- tmp_strinfo.start_sec = pinfo->fd->abs_ts.secs;
+ tmp_strinfo.start_sec = (guint32) pinfo->fd->abs_ts.secs;
tmp_strinfo.start_usec = pinfo->fd->abs_ts.nsecs/1000;
- tmp_strinfo.start_rel_sec = pinfo->fd->rel_ts.secs;
+ tmp_strinfo.start_rel_sec = (guint32) pinfo->fd->rel_ts.secs;
tmp_strinfo.start_rel_usec = pinfo->fd->rel_ts.nsecs/1000;
tmp_strinfo.tag_vlan_error = 0;
tmp_strinfo.tag_diffserv_error = 0;
@@ -284,7 +284,7 @@ static int rtpstream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _
/* increment the packets counter for this stream */
++(strinfo->npackets);
- strinfo->stop_rel_sec = pinfo->fd->rel_ts.secs;
+ strinfo->stop_rel_sec = (guint32) pinfo->fd->rel_ts.secs;
strinfo->stop_rel_usec = pinfo->fd->rel_ts.nsecs/1000;
/* increment the packets counter of all streams */
@@ -298,7 +298,7 @@ static int rtpstream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _
FALSE, so that we don't *have* all the data? */
sample.header.rec_time =
(pinfo->fd->abs_ts.nsecs/1000 + 1000000 - tapinfo->filter_stream_fwd->start_usec)/1000
- + (pinfo->fd->abs_ts.secs - tapinfo->filter_stream_fwd->start_sec - 1)*1000;
+ + (guint32) (pinfo->fd->abs_ts.secs - tapinfo->filter_stream_fwd->start_sec - 1)*1000;
sample.header.frame_length = rtpinfo->info_data_len;
sample.frame = rtpinfo->info_data;
rtp_write_sample(&sample, tapinfo->save_file);
diff --git a/gtk/sctp_byte_graph_dlg.c b/gtk/sctp_byte_graph_dlg.c
index 9473a2ed71..4de043d90d 100644
--- a/gtk/sctp_byte_graph_dlg.c
+++ b/gtk/sctp_byte_graph_dlg.c
@@ -311,8 +311,8 @@ static void sctp_graph_draw(struct sctp_udata *u_data)
}
else
{
- u_data->io->min_x=u_data->io->x1_tmp_sec*1000000.0+u_data->io->x1_tmp_usec;
- u_data->io->max_x=u_data->io->x2_tmp_sec*1000000.0+u_data->io->x2_tmp_usec;
+ u_data->io->min_x=((guint32) (u_data->io->x1_tmp_sec*1000000.0))+u_data->io->x1_tmp_usec;
+ u_data->io->max_x=((guint32) (u_data->io->x2_tmp_sec*1000000.0))+u_data->io->x2_tmp_usec;
u_data->io->uoff = FALSE;
}
@@ -904,8 +904,8 @@ on_button_press (GtkWidget *widget _U_, GdkEventButton *event, struct sctp_udata
{
gdk_draw_rectangle(u_data->io->pixmap,u_data->io->draw_area->style->white_gc,
FALSE,
- floor(MIN(u_data->io->x_old,u_data->io->x_new)),
- floor(MIN(u_data->io->y_old,u_data->io->y_new)),
+ (gint)floor(MIN(u_data->io->x_old,u_data->io->x_new)),
+ (gint)floor(MIN(u_data->io->y_old,u_data->io->y_new)),
(gint)abs((long)(u_data->io->x_new-u_data->io->x_old)),
(gint)abs((long)(u_data->io->y_new-u_data->io->y_old)));
ios=(sctp_graph_t *)OBJECT_GET_DATA(u_data->io->draw_area, "sctp_graph_t");
@@ -973,10 +973,10 @@ on_button_release (GtkWidget *widget _U_, GdkEventButton *event, struct sctp_uda
if (abs((long)(event->x-u_data->io->x_old))>10 || abs((long)(event->y-u_data->io->y_old))>10)
{
- u_data->io->rect_x_min = floor(MIN(u_data->io->x_old,event->x));
- u_data->io->rect_x_max = ceil(MAX(u_data->io->x_old,event->x));
- u_data->io->rect_y_min = floor(MIN(u_data->io->y_old,event->y));
- u_data->io->rect_y_max = ceil(MAX(u_data->io->y_old,event->y));
+ u_data->io->rect_x_min = (guint32) floor(MIN(u_data->io->x_old,event->x));
+ u_data->io->rect_x_max = (guint32) ceil(MAX(u_data->io->x_old,event->x));
+ u_data->io->rect_y_min = (guint32) floor(MIN(u_data->io->y_old,event->y));
+ u_data->io->rect_y_max = (guint32) ceil(MAX(u_data->io->y_old,event->y));
gdk_draw_rectangle(u_data->io->pixmap,u_data->io->draw_area->style->black_gc,
FALSE,
u_data->io->rect_x_min, u_data->io->rect_y_min,
@@ -996,8 +996,8 @@ on_button_release (GtkWidget *widget _U_, GdkEventButton *event, struct sctp_uda
u_data->io->draw_area->allocation.width,
u_data->io->draw_area->allocation.height);
- x1_tmp=floor(u_data->io->min_x+((u_data->io->x_old-LEFT_BORDER-u_data->io->offset)*u_data->io->tmp_width/u_data->io->axis_width));
- x2_tmp=floor(u_data->io->min_x+((event->x-LEFT_BORDER-u_data->io->offset)*u_data->io->tmp_width/u_data->io->axis_width));
+ x1_tmp=(guint32) floor(u_data->io->min_x+((u_data->io->x_old-LEFT_BORDER-u_data->io->offset)*u_data->io->tmp_width/u_data->io->axis_width));
+ x2_tmp=(guint32) floor(u_data->io->min_x+((event->x-LEFT_BORDER-u_data->io->offset)*u_data->io->tmp_width/u_data->io->axis_width));
helpx=MIN(x1_tmp, x2_tmp);
if (helpx==x2_tmp)
{
@@ -1060,13 +1060,13 @@ on_button_release (GtkWidget *widget _U_, GdkEventButton *event, struct sctp_uda
else
{
x_value = ((event->x-LEFT_BORDER-u_data->io->offset) * ((u_data->io->x2_tmp_sec+u_data->io->x2_tmp_usec/1000000.0)-(u_data->io->x1_tmp_sec+u_data->io->x1_tmp_usec/1000000.0)) / (u_data->io->pixmap_width-LEFT_BORDER-u_data->io->offset))+u_data->io->x1_tmp_sec+u_data->io->x1_tmp_usec/1000000.0;
- y_value = floor((u_data->io->pixmap_height-BOTTOM_BORDER-u_data->io->offset-event->y) * (max_tsn - min_tsn) / (u_data->io->pixmap_height-BOTTOM_BORDER-u_data->io->offset)) + min_tsn;
+ y_value = (guint32) floor((u_data->io->pixmap_height-BOTTOM_BORDER-u_data->io->offset-event->y) * (max_tsn - min_tsn) / (u_data->io->pixmap_height-BOTTOM_BORDER-u_data->io->offset)) + min_tsn;
text_color = u_data->io->draw_area->style->black_gc;
g_snprintf(label_string, 30, "(%.6f, %u)", x_value, y_value);
label_set = TRUE;
- gdk_draw_line(u_data->io->pixmap,text_color, event->x-2, event->y, event->x+2, event->y);
- gdk_draw_line(u_data->io->pixmap,text_color, event->x, event->y-2, event->x, event->y+2);
+ gdk_draw_line(u_data->io->pixmap,text_color, (gint)(event->x-2), (gint)(event->y), (gint)(event->x+2), (gint)(event->y));
+ gdk_draw_line(u_data->io->pixmap,text_color, (gint)(event->x), (gint)(event->y-2), (gint)(event->x), (gint)(event->y+2));
if (event->x+150>=u_data->io->pixmap_width)
position = event->x - 150;
else
@@ -1075,8 +1075,8 @@ on_button_release (GtkWidget *widget _U_, GdkEventButton *event, struct sctp_uda
#if GTK_MAJOR_VERSION < 2
lwidth=gdk_string_width(font, label_string);
gdk_draw_string(u_data->io->pixmap,font,text_color,
- position,
- event->y-10,
+ (gint)(position),
+ (gint)(event->y-10),
label_string);
#else
memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), 15);
@@ -1084,10 +1084,10 @@ on_button_release (GtkWidget *widget _U_, GdkEventButton *event, struct sctp_uda
pango_layout_get_pixel_size(layout, &lwidth, NULL);
gdk_draw_layout(u_data->io->pixmap,text_color,
- position,
- event->y-10,
+ (gint)(position),
+ (gint)(event->y-10),
layout);
- #endif
+#endif
ios=(sctp_graph_t *)OBJECT_GET_DATA(u_data->io->draw_area, "sctp_graph_t");
if(!ios){
diff --git a/gtk/sctp_graph_dlg.c b/gtk/sctp_graph_dlg.c
index cfe547f039..1e3ff9a1d5 100644
--- a/gtk/sctp_graph_dlg.c
+++ b/gtk/sctp_graph_dlg.c
@@ -363,8 +363,8 @@ static void sctp_graph_draw(struct sctp_udata *u_data)
}
else
{
- u_data->io->min_x=u_data->io->x1_tmp_sec*1000000.0+u_data->io->x1_tmp_usec;
- u_data->io->max_x=u_data->io->x2_tmp_sec*1000000.0+u_data->io->x2_tmp_usec;
+ u_data->io->min_x=((guint32)(u_data->io->x1_tmp_sec*1000000.0))+u_data->io->x1_tmp_usec;
+ u_data->io->max_x=((guint32)(u_data->io->x2_tmp_sec*1000000.0))+u_data->io->x2_tmp_usec;
u_data->io->uoff = FALSE;
}
@@ -946,10 +946,10 @@ on_button_press (GtkWidget *widget _U_, GdkEventButton *event, struct sctp_udata
{
gdk_draw_rectangle(u_data->io->pixmap,u_data->io->draw_area->style->white_gc,
FALSE,
- floor(MIN(u_data->io->x_old,u_data->io->x_new)),
- floor(MIN(u_data->io->y_old,u_data->io->y_new)),
- floor(abs((long)(u_data->io->x_new-u_data->io->x_old))),
- floor(abs((long)(u_data->io->y_new-u_data->io->y_old))));
+ (gint) floor(MIN(u_data->io->x_old,u_data->io->x_new)),
+ (gint) floor(MIN(u_data->io->y_old,u_data->io->y_new)),
+ (gint) floor(abs((long)(u_data->io->x_new-u_data->io->x_old))),
+ (gint) floor(abs((long)(u_data->io->y_new-u_data->io->y_old))));
ios=(sctp_graph_t *)OBJECT_GET_DATA(u_data->io->draw_area, "sctp_graph_t");
if(!ios){
@@ -1014,10 +1014,10 @@ on_button_release (GtkWidget *widget _U_, GdkEventButton *event, struct sctp_uda
event->x = LEFT_BORDER+u_data->io->offset;
if (abs((long)(event->x-u_data->io->x_old))>10 || abs((long)(event->y-u_data->io->y_old))>10)
{
- u_data->io->rect_x_min = floor(MIN(u_data->io->x_old,event->x));
- u_data->io->rect_x_max = ceil(MAX(u_data->io->x_old,event->x));
- u_data->io->rect_y_min = floor(MIN(u_data->io->y_old,event->y));
- u_data->io->rect_y_max = ceil(MAX(u_data->io->y_old,event->y))+POINT_SIZE;
+ u_data->io->rect_x_min = (gint) floor(MIN(u_data->io->x_old,event->x));
+ u_data->io->rect_x_max = (gint) ceil(MAX(u_data->io->x_old,event->x));
+ u_data->io->rect_y_min = (gint) floor(MIN(u_data->io->y_old,event->y));
+ u_data->io->rect_y_max = (gint) ceil(MAX(u_data->io->y_old,event->y))+POINT_SIZE;
gdk_draw_rectangle(u_data->io->pixmap,u_data->io->draw_area->style->black_gc,
FALSE,
u_data->io->rect_x_min, u_data->io->rect_y_min,
@@ -1037,8 +1037,8 @@ on_button_release (GtkWidget *widget _U_, GdkEventButton *event, struct sctp_uda
u_data->io->draw_area->allocation.width,
u_data->io->draw_area->allocation.height);
- x1_tmp=floor(u_data->io->min_x+((u_data->io->x_old-LEFT_BORDER-u_data->io->offset)*u_data->io->tmp_width/u_data->io->axis_width));
- x2_tmp=floor(u_data->io->min_x+((event->x-LEFT_BORDER-u_data->io->offset)*u_data->io->tmp_width/u_data->io->axis_width));
+ x1_tmp=(gint) floor(u_data->io->min_x+((u_data->io->x_old-LEFT_BORDER-u_data->io->offset)*u_data->io->tmp_width/u_data->io->axis_width));
+ x2_tmp=(gint) floor(u_data->io->min_x+((event->x-LEFT_BORDER-u_data->io->offset)*u_data->io->tmp_width/u_data->io->axis_width));
helpx=MIN(x1_tmp, x2_tmp);
if (helpx==x2_tmp)
{
@@ -1101,13 +1101,13 @@ on_button_release (GtkWidget *widget _U_, GdkEventButton *event, struct sctp_uda
else
{
x_value = ((event->x-LEFT_BORDER-u_data->io->offset) * ((u_data->io->x2_tmp_sec+u_data->io->x2_tmp_usec/1000000.0)-(u_data->io->x1_tmp_sec+u_data->io->x1_tmp_usec/1000000.0)) / (u_data->io->pixmap_width-LEFT_BORDER-u_data->io->offset))+u_data->io->x1_tmp_sec+u_data->io->x1_tmp_usec/1000000.0;
- y_value = floor((u_data->io->pixmap_height-BOTTOM_BORDER-u_data->io->offset-event->y) * (max_tsn - min_tsn) / (u_data->io->pixmap_height-BOTTOM_BORDER-u_data->io->offset)) + min_tsn;
+ y_value = (gint) floor((u_data->io->pixmap_height-BOTTOM_BORDER-u_data->io->offset-event->y) * (max_tsn - min_tsn) / (u_data->io->pixmap_height-BOTTOM_BORDER-u_data->io->offset)) + min_tsn;
text_color = u_data->io->draw_area->style->black_gc;
g_snprintf(label_string, 30, "(%.6f, %u)", x_value, y_value);
label_set = TRUE;
- gdk_draw_line(u_data->io->pixmap,text_color, event->x-2, event->y, event->x+2, event->y);
- gdk_draw_line(u_data->io->pixmap,text_color, event->x, event->y-2, event->x, event->y+2);
+ gdk_draw_line(u_data->io->pixmap,text_color, (gint)(event->x-2), (gint)(event->y), (gint)(event->x+2), (gint)(event->y));
+ gdk_draw_line(u_data->io->pixmap,text_color, (gint)(event->x), (gint)(event->y-2), (gint)(event->x), (gint)(event->y+2));
if (event->x+150>=u_data->io->pixmap_width)
position = event->x - 150;
else
@@ -1116,8 +1116,8 @@ on_button_release (GtkWidget *widget _U_, GdkEventButton *event, struct sctp_uda
#if GTK_MAJOR_VERSION < 2
lwidth=gdk_string_width(font, label_string);
gdk_draw_string(u_data->io->pixmap,font,text_color,
- position,
- event->y-10,
+ (gint) (position),
+ (gint) (event->y-10),
label_string);
#else
memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), 15);
@@ -1125,10 +1125,10 @@ on_button_release (GtkWidget *widget _U_, GdkEventButton *event, struct sctp_uda
pango_layout_get_pixel_size(layout, &lwidth, NULL);
gdk_draw_layout(u_data->io->pixmap,text_color,
- position,
- event->y-10,
+ (gint) (position),
+ (gint) (event->y-10),
layout);
- #endif
+#endif
ios=(sctp_graph_t *)OBJECT_GET_DATA(u_data->io->draw_area, "sctp_graph_t");
if(!ios){
diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index 3be6140edf..0d231e75c7 100644
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -1747,9 +1747,9 @@ tapall_tcpip_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, cons
ts->direction)) {
segment->next = NULL;
segment->num = pinfo->fd->num;
- segment->rel_secs = pinfo->fd->rel_ts.secs;
+ segment->rel_secs = (guint32) pinfo->fd->rel_ts.secs;
segment->rel_usecs = pinfo->fd->rel_ts.nsecs/1000;
- segment->abs_secs = pinfo->fd->abs_ts.secs;
+ segment->abs_secs = (guint32) pinfo->fd->abs_ts.secs;
segment->abs_usecs = pinfo->fd->abs_ts.nsecs/1000;
segment->th_seq=tcphdr->th_seq;
segment->th_ack=tcphdr->th_ack;
@@ -1898,9 +1898,9 @@ static struct tcpheader *select_tcpip_session (capture_file *cf, struct segment
}
hdrs->num = fdata->num;
- hdrs->rel_secs = fdata->rel_ts.secs;
+ hdrs->rel_secs = (guint32) fdata->rel_ts.secs;
hdrs->rel_usecs = fdata->rel_ts.nsecs/1000;
- hdrs->abs_secs = fdata->abs_ts.secs;
+ hdrs->abs_secs = (guint32) fdata->abs_ts.secs;
hdrs->abs_usecs = fdata->abs_ts.nsecs/1000;
hdrs->th_seq=th.tcphdr->th_seq;
hdrs->th_ack=th.tcphdr->th_ack;
diff --git a/gtk/voip_calls.c b/gtk/voip_calls.c
index 31765c1542..168ee9654a 100644
--- a/gtk/voip_calls.c
+++ b/gtk/voip_calls.c
@@ -530,7 +530,7 @@ RTP_packet( void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, void con
if (!strinfo->pt_str) strinfo->pt_str = g_strdup(val_to_str(strinfo->pt, rtp_payload_type_short_vals, "%u"));
strinfo->npackets = 0;
strinfo->first_frame_num = pinfo->fd->num;
- strinfo->start_rel_sec = pinfo->fd->rel_ts.secs;
+ strinfo->start_rel_sec = (guint32) (pinfo->fd->rel_ts.secs);
strinfo->start_rel_usec = pinfo->fd->rel_ts.nsecs/1000;
strinfo->setup_frame_number = pi->info_setup_frame_num;
strinfo->rtp_event = -1;
@@ -540,7 +540,7 @@ RTP_packet( void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, void con
if (strinfo!=NULL){
/* Add the info to the existing RTP stream */
strinfo->npackets++;
- strinfo->stop_rel_sec = pinfo->fd->rel_ts.secs;
+ strinfo->stop_rel_sec = (guint32) (pinfo->fd->rel_ts.secs);
strinfo->stop_rel_usec = pinfo->fd->rel_ts.nsecs/1000;
/* process RTP Event */
@@ -738,7 +738,7 @@ T38_packet( void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const vo
COPY_ADDRESS(&(strinfo->initial_speaker),&(pinfo->src));
strinfo->first_frame_num=pinfo->fd->num;
strinfo->selected=FALSE;
- strinfo->start_sec=pinfo->fd->rel_ts.secs;
+ strinfo->start_sec=(gint32) (pinfo->fd->rel_ts.secs);
strinfo->start_usec=pinfo->fd->rel_ts.nsecs/1000;
strinfo->protocol=MEDIA_T38;
strinfo->prot_info=NULL;
@@ -902,7 +902,7 @@ SIPcalls_packet( void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, con
COPY_ADDRESS(&(strinfo->initial_speaker),&(pinfo->src));
strinfo->first_frame_num=pinfo->fd->num;
strinfo->selected=FALSE;
- strinfo->start_sec=pinfo->fd->rel_ts.secs;
+ strinfo->start_sec=(gint32) (pinfo->fd->rel_ts.secs);
strinfo->start_usec=pinfo->fd->rel_ts.nsecs/1000;
strinfo->protocol=VOIP_SIP;
strinfo->prot_info=g_malloc(sizeof(sip_calls_info_t));
@@ -968,7 +968,7 @@ SIPcalls_packet( void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, con
}
}
- strinfo->stop_sec=pinfo->fd->rel_ts.secs;
+ strinfo->stop_sec=(gint32) (pinfo->fd->rel_ts.secs);
strinfo->stop_usec=pinfo->fd->rel_ts.nsecs/1000;
strinfo->last_frame_num=pinfo->fd->num;
++(strinfo->npackets);
@@ -1123,7 +1123,7 @@ isup_calls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, co
COPY_ADDRESS(&(strinfo->initial_speaker),&(pinfo->src));
strinfo->selected=FALSE;
strinfo->first_frame_num=pinfo->fd->num;
- strinfo->start_sec=pinfo->fd->rel_ts.secs;
+ strinfo->start_sec=(gint32) (pinfo->fd->rel_ts.secs);
strinfo->start_usec=pinfo->fd->rel_ts.nsecs/1000;
strinfo->protocol=VOIP_ISUP;
if (pi->calling_number!=NULL){
@@ -1146,7 +1146,7 @@ isup_calls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, co
if (strinfo!=NULL){
- strinfo->stop_sec=pinfo->fd->rel_ts.secs;
+ strinfo->stop_sec=(gint32) (pinfo->fd->rel_ts.secs);
strinfo->stop_usec=pinfo->fd->rel_ts.nsecs/1000;
strinfo->last_frame_num=pinfo->fd->num;
++(strinfo->npackets);
@@ -1572,7 +1572,7 @@ q931_calls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, co
COPY_ADDRESS(&(strinfo->initial_speaker),actrace_direction?&pstn_add:&(pinfo->src));
strinfo->first_frame_num=pinfo->fd->num;
strinfo->selected=FALSE;
- strinfo->start_sec=pinfo->fd->rel_ts.secs;
+ strinfo->start_sec=(gint32) (pinfo->fd->rel_ts.secs);
strinfo->start_usec=pinfo->fd->rel_ts.nsecs/1000;
strinfo->protocol=VOIP_AC_ISDN;
strinfo->prot_info=g_malloc(sizeof(actrace_isdn_calls_info_t));
@@ -1585,7 +1585,7 @@ q931_calls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, co
tapinfo->strinfo_list = g_list_append(tapinfo->strinfo_list, strinfo);
}
- strinfo->stop_sec=pinfo->fd->rel_ts.secs;
+ strinfo->stop_sec=(gint32) (pinfo->fd->rel_ts.secs);
strinfo->stop_usec=pinfo->fd->rel_ts.nsecs/1000;
strinfo->last_frame_num=pinfo->fd->num;
++(strinfo->npackets);
@@ -1785,7 +1785,7 @@ H225calls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, con
COPY_ADDRESS(&(strinfo->initial_speaker),&(pinfo->src));
strinfo->selected=FALSE;
strinfo->first_frame_num=pinfo->fd->num;
- strinfo->start_sec=pinfo->fd->rel_ts.secs;
+ strinfo->start_sec=(gint32) (pinfo->fd->rel_ts.secs);
strinfo->start_usec=pinfo->fd->rel_ts.nsecs/1000;
strinfo->protocol=VOIP_H323;
strinfo->prot_info=g_malloc(sizeof(h323_calls_info_t));
@@ -1820,7 +1820,7 @@ H225calls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, con
COPY_ADDRESS(&(tmp_src),&(pinfo->src));
COPY_ADDRESS(&(tmp_dst),&(pinfo->dst));
- strinfo->stop_sec=pinfo->fd->rel_ts.secs;
+ strinfo->stop_sec=(gint32) (pinfo->fd->rel_ts.secs);
strinfo->stop_usec=pinfo->fd->rel_ts.nsecs/1000;
strinfo->last_frame_num=pinfo->fd->num;
++(strinfo->npackets);
@@ -2433,7 +2433,7 @@ MGCPcalls_packet( void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, co
COPY_ADDRESS(&(strinfo->initial_speaker),&(pinfo->src));
strinfo->first_frame_num=pinfo->fd->num;
strinfo->selected=FALSE;
- strinfo->start_sec=pinfo->fd->rel_ts.secs;
+ strinfo->start_sec=(gint32) (pinfo->fd->rel_ts.secs);
strinfo->start_usec=pinfo->fd->rel_ts.nsecs/1000;
strinfo->protocol=VOIP_MGCP;
strinfo->prot_info=g_malloc(sizeof(mgcp_calls_info_t));
@@ -2521,7 +2521,7 @@ MGCPcalls_packet( void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, co
comment = g_strdup_printf("MGCP %s %s%s", tmp_mgcpinfo->endpointId, (pi->mgcp_type == MGCP_REQUEST)?"Request":"Response", pi->is_duplicate?" Duplicate":"");
- strinfo->stop_sec=pinfo->fd->rel_ts.secs;
+ strinfo->stop_sec=(gint32) (pinfo->fd->rel_ts.secs);
strinfo->stop_usec=pinfo->fd->rel_ts.nsecs/1000;
strinfo->last_frame_num=pinfo->fd->num;
++(strinfo->npackets);
@@ -2639,7 +2639,7 @@ ACTRACEcalls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_,
COPY_ADDRESS(&(strinfo->initial_speaker),actrace_direction?&pstn_add:&(pinfo->src));
strinfo->first_frame_num=pinfo->fd->num;
strinfo->selected=FALSE;
- strinfo->start_sec=pinfo->fd->rel_ts.secs;
+ strinfo->start_sec=(gint32) (pinfo->fd->rel_ts.secs);
strinfo->start_usec=pinfo->fd->rel_ts.nsecs/1000;
strinfo->protocol=VOIP_AC_CAS;
strinfo->prot_info=g_malloc(sizeof(actrace_cas_calls_info_t));
@@ -2653,7 +2653,7 @@ ACTRACEcalls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_,
tapinfo->strinfo_list = g_list_append(tapinfo->strinfo_list, strinfo);
}
- strinfo->stop_sec=pinfo->fd->rel_ts.secs;
+ strinfo->stop_sec=(gint32) (pinfo->fd->rel_ts.secs);
strinfo->stop_usec=pinfo->fd->rel_ts.nsecs/1000;
strinfo->last_frame_num=pinfo->fd->num;
++(strinfo->npackets);
@@ -2788,9 +2788,9 @@ static int h248_calls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *
strinfo->protocol = TEL_H248;
strinfo->call_num = tapinfo->ncalls++;
- strinfo->start_sec=pinfo->fd->rel_ts.secs;
+ strinfo->start_sec=(gint32) (pinfo->fd->rel_ts.secs);
strinfo->start_usec=pinfo->fd->rel_ts.nsecs;
- strinfo->stop_sec=pinfo->fd->rel_ts.secs;
+ strinfo->stop_sec=(gint32) (pinfo->fd->rel_ts.secs);
strinfo->stop_usec=pinfo->fd->rel_ts.nsecs;
strinfo->selected = FALSE;
@@ -2817,7 +2817,7 @@ static int h248_calls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *
strinfo->to_identity = s->str;
g_string_free(s,FALSE);
- strinfo->stop_sec=pinfo->fd->rel_ts.secs;
+ strinfo->stop_sec=(gint32) (pinfo->fd->rel_ts.secs);
strinfo->stop_usec=pinfo->fd->rel_ts.nsecs;
strinfo->last_frame_num=pinfo->fd->num;
++(strinfo->npackets);