From 5e70b3280d182933d96b7bd3c0e91765c9bd78cd Mon Sep 17 00:00:00 2001 From: Joe Hershberger Date: Wed, 8 Apr 2015 01:41:02 -0500 Subject: [PATCH] net: cosmetic: Fixup var names related to boot file The variables around the bootfile were inconsistent and used CamelCase. Update them to make the code more readable. Signed-off-by: Joe Hershberger Acked-by: Simon Glass --- common/update.c | 7 ++++--- net/bootme.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/update.c b/common/update.c index cc830a7865..bc0c48f29c 100644 --- a/common/update.c +++ b/common/update.c @@ -58,7 +58,7 @@ static int update_load(char *filename, ulong msec_max, int cnt_max, ulong addr) saved_timeout_msecs = TftpRRQTimeoutMSecs; saved_timeout_count = TftpRRQTimeoutCountMax; saved_netretry = strdup(getenv("netretry")); - saved_bootfile = strdup(BootFile); + saved_bootfile = strdup(net_boot_file_name); /* set timeouts for auto-update */ TftpRRQTimeoutMSecs = msec_max; @@ -69,7 +69,7 @@ static int update_load(char *filename, ulong msec_max, int cnt_max, ulong addr) /* download the update file */ load_addr = addr; - copy_filename(BootFile, filename, sizeof(BootFile)); + copy_filename(net_boot_file_name, filename, sizeof(net_boot_file_name)); size = NetLoop(TFTPGET); if (size < 0) @@ -86,7 +86,8 @@ static int update_load(char *filename, ulong msec_max, int cnt_max, ulong addr) free(saved_netretry); if (saved_bootfile != NULL) { - copy_filename(BootFile, saved_bootfile, sizeof(BootFile)); + copy_filename(net_boot_file_name, saved_bootfile, + sizeof(net_boot_file_name)); free(saved_bootfile); } diff --git a/net/bootme.c b/net/bootme.c index 29f86d3dde..7ac7c3932a 100644 --- a/net/bootme.c +++ b/net/bootme.c @@ -225,7 +225,7 @@ static void bootme_handler(uchar *pkt, unsigned dest_port, struct in_addr src_ip case BOOTME_DOWNLOAD: if (last_state != BOOTME_INIT) - NetBootFileXferSize += len - 4; + net_boot_file_size += len - 4; /* fallthru */ case BOOTME_DEBUG: if (last_state == BOOTME_INIT || -- 2.39.2