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 2015/11/24 21:39:49 UTC
[03/11] incubator-mynewt-larva git commit: Baselibc assert only
passes filename & linenumber to assert.
Baselibc assert only passes filename & linenumber to assert.
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/8a061a4f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/tree/8a061a4f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/diff/8a061a4f
Branch: refs/heads/master
Commit: 8a061a4f50c45c2bb289dd18be26149e1d39785e
Parents: 1e2ff6f
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Tue Nov 24 10:29:58 2015 -0800
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Tue Nov 24 10:29:58 2015 -0800
----------------------------------------------------------------------
libs/os/src/arch/cortex_m4/os_fault.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/8a061a4f/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 d31666b..c9983d5 100644
--- a/libs/os/src/arch/cortex_m4/os_fault.c
+++ b/libs/os/src/arch/cortex_m4/os_fault.c
@@ -36,7 +36,7 @@ __assert_func(const char *file, int line, const char *func, const char *e)
os_die_line = line;
os_die_module = file;
console_blocking_mode();
- console_printf("Assert '%s; failed in %s:%d\n", e, file, line);
+ console_printf("Assert %s; failed in %s:%d\n", e ? e : "", file, line);
system_reset();
}