From 6b9a7d6a1d24b5cc9c90d16d507abde2633bbf6a Mon Sep 17 00:00:00 2001 From: "ji.luo" Date: Thu, 14 Sep 2017 10:32:59 +0800 Subject: MA-10338-3 Refine misc local variables in get_single_var() Change-Id: I0b57cae7a172d906bf7d43f19e938a72c74b3b16 Signed-off-by: ji.luo --- drivers/usb/gadget/f_fastboot.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index c2c13a7c10..2a3ab6e5d6 100755 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -2159,7 +2159,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; @@ -2173,9 +2172,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:"); @@ -2204,20 +2201,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) -- cgit v1.2.3