diff options
| author | Bill Meier <wmeier@newsguy.com> | 2012-12-05 15:56:36 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2012-12-05 15:56:36 +0000 |
| commit | 7cd0417af555a78b19c6909a40d1867e0fe9a063 (patch) | |
| tree | cc09f739029479eee683f26228e098db307fd1aa /epan/dissectors/packet-dmp.c | |
| parent | f8ba6b5a077fa89f1d1e55b5bed4bab0ea6b11cf (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 'epan/dissectors/packet-dmp.c')
| -rw-r--r-- | epan/dissectors/packet-dmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c index 3495485d9a..959e3a8430 100644 --- a/epan/dissectors/packet-dmp.c +++ b/epan/dissectors/packet-dmp.c @@ -1693,8 +1693,8 @@ static gchar *dissect_thales_ipm_id (tvbuff_t *tvb, gint offset, gint length, gi if (length >= 6 && length <= 20 && modifier >= 0 && modifier <= 2) { guint number = tvb_get_ntohs (tvb, offset + length - 6); guint8 number_len = modifier + 2; - time_t time = tvb_get_ntohl(tvb, offset + length - 4); - struct tm *tmp = gmtime(&time); + time_t timev = tvb_get_ntohl(tvb, offset + length - 4); + struct tm *tmp = gmtime(&timev); if (modifier == 1 && number >= 1024) { /* The number is in the range 65536-99999 */ |