aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk/sctp_graph_dlg.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2012-12-05 15:56:36 +0000
committerBill Meier <wmeier@newsguy.com>2012-12-05 15:56:36 +0000
commit7cd0417af555a78b19c6909a40d1867e0fe9a063 (patch)
treecc09f739029479eee683f26228e098db307fd1aa /ui/gtk/sctp_graph_dlg.c
parentf8ba6b5a077fa89f1d1e55b5bed4bab0ea6b11cf (diff)
Fix numerous instances of a variable/parameter name "shadowing" a library function name;
(At least some (gcc ?) compilers give a "shadow" warning for these). svn path=/trunk/; revision=46402
Diffstat (limited to 'ui/gtk/sctp_graph_dlg.c')
-rw-r--r--ui/gtk/sctp_graph_dlg.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/gtk/sctp_graph_dlg.c b/ui/gtk/sctp_graph_dlg.c
index d51f904444..566b320791 100644
--- a/ui/gtk/sctp_graph_dlg.c
+++ b/ui/gtk/sctp_graph_dlg.c
@@ -144,7 +144,7 @@ draw_sack_graph(struct sctp_udata *u_data)
GList *list=NULL, *tlist;
guint16 gap_start=0, gap_end=0, i, j, nr, dup_nr;
guint8 type;
- guint32 tsnumber, dup;
+ guint32 tsnumber, dupx;
gint xvalue, yvalue;
GdkColor red_color = {0, 65535, 0, 0};
GdkColor green_color = {0, 0, 65535, 0};
@@ -282,15 +282,15 @@ draw_sack_graph(struct sctp_udata *u_data)
dup_list = &sack_header->a_rwnd + 2 + nr;
for (i = 0; i < dup_nr; i++)
{
- dup = g_ntohl(dup_list[i]);
- if (dup >= min_tsn)
+ dupx = g_ntohl(dup_list[i]);
+ if (dupx >= min_tsn)
{
if (u_data->io->uoff)
diff = sack->secs - u_data->io->min_x;
else
diff=sack->secs*1000000+sack->usecs-u_data->io->min_x;
xvalue = (guint32)(LEFT_BORDER+u_data->io->offset+u_data->io->x_interval*diff);
- yvalue = (guint32)(u_data->io->surface_height-BOTTOM_BORDER-POINT_SIZE -u_data->io->offset-((SUB_32(dup,min_tsn))*u_data->io->y_interval));
+ yvalue = (guint32)(u_data->io->surface_height-BOTTOM_BORDER-POINT_SIZE -u_data->io->offset-((SUB_32(dupx,min_tsn))*u_data->io->y_interval));
if (xvalue >= LEFT_BORDER+u_data->io->offset &&
xvalue <= u_data->io->surface_width-RIGHT_BORDER+u_data->io->offset &&
yvalue >= TOP_BORDER-u_data->io->offset-POINT_SIZE &&