Repository: incubator-mynewt-larva Updated Branches: refs/heads/develop 16dce45da -> 8d16fadc0
sys/log - fix compiler errors when newtmgr not present. 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/a8f5e7f3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/tree/a8f5e7f3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/diff/a8f5e7f3 Branch: refs/heads/develop Commit: a8f5e7f3ef12ea822052c069a95244fec90584b0 Parents: 16dce45 Author: Christopher Collins <ccollins47...@gmail.com> Authored: Wed Feb 24 11:08:14 2016 -0800 Committer: Christopher Collins <ccollins47...@gmail.com> Committed: Wed Feb 24 11:08:14 2016 -0800 ---------------------------------------------------------------------- sys/log/src/log.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/a8f5e7f3/sys/log/src/log.c ---------------------------------------------------------------------- diff --git a/sys/log/src/log.c b/sys/log/src/log.c index 2e8e3c9..8ecb0be 100644 --- a/sys/log/src/log.c +++ b/sys/log/src/log.c @@ -43,7 +43,9 @@ int shell_log_dump_all_cmd(int, char **); int log_init(void) { +#ifdef NEWTMGR_PRESENT int rc; +#endif if (log_inited) { return (0); @@ -57,14 +59,11 @@ log_init(void) #ifdef NEWTMGR_PRESENT rc = log_nmgr_register_group(); if (rc != 0) { - goto err; + return (rc); } #endif /* NEWTMGR_PRESENT */ return (0); - -err: - return (rc); } struct log *
