From 4c61f522692f2d6903486b3975e83b47f7fb909f Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Tue, 3 May 2016 11:42:28 +0200 Subject: [PATCH] Code style fixes --- src/modules/systemlib/git_version.h | 2 +- src/systemcmds/ver/ver.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/modules/systemlib/git_version.h b/src/modules/systemlib/git_version.h index d3a5cb1536..a81ac035ee 100644 --- a/src/modules/systemlib/git_version.h +++ b/src/modules/systemlib/git_version.h @@ -51,6 +51,6 @@ __EXPORT extern const char *px4_git_tag; __EXPORT extern const char *os_git_tag; __EXPORT extern const uint32_t px4_board_version; -__EXPORT uint32_t version_tag_to_number(const char* tag); +__EXPORT uint32_t version_tag_to_number(const char *tag); __END_DECLS diff --git a/src/systemcmds/ver/ver.c b/src/systemcmds/ver/ver.c index 7afc33fb79..82ee35494b 100644 --- a/src/systemcmds/ver/ver.c +++ b/src/systemcmds/ver/ver.c @@ -73,7 +73,7 @@ __EXPORT const uint32_t px4_board_version = 1; /** * Convert a version tag string to a number */ -uint32_t version_tag_to_number(const char* tag) +uint32_t version_tag_to_number(const char *tag) { uint32_t ver = 0; unsigned len = strlen(tag); @@ -86,11 +86,14 @@ uint32_t version_tag_to_number(const char* tag) ver += number * mag; mag *= 10; + } else if (tag[i] == '.') { continue; + } else if (ver > 100 && dotparsed) { /* this is a full version and we have enough digits */ return ver; + } else if (tag[i] != 'v') { /* reset, because we don't have a full tag but * are seeing non-numeric characters again