diff mbox

[10/10] uefi: uefidump: fix shadowing of variable 'i'

Message ID 1402596229-461-10-git-send-email-colin.king@canonical.com
State Accepted
Headers show

Commit Message

Colin Ian King June 12, 2014, 6:03 p.m. UTC 
From: Colin Ian King <colin.king@canonical.com>

variable 'i' was being shadowed, so rename the inner scoped
one to iv2 (that is, ipv4 v2) just to avoid any confusion

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 src/uefi/uefidump/uefidump.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

Comments

Alex Hung July 11, 2014, 7:49 a.m. UTC | #1 
On 06/13/2014 02:03 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> variable 'i' was being shadowed, so rename the inner scoped
> one to iv2 (that is, ipv4 v2) just to avoid any confusion
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   src/uefi/uefidump/uefidump.c | 22 +++++++++++-----------
>   1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/src/uefi/uefidump/uefidump.c b/src/uefi/uefidump/uefidump.c
> index 61e8b7c..1cad63a 100644
> --- a/src/uefi/uefidump/uefidump.c
> +++ b/src/uefi/uefidump/uefidump.c
> @@ -286,14 +286,14 @@ static char *uefidump_build_dev_path(char *path, fwts_uefi_dev_path *dev_path, c
>   					i->local_port, i->remote_port,
>   					i->protocol, i->static_ip_address);
>   				if (len >= sizeof(fwts_uefi_ipv4_dev_path_v2) && dev_path_len >= sizeof(fwts_uefi_ipv4_dev_path_v2)) {
> -					fwts_uefi_ipv4_dev_path_v2 *i = (fwts_uefi_ipv4_dev_path_v2 *)dev_path;
> +					fwts_uefi_ipv4_dev_path_v2 *iv2 = (fwts_uefi_ipv4_dev_path_v2 *)dev_path;
>   					path = uefidump_vprintf(path,
>   						",%" PRIu8 ".%" PRIu8 ".%" PRIu8 ".%" PRIu8 ","
>   						"%" PRIu8 ".%" PRIu8 ".%" PRIu8 ".%" PRIu8 ,
> -						i->gateway_ip_addr[0], i->gateway_ip_addr[1],
> -						i->gateway_ip_addr[2], i->gateway_ip_addr[3],
> -						i->subnet_mask[0], i->subnet_mask[1],
> -						i->subnet_mask[2], i->subnet_mask[3]);
> +						iv2->gateway_ip_addr[0], iv2->gateway_ip_addr[1],
> +						iv2->gateway_ip_addr[2], iv2->gateway_ip_addr[3],
> +						iv2->subnet_mask[0], iv2->subnet_mask[1],
> +						iv2->subnet_mask[2], iv2->subnet_mask[3]);
>   				}
>   				path = uefidump_vprintf(path, ")");
>   			}
> @@ -319,16 +319,16 @@ static char *uefidump_build_dev_path(char *path, fwts_uefi_dev_path *dev_path, c
>   					i->local_port, i->remote_port,
>   					i->protocol, i->static_ip_address);
>   				if (len >= sizeof(fwts_uefi_ipv6_dev_path_v2) && dev_path_len >= sizeof(fwts_uefi_ipv6_dev_path_v2)) {
> -					fwts_uefi_ipv6_dev_path_v2 *i = (fwts_uefi_ipv6_dev_path_v2 *)dev_path;
> +					fwts_uefi_ipv6_dev_path_v2 *iv2 = (fwts_uefi_ipv6_dev_path_v2 *)dev_path;
>   					path = uefidump_vprintf(path,
>   					",%" PRIu8 ","
>   					"%" PRIx16 ":%" PRIx16 ":%" PRIx16 ":%" PRIx16
>   					":%" PRIx16 ":%" PRIx16 ":%" PRIx16 ":%" PRIx16,
> -					i->prefix_length,
> -					i->gateway_ip_addr[0], i->gateway_ip_addr[1],
> -					i->gateway_ip_addr[2], i->gateway_ip_addr[3],
> -					i->gateway_ip_addr[4], i->gateway_ip_addr[5],
> -					i->gateway_ip_addr[6], i->gateway_ip_addr[7]);
> +					iv2->prefix_length,
> +					iv2->gateway_ip_addr[0], iv2->gateway_ip_addr[1],
> +					iv2->gateway_ip_addr[2], iv2->gateway_ip_addr[3],
> +					iv2->gateway_ip_addr[4], iv2->gateway_ip_addr[5],
> +					iv2->gateway_ip_addr[6], iv2->gateway_ip_addr[7]);
>   				}
>   				path = uefidump_vprintf(path, ")");
>   			}
>

