diff mbox

[U-Boot,2/3] net: nfs: Remove separate buffer for default name

Message ID 1471290137-29723-3-git-send-email-joe.hershberger@ni.com
State Accepted
Commit f8b26c7adf4e097484a4679ac6f32ae11ce100c5
Delegated to: Joe Hershberger
Headers show

Commit Message

Joe Hershberger Aug. 15, 2016, 7:42 p.m. UTC 
There is no reason to store the default filename in a separate buffer
only to immediately copy it to the main name buffer. Just write it there
directly and remove the other buffer.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---

 net/nfs.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Joe Hershberger Aug. 23, 2016, 2:28 a.m. UTC | #1 
Hi Joe,

https://patchwork.ozlabs.org/patch/659394/ was applied to u-boot-net.git.

Thanks!
-Joe
diff mbox

Patch

diff --git a/net/nfs.c b/net/nfs.c
index 4a5a1ab..d7aeef9 100644
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -65,7 +65,6 @@  static int nfs_state;
 #define STATE_READ_REQ			6
 #define STATE_READLINK_REQ		7
 
-static char default_filename[64];
 static char *nfs_filename;
 static char *nfs_path;
 static char nfs_path_buff[2048];
@@ -720,12 +719,11 @@  void nfs_start(void)
 	}
 
 	if (net_boot_file_name[0] == '\0') {
-		sprintf(default_filename, "/nfsroot/%02X%02X%02X%02X.img",
+		sprintf(nfs_path, "/nfsroot/%02X%02X%02X%02X.img",
 			net_ip.s_addr & 0xFF,
 			(net_ip.s_addr >>  8) & 0xFF,
 			(net_ip.s_addr >> 16) & 0xFF,
 			(net_ip.s_addr >> 24) & 0xFF);
-		strcpy(nfs_path, default_filename);
 
 		printf("*** Warning: no boot file name; using '%s'\n",
 		       nfs_path);