diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2008-06-23 21:36:22 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2008-06-23 21:36:22 +0000 |
commit | f00cd871fe6842b8e481c71d0a29fe429927802b (patch) | |
tree | 08da2ad3bb311e30f52cef5779187beb5571b497 /epan | |
parent | cb43c907789ba41801fb7b4a2bccf856632f3f07 (diff) |
Renamed a local variable to avoid name collisions.
svn path=/trunk/; revision=25562
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-bthci_cmd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index c090c5ad52..ed4df5f233 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -942,7 +942,7 @@ static void dissect_link_control_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint16 cmd_ocf) { proto_item *item; - guint32 clock; + guint32 clock_value; switch(cmd_ocf) { case 0x0001: /* Inquiry */ @@ -999,8 +999,8 @@ dissect_link_control_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot offset++; item = proto_tree_add_item(tree, hf_bthci_cmd_clock_offset, tvb, offset, 2, TRUE); - clock = tvb_get_letohs(tvb, 13) & 32767; /* only bit0-14 are valid */ - proto_item_append_text(item, " (%g ms)", 1.25*clock); + clock_value = tvb_get_letohs(tvb, 13) & 32767; /* only bit0-14 are valid */ + proto_item_append_text(item, " (%g ms)", 1.25*clock_value); proto_tree_add_item(tree, hf_bthci_cmd_clock_offset_valid , tvb, offset, 2, TRUE); offset+=2; @@ -1111,8 +1111,8 @@ dissect_link_control_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot offset++; item = proto_tree_add_item(tree, hf_bthci_cmd_clock_offset, tvb, offset, 2, TRUE); - clock = tvb_get_letohs(tvb, offset) & 32767; /* only bit0-14 are valid */ - proto_item_append_text(item, " (%g ms)", 1.25*clock); + clock_value = tvb_get_letohs(tvb, offset) & 32767; /* only bit0-14 are valid */ + proto_item_append_text(item, " (%g ms)", 1.25*clock_value); proto_tree_add_item(tree, hf_bthci_cmd_clock_offset_valid , tvb, offset, 2, TRUE); offset+=2; break; |