Acked-by: Alex Hung <alex.hung@canonical.com>
Ivan Hu July 14, 2014, 7:18 a.m. UTC | #2 
On 06/13/2014 02:03 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> variable 'i' was being shadowed, so rename the inner scoped
> one to iv2 (that is, ipv4 v2) just to avoid any confusion
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   src/uefi/uefidump/uefidump.c | 22 +++++++++++-----------
>   1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/src/uefi/uefidump/uefidump.c b/src/uefi/uefidump/uefidump.c
> index 61e8b7c..1cad63a 100644
> --- a/src/uefi/uefidump/uefidump.c
> +++ b/src/uefi/uefidump/uefidump.c
> @@ -286,14 +286,14 @@ static char *uefidump_build_dev_path(char *path, fwts_uefi_dev_path *dev_path, c
>   					i->local_port, i->remote_port,
>   					i->protocol, i->static_ip_address);
>   				if (len >= sizeof(fwts_uefi_ipv4_dev_path_v2) && dev_path_len >= sizeof(fwts_uefi_ipv4_dev_path_v2)) {
> -					fwts_uefi_ipv4_dev_path_v2 *i = (fwts_uefi_ipv4_dev_path_v2 *)dev_path;
> +					fwts_uefi_ipv4_dev_path_v2 *iv2 = (fwts_uefi_ipv4_dev_path_v2 *)dev_path;
>   					path = uefidump_vprintf(path,
>   						",%" PRIu8 ".%" PRIu8 ".%" PRIu8 ".%" PRIu8 ","
>   						"%" PRIu8 ".%" PRIu8 ".%" PRIu8 ".%" PRIu8 ,
> -						i->gateway_ip_addr[0], i->gateway_ip_addr[1],
> -						i->gateway_ip_addr[2], i->gateway_ip_addr[3],
> -						i->subnet_mask[0], i->subnet_mask[1],
> -						i->subnet_mask[2], i->subnet_mask[3]);
> +						iv2->gateway_ip_addr[0], iv2->gateway_ip_addr[1],
> +						iv2->gateway_ip_addr[2], iv2->gateway_ip_addr[3],
> +						iv2->subnet_mask[0], iv2->subnet_mask[1],
> +						iv2->subnet_mask[2], iv2->subnet_mask[3]);
>   				}
>   				path = uefidump_vprintf(path, ")");
>   			}
> @@ -319,16 +319,16 @@ static char *uefidump_build_dev_path(char *path, fwts_uefi_dev_path *dev_path, c
>   					i->local_port, i->remote_port,
>   					i->protocol, i->static_ip_address);
>   				if (len >= sizeof(fwts_uefi_ipv6_dev_path_v2) && dev_path_len >= sizeof(fwts_uefi_ipv6_dev_path_v2)) {
> -					fwts_uefi_ipv6_dev_path_v2 *i = (fwts_uefi_ipv6_dev_path_v2 *)dev_path;
> +					fwts_uefi_ipv6_dev_path_v2 *iv2 = (fwts_uefi_ipv6_dev_path_v2 *)dev_path;
>   					path = uefidump_vprintf(path,
>   					",%" PRIu8 ","
>   					"%" PRIx16 ":%" PRIx16 ":%" PRIx16 ":%" PRIx16
>   					":%" PRIx16 ":%" PRIx16 ":%" PRIx16 ":%" PRIx16,
> -					i->prefix_length,
> -					i->gateway_ip_addr[0], i->gateway_ip_addr[1],
> -					i->gateway_ip_addr[2], i->gateway_ip_addr[3],
> -					i->gateway_ip_addr[4], i->gateway_ip_addr[5],
> -					i->gateway_ip_addr[6], i->gateway_ip_addr[7]);
> +					iv2->prefix_length,
> +					iv2->gateway_ip_addr[0], iv2->gateway_ip_addr[1],
> +					iv2->gateway_ip_addr[2], iv2->gateway_ip_addr[3],
> +					iv2->gateway_ip_addr[4], iv2->gateway_ip_addr[5],
> +					iv2->gateway_ip_addr[6], iv2->gateway_ip_addr[7]);
>   				}
>   				path = uefidump_vprintf(path, ")");
>   			}
>


