diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-01-29 19:09:01 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-01-29 19:09:01 +0000 |
| commit | 07309de36be3a07d46f4123d2a5d8ce6ce74d625 (patch) | |
| tree | 25046d3a1f535bc9ac27ed8e266972e9a4f7c9cc /gtk/mcast_stream.c | |
| parent | cdd28bc87faafa33015551cf4c75cf1556ff5eed (diff) | |
Fix various gcc -Wshadow warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31731 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk/mcast_stream.c')
| -rw-r--r-- | gtk/mcast_stream.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/mcast_stream.c b/gtk/mcast_stream.c index 1d7929443b..7e195c6133 100644 --- a/gtk/mcast_stream.c +++ b/gtk/mcast_stream.c @@ -359,8 +359,8 @@ register_tap_listener_mcast_stream(void) /* sliding window and buffer calculations */ /* compare two times */ -guint16 comparetimes(struct timeval *t1, struct timeval *t2, guint16 burstint){ - if(((t2->tv_sec - t1->tv_sec)*1000 + (t2->tv_usec - t1->tv_usec)/1000) > burstint){ +guint16 comparetimes(struct timeval *t1, struct timeval *t2, guint16 burstint_lcl){ + if(((t2->tv_sec - t1->tv_sec)*1000 + (t2->tv_usec - t1->tv_usec)/1000) > burstint_lcl){ return 1; } else{ return 0; @@ -368,7 +368,7 @@ guint16 comparetimes(struct timeval *t1, struct timeval *t2, guint16 burstint){ } /* calculate buffer usage */ -void buffusagecalc(mcast_stream_info_t *strinfo, packet_info *pinfo, double emptyspeed) +void buffusagecalc(mcast_stream_info_t *strinfo, packet_info *pinfo, double emptyspeed_lcl) { gint32 sec=0, usec=0, cur, prev; struct timeval *buffer; @@ -395,7 +395,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-= (guint32) (timeelapsed * emptyspeed / 8); + strinfo->element.buffusage-= (guint32) (timeelapsed * emptyspeed_lcl / 8); if(strinfo->element.buffusage < 0) strinfo->element.buffusage=0; if(strinfo->element.buffusage > strinfo->element.topbuffusage) |