From 7f0c3c51c2d455b7e12196ed91aa461cf86b9790 Mon Sep 17 00:00:00 2001
From: Bin Meng <bmeng.cn@gmail.com>
Date: Wed, 7 Oct 2015 20:19:15 -0700
Subject: [PATCH] cmd: bootvx: Avoid strlen() calls when constructing VxWorks
bootline
Remember the position in the VxWorks bootline buffer to avoid the call
to strlen() each time.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
common/cmd_elf.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/common/cmd_elf.c b/common/cmd_elf.c
index 62863df412..6c95851642 100644
--- a/common/cmd_elf.c
+++ b/common/cmd_elf.c
@@ -213,6 +213,7 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
char *bootline; /* Text of the bootline */
char *tmp; /* Temporary char pointer */
char build_buf[128]; /* Buffer for building the bootline */
+ int ptr = 0;
/*
* Check the loadaddr variable.
@@ -277,30 +278,29 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
max(strlen(bootline), (size_t)255));
flush_cache(bootaddr, max(strlen(bootline), (size_t)255));
} else {
- sprintf(build_buf, CONFIG_SYS_VXWORKS_BOOT_DEVICE);
+ ptr = sprintf(build_buf, CONFIG_SYS_VXWORKS_BOOT_DEVICE);
tmp = getenv("bootfile");
if (tmp)
- sprintf(&build_buf[strlen(build_buf)],
- "%s:%s ", CONFIG_SYS_VXWORKS_SERVERNAME, tmp);
+ ptr += sprintf(build_buf + ptr, "%s:%s ",
+ CONFIG_SYS_VXWORKS_SERVERNAME, tmp);
else
- sprintf(&build_buf[strlen(build_buf)],
- "%s:file ", CONFIG_SYS_VXWORKS_SERVERNAME);
+ ptr += sprintf(build_buf + ptr, "%s:file ",
+ CONFIG_SYS_VXWORKS_SERVERNAME);
tmp = getenv("ipaddr");
if (tmp)
- sprintf(&build_buf[strlen(build_buf)], "e=%s ", tmp);
+ ptr += sprintf(build_buf + ptr, "e=%s ", tmp);
tmp = getenv("serverip");
if (tmp)
- sprintf(&build_buf[strlen(build_buf)], "h=%s ", tmp);
+ ptr += sprintf(build_buf + ptr, "h=%s ", tmp);
tmp = getenv("hostname");
if (tmp)
- sprintf(&build_buf[strlen(build_buf)], "tn=%s ", tmp);
+ ptr += sprintf(build_buf + ptr, "tn=%s ", tmp);
#ifdef CONFIG_SYS_VXWORKS_ADD_PARAMS
- sprintf(&build_buf[strlen(build_buf)],
- CONFIG_SYS_VXWORKS_ADD_PARAMS);
+ ptr += sprintf(build_buf + ptr, CONFIG_SYS_VXWORKS_ADD_PARAMS);
#endif
memcpy((void *)bootaddr, build_buf,
--
2.39.5