Acked-by: Ivan Hu <ivan.hu@canonical.com>
diff mbox

Patch

diff --git a/src/uefi/uefidump/uefidump.c b/src/uefi/uefidump/uefidump.c
index 61e8b7c..1cad63a 100644
--- a/src/uefi/uefidump/uefidump.c
+++ b/src/uefi/uefidump/uefidump.c
@@ -286,14 +286,14 @@  static char *uefidump_build_dev_path(char *path, fwts_uefi_dev_path *dev_path, c
 					i->local_port, i->remote_port,
 					i->protocol, i->static_ip_address);
 				if (len >= sizeof(fwts_uefi_ipv4_dev_path_v2) && dev_path_len >= sizeof(fwts_uefi_ipv4_dev_path_v2)) {
-					fwts_uefi_ipv4_dev_path_v2 *i = (fwts_uefi_ipv4_dev_path_v2 *)dev_path;
+					fwts_uefi_ipv4_dev_path_v2 *iv2 = (fwts_uefi_ipv4_dev_path_v2 *)dev_path;
 					path = uefidump_vprintf(path,
 						",%" PRIu8 ".%" PRIu8 ".%" PRIu8 ".%" PRIu8 ","
 						"%" PRIu8 ".%" PRIu8 ".%" PRIu8 ".%" PRIu8 ,
-						i->gateway_ip_addr[0], i->gateway_ip_addr[1],
-						i->gateway_ip_addr[2], i->gateway_ip_addr[3],
-						i->subnet_mask[0], i->subnet_mask[1],
-						i->subnet_mask[2], i->subnet_mask[3]);
+						iv2->gateway_ip_addr[0], iv2->gateway_ip_addr[1],
+						iv2->gateway_ip_addr[2], iv2->gateway_ip_addr[3],
+						iv2->subnet_mask[0], iv2->subnet_mask[1],
+						iv2->subnet_mask[2], iv2->subnet_mask[3]);
 				}
 				path = uefidump_vprintf(path, ")");
 			}
@@ -319,16 +319,16 @@  static char *uefidump_build_dev_path(char *path, fwts_uefi_dev_path *dev_path, c
 					i->local_port, i->remote_port,
 					i->protocol, i->static_ip_address);
 				if (len >= sizeof(fwts_uefi_ipv6_dev_path_v2) && dev_path_len >= sizeof(fwts_uefi_ipv6_dev_path_v2)) {
-					fwts_uefi_ipv6_dev_path_v2 *i = (fwts_uefi_ipv6_dev_path_v2 *)dev_path;
+					fwts_uefi_ipv6_dev_path_v2 *iv2 = (fwts_uefi_ipv6_dev_path_v2 *)dev_path;
 					path = uefidump_vprintf(path,
 					",%" PRIu8 ","
 					"%" PRIx16 ":%" PRIx16 ":%" PRIx16 ":%" PRIx16
 					":%" PRIx16 ":%" PRIx16 ":%" PRIx16 ":%" PRIx16,
-					i->prefix_length,
-					i->gateway_ip_addr[0], i->gateway_ip_addr[1],
-					i->gateway_ip_addr[2], i->gateway_ip_addr[3],
-					i->gateway_ip_addr[4], i->gateway_ip_addr[5],
-					i->gateway_ip_addr[6], i->gateway_ip_addr[7]);
+					iv2->prefix_length,
+					iv2->gateway_ip_addr[0], iv2->gateway_ip_addr[1],
+					iv2->gateway_ip_addr[2], iv2->gateway_ip_addr[3],
+					iv2->gateway_ip_addr[4], iv2->gateway_ip_addr[5],
+					iv2->gateway_ip_addr[6], iv2->gateway_ip_addr[7]);
 				}
 				path = uefidump_vprintf(path, ")");
 			}