diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-06-27 16:15:30 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-06-27 16:15:30 +0000 |
| commit | 3e575defe1939ae362f052849af77ef353289638 (patch) | |
| tree | 4085507410fd9cdbc670acc4969542f1f47d2fb4 /epan/dissectors/packet-dhcp-failover.c | |
| parent | fa010b26528445f8aac4c58dc77f0e125d63d024 (diff) | |
Fix some warnings reported by gcc -Wshadow ...
Fix some spacing in packet-dcom.c
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25618 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-dhcp-failover.c')
| -rw-r--r-- | epan/dissectors/packet-dhcp-failover.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c index 03b37ab4d9..f2d7d8a8e5 100644 --- a/epan/dissectors/packet-dhcp-failover.c +++ b/epan/dissectors/packet-dhcp-failover.c @@ -357,7 +357,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int poffset; guint32 xid; const gchar *tls_request_string; - nstime_t time; + nstime_t timex; guint32 lease_expiration_time, grace_expiration_time; guint32 potential_expiration_time, client_last_transaction_time; guint32 start_time_of_state; @@ -447,11 +447,11 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * Also, we need a way to keep from displaying nanoseconds, * so as not to make it look as if it has higher */ - time.secs = tvb_get_ntohl(tvb, offset); - time.nsecs = 0; + timex.secs = tvb_get_ntohl(tvb, offset); + timex.nsecs = 0; proto_tree_add_time_format_value(dhcpfo_tree, hf_dhcpfo_time, tvb, - offset, 4, &time, "%s", - abs_time_secs_to_str(time.secs)); + offset, 4, &timex, "%s", + abs_time_secs_to_str(timex.secs)); } offset += 4; |