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 <joe.hershberger@ni.com>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/common/update.c b/common/update.c
index cc830a78657caaca7341a5c4ca20b06891186721..bc0c48f29c586ef4f50d8d0528b3bc167679ed4b 100644 (file)
--- 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 29f86d3ddea91845b35555c2fefadc28c4d539d7..7ac7c3932a4aeefe806790c0a6cc7312caeb5376 100644 (file)
--- 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 ||