summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorji.luo <ji.luo@nxp.com>2017-09-20 02:10:09 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-09-20 02:10:09 +0000
commitc15fc1dc178dbdc81117dfd161f83a17b4ccbf73 (patch)
tree928370f880f7c1dff231aeafcb16c6c1aa2bb787
parentea4f2e458445b6a1137541da1520cfe022dfc771 (diff)
parente34fd2f82707102cf10eb59ee3e6b1a14e43511b (diff)
downloaduboot-imx-c15fc1dc178dbdc81117dfd161f83a17b4ccbf73.tar.gz
Refine misc local variables in get_single_var()
am: e34fd2f827 Change-Id: I87d1ac51bdb4c85c56cbbb434ec1b7ef42334b35
-rw-r--r--drivers/usb/gadget/f_fastboot.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index a40a701c1c..0a73135387 100644
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -2917,7 +2917,6 @@ static int get_single_var(char *cmd, char *response)
char *str = cmd;
size_t chars_left;
const char *s;
- char string_buffer[12];
int mmc_no = 0;
struct blk_desc *dev_desc;
@@ -2931,9 +2930,7 @@ static int get_single_var(char *cmd, char *response)
strncat(response, "Wrong partition name.", chars_left);
return -1;
} else {
- char str_num[20];
- sprintf(str_num, "0x%016x", fb_part->length * get_block_size());
- strncat(response, str_num, chars_left);
+ snprintf(response + strlen(response), chars_left, "0x%016x", fb_part->length * get_block_size());
}
} else if ((str = strstr(cmd, "partition-type:"))) {
str +=strlen("partition-type:");
@@ -2962,20 +2959,16 @@ static int get_single_var(char *cmd, char *response)
strncat(response, "1", chars_left);
} else if (!strcmp_l1("downloadsize", cmd) ||
!strcmp_l1("max-download-size", cmd)) {
- char str_num[12];
- sprintf(str_num, "0x%08x", CONFIG_FASTBOOT_BUF_SIZE);
- strncat(response, str_num, chars_left);
+ snprintf(response + strlen(response), chars_left, "0x%08x", CONFIG_FASTBOOT_BUF_SIZE);
} else if (!strcmp_l1("erase-block-size", cmd)) {
mmc_no = fastboot_devinfo.dev_id;
dev_desc = blk_get_dev("mmc", mmc_no);
- sprintf(string_buffer, "0x%08x", dev_desc->blksz);
- strncat(response, string_buffer, chars_left);
+ snprintf(response + strlen(response), chars_left, "0x%08x", (unsigned int)dev_desc->blksz);
} else if (!strcmp_l1("logical-block-size", cmd)) {
mmc_no = fastboot_devinfo.dev_id;
dev_desc = blk_get_dev("mmc", mmc_no);
- sprintf(string_buffer, "0x%08x", dev_desc->blksz);
- strncat(response, string_buffer, chars_left);
+ snprintf(response + strlen(response), chars_left, "0x%08x", (unsigned int)dev_desc->blksz);
} else if (!strcmp_l1("serialno", cmd)) {
s = get_serial();
if (s)