aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Couzens <lynxis@fe80.eu>2018-03-15 18:17:01 +0100
committerAlexander Couzens <lynxis@fe80.eu>2018-03-15 18:22:36 +0100
commit3137622efb8af483ae098c3fb5ddef219c5cde46 (patch)
treefe7b66c9aa17013e6c46f59623e4d03f57cdad69
parent677d8df9b8bae64d441e3d4d5afa963dc5088ccb (diff)
downloadupstream-3137622efb8af483ae098c3fb5ddef219c5cde46.tar.gz
upstream-3137622efb8af483ae098c3fb5ddef219c5cde46.tar.bz2
upstream-3137622efb8af483ae098c3fb5ddef219c5cde46.zip
firmware-utils: tplink-safeloader: compile as gnu99
Also fix minor coding style issue and one redeclaration. Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
-rw-r--r--tools/firmware-utils/Makefile2
-rw-r--r--tools/firmware-utils/src/tplink-safeloader.c9
2 files changed, 6 insertions, 5 deletions
diff --git a/tools/firmware-utils/Makefile b/tools/firmware-utils/Makefile
index ca41387b5e..f3fefa329a 100644
--- a/tools/firmware-utils/Makefile
+++ b/tools/firmware-utils/Makefile
@@ -42,7 +42,7 @@ define Host/Compile
$(call cc,mkplanexfw sha1)
$(call cc,mktplinkfw mktplinkfw-lib md5, -Wall -fgnu89-inline)
$(call cc,mktplinkfw2 mktplinkfw-lib md5, -fgnu89-inline)
- $(call cc,tplink-safeloader md5, -Wall)
+ $(call cc,tplink-safeloader md5, -Wall --std=gnu99)
$(call cc,pc1crypt)
$(call cc,osbridge-crc)
$(call cc,wrt400n cyg_crc32)
diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
index 3c979f7f86..eb99241136 100644
--- a/tools/firmware-utils/src/tplink-safeloader.c
+++ b/tools/firmware-utils/src/tplink-safeloader.c
@@ -1417,8 +1417,9 @@ static int add_flash_partition(
unsigned long base,
unsigned long size)
{
+ int ptr;
/* check if the list has a free entry */
- for (int ptr=0; ptr<max_entries; ptr++, part_list++) {
+ for (ptr = 0; ptr < max_entries; ptr++, part_list++) {
if (part_list->name == NULL &&
part_list->base == 0 &&
part_list->size == 0)
@@ -1494,7 +1495,7 @@ static int read_partition_table(
break;
}
- for (int i=0; i<=4; i++) {
+ for (int i = 0; i <= 4; i++) {
if (end_part <= ptr)
break;
@@ -1620,7 +1621,7 @@ static int extract_firmware(const char *input, const char *output_directory)
error(1, 0, "Error can not read the partition table (fwup-ptn)");
}
- for (int i=0; i<max_entries; i++) {
+ for (int i = 0; i < max_entries; i++) {
if (entries[i].name == NULL &&
entries[i].base == 0 &&
entries[i].size == 0)
@@ -1636,7 +1637,7 @@ static struct flash_partition_entry *find_partition(
struct flash_partition_entry *entries, size_t max_entries,
const char *name, const char *error_msg)
{
- for (int i=0; i<max_entries; i++, entries++) {
+ for (int i = 0; i < max_entries; i++, entries++) {
if (strcmp(entries->name, name) == 0)
return entries;
}