You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2016/01/05 19:40:33 UTC
[2/2] incubator-mynewt-larva git commit: Declare that
console_printf() takes printf format as argument. Fix resulting warnings.
Declare that console_printf() takes printf format as argument.
Fix resulting warnings.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/commit/a54bfb3f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/tree/a54bfb3f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/diff/a54bfb3f
Branch: refs/heads/master
Commit: a54bfb3f928191a509029534bd2d92df81fb3d1d
Parents: 6899316
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Tue Jan 5 10:39:36 2016 -0800
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Tue Jan 5 10:39:36 2016 -0800
----------------------------------------------------------------------
libs/console/full/include/console/console.h | 3 ++-
libs/console/stub/include/console/console.h | 3 +++
libs/fs/src/fs_cli.c | 3 ++-
libs/os/src/arch/cortex_m4/os_fault.c | 14 +++++++-------
libs/os/src/os_info.c | 12 ++++++------
libs/util/src/log.c | 2 +-
libs/util/src/stats.c | 2 +-
7 files changed, 22 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/a54bfb3f/libs/console/full/include/console/console.h
----------------------------------------------------------------------
diff --git a/libs/console/full/include/console/console.h b/libs/console/full/include/console/console.h
index b331d83..8b53650 100644
--- a/libs/console/full/include/console/console.h
+++ b/libs/console/full/include/console/console.h
@@ -25,7 +25,8 @@ void console_write(const char *str, int cnt);
int console_read(char *str, int cnt);
void console_blocking_mode(void);
-void console_printf(const char *fmt, ...);
+void console_printf(const char *fmt, ...)
+ __attribute__ ((format (printf, 1, 2)));;
int console_vprintf(const char *fmt, va_list args);
#endif /* __CONSOLE_H__ */
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/a54bfb3f/libs/console/stub/include/console/console.h
----------------------------------------------------------------------
diff --git a/libs/console/stub/include/console/console.h b/libs/console/stub/include/console/console.h
index f3204c1..821d0a6 100644
--- a/libs/console/stub/include/console/console.h
+++ b/libs/console/stub/include/console/console.h
@@ -42,6 +42,9 @@ console_write(const char *str, int cnt)
{
}
+static void inline console_printf(const char *fmt, ...)
+ __attribute__ ((format (printf, 1, 2)));
+
static void inline
console_printf(const char *fmt, ...)
{
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/a54bfb3f/libs/fs/src/fs_cli.c
----------------------------------------------------------------------
diff --git a/libs/fs/src/fs_cli.c b/libs/fs/src/fs_cli.c
index 45bdbf2..e26e003 100644
--- a/libs/fs/src/fs_cli.c
+++ b/libs/fs/src/fs_cli.c
@@ -16,6 +16,7 @@
#ifdef SHELL_PRESENT
+#include <inttypes.h>
#include <string.h>
#include <shell/shell.h>
@@ -32,7 +33,7 @@ fs_ls_file(const char *name, struct fs_file *file)
len = 0;
fs_filelen(file, &len);
- console_printf("\t%6d %s\n", len, name);
+ console_printf("\t%6lu %s\n", (unsigned long)len, name);
}
static void
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/a54bfb3f/libs/os/src/arch/cortex_m4/os_fault.c
----------------------------------------------------------------------
diff --git a/libs/os/src/arch/cortex_m4/os_fault.c b/libs/os/src/arch/cortex_m4/os_fault.c
index 2c7c6fb..63404ad 100644
--- a/libs/os/src/arch/cortex_m4/os_fault.c
+++ b/libs/os/src/arch/cortex_m4/os_fault.c
@@ -68,18 +68,18 @@ void
os_default_irq(struct trap_frame *tf)
{
console_blocking_mode();
- console_printf("Unhandled interrupt (%d), exception sp 0x%08x\n",
+ console_printf("Unhandled interrupt (%ld), exception sp 0x%08lx\n",
SCB->ICSR & SCB_ICSR_VECTACTIVE_Msk, (uint32_t)tf->ef);
- console_printf(" r0:0x%08x r1:0x%08x r2:0x%08x r3:0x%08x\n",
+ console_printf(" r0:0x%08lx r1:0x%08lx r2:0x%08lx r3:0x%08lx\n",
tf->ef->r0, tf->ef->r1, tf->ef->r2, tf->ef->r3);
- console_printf(" r4:0x%08x r5:0x%08x r6:0x%08x r7:0x%08x\n",
+ console_printf(" r4:0x%08lx r5:0x%08lx r6:0x%08lx r7:0x%08lx\n",
tf->r4, tf->r5, tf->r6, tf->r7);
- console_printf(" r8:0x%08x r9:0x%08x r10:0x%08x r11:0x%08x\n",
+ console_printf(" r8:0x%08lx r9:0x%08lx r10:0x%08lx r11:0x%08lx\n",
tf->r8, tf->r9, tf->r10, tf->r11);
- console_printf("r12:0x%08x lr:0x%08x pc:0x%08x psr:0x%08x\n",
+ console_printf("r12:0x%08lx lr:0x%08lx pc:0x%08lx psr:0x%08lx\n",
tf->ef->r12, tf->ef->lr, tf->ef->pc, tf->ef->psr);
- console_printf("ICSR:0x%08x HFSR:0x%08x CFSR:0x%08x\n",
+ console_printf("ICSR:0x%08lx HFSR:0x%08lx CFSR:0x%08lx\n",
SCB->ICSR, SCB->HFSR, SCB->CFSR);
- console_printf("BFAR:0x%08x MMFAR:0x%08x\n", SCB->BFAR, SCB->MMFAR);
+ console_printf("BFAR:0x%08lx MMFAR:0x%08lx\n", SCB->BFAR, SCB->MMFAR);
system_reset();
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/a54bfb3f/libs/os/src/os_info.c
----------------------------------------------------------------------
diff --git a/libs/os/src/os_info.c b/libs/os/src/os_info.c
index 2387cdd..7697824 100644
--- a/libs/os/src/os_info.c
+++ b/libs/os/src/os_info.c
@@ -94,12 +94,12 @@ shell_os_tasks_display(int argc, char **argv)
}
}
- console_printf(" %s (prio: %u, nw: %u, flags: 0x%x, "
- "ssize: %u, cswcnt: %lu, tot_run_time: %ums)\n",
- info[i].oti_name,
- info[i].oti_prio, info[i].oti_next_wakeup, info[i].oti_flags,
- info[i].oti_stack_size,
- info[i].oti_csw_cnt, info[i].oti_run_time);
+ console_printf(" %s (prio: %u, nw: %lu, flags: 0x%x, "
+ "ssize: %u, cswcnt: %lu, tot_run_time: %lums)\n",
+ info[i].oti_name, info[i].oti_prio,
+ (unsigned long)info[i].oti_next_wakeup, info[i].oti_flags,
+ info[i].oti_stack_size, (unsigned long)info[i].oti_csw_cnt,
+ (unsigned long)info[i].oti_run_time);
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/a54bfb3f/libs/util/src/log.c
----------------------------------------------------------------------
diff --git a/libs/util/src/log.c b/libs/util/src/log.c
index 5d16364..f837a88 100644
--- a/libs/util/src/log.c
+++ b/libs/util/src/log.c
@@ -64,7 +64,7 @@ shell_log_dump_entry(struct util_log *log, void *arg, void *dptr, uint16_t len)
* values, and this causes memory to be overwritten. Cast to a
* unsigned 32-bit value for now.
*/
- console_printf("[%d] %s\n", (uint32_t) ueh.ue_ts, data);
+ console_printf("[%lu] %s\n", (unsigned long) ueh.ue_ts, data);
return (0);
err:
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/a54bfb3f/libs/util/src/stats.c
----------------------------------------------------------------------
diff --git a/libs/util/src/stats.c b/libs/util/src/stats.c
index e61d785..e3bf0c4 100644
--- a/libs/util/src/stats.c
+++ b/libs/util/src/stats.c
@@ -81,7 +81,7 @@ shell_stats_display_entry(struct stats_hdr *hdr, uint8_t *ptr)
console_printf("%s: %u\n", name, *(uint16_t *) ptr);
break;
case sizeof(uint32_t):
- console_printf("%s: %u\n", name, *(uint32_t *) ptr);
+ console_printf("%s: %lu\n", name, *(unsigned long *) ptr);
break;
case sizeof(uint64_t):
console_printf("%s: %llu\n", name, *(uint64_t *) ptr);