From 3edc5942e48e96113ee6f4717b859df8b5e02c5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dario=20R=C3=B6thlisberger?= Date: Mon, 9 Oct 2017 11:24:23 +0200 Subject: [PATCH] versioning: fix style --- src/lib/version/version.c | 14 ++++++++------ src/systemcmds/tests/test_versioning.cpp | 24 +++++++++++++++--------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/src/lib/version/version.c b/src/lib/version/version.c index a47c3b6e57..ead4949790 100644 --- a/src/lib/version/version.c +++ b/src/lib/version/version.c @@ -119,8 +119,8 @@ uint32_t version_tag_to_number(const char *tag) if (buffer >= 0) { version[buffer_counter] = buffer; buffer_counter++; - } - + } + if (buffer_counter <= 0) { firmware_type = 0x00; } @@ -129,6 +129,7 @@ uint32_t version_tag_to_number(const char *tag) version_number = ((uint8_t)version[0] << 8 * 3) | ((uint8_t)version[1] << 8 * 2) | ((uint8_t)version[2] << 8 * 1) | firmware_type; + } else { version_number = 0; } @@ -175,10 +176,10 @@ uint32_t version_tag_to_vendor_version_number(const char *tag) } if ((dash_count == 1 && point_count == 2 && firmware_type == FIRMWARE_TYPE_RELEASE) || - (dash_count == 2 && point_count == 2) || - (dash_count == 3 && point_count == 4)) { - firmware_type = FIRMWARE_TYPE_DEV; -} + (dash_count == 2 && point_count == 2) || + (dash_count == 3 && point_count == 4)) { + firmware_type = FIRMWARE_TYPE_DEV; + } for (size_t i = 0; i < strlen(tag); i++) { if (buffer_counter > 5) { @@ -215,6 +216,7 @@ uint32_t version_tag_to_vendor_version_number(const char *tag) } else if (buffer_counter == 3) { version_number = firmware_type; + } else { version_number = 0; } diff --git a/src/systemcmds/tests/test_versioning.cpp b/src/systemcmds/tests/test_versioning.cpp index 498b12b700..f636e9fd40 100644 --- a/src/systemcmds/tests/test_versioning.cpp +++ b/src/systemcmds/tests/test_versioning.cpp @@ -7,10 +7,12 @@ public: virtual bool run_tests(); private: - bool _test_tag_to_version_number(const char *version_tag, uint32_t flight_version_target, uint32_t vendor_version_target); + bool _test_tag_to_version_number(const char *version_tag, uint32_t flight_version_target, + uint32_t vendor_version_target); }; -bool VersioningTest::_test_tag_to_version_number(const char *version_tag, uint32_t flight_version_target, uint32_t vendor_version_target) +bool VersioningTest::_test_tag_to_version_number(const char *version_tag, uint32_t flight_version_target, + uint32_t vendor_version_target) { uint32_t flight_version_result = version_tag_to_number(version_tag); uint32_t vendor_version_result = version_tag_to_vendor_version_number(version_tag); @@ -18,12 +20,16 @@ bool VersioningTest::_test_tag_to_version_number(const char *version_tag, uint32 if (flight_version_target == flight_version_result) { if (vendor_version_target == vendor_version_result) { return true; + } else { - PX4_ERR("Wrong vendor version: tag: %s, got: 0x%x, expected: 0x%x", version_tag, vendor_version_result, vendor_version_target); + PX4_ERR("Wrong vendor version: tag: %s, got: 0x%x, expected: 0x%x", version_tag, vendor_version_result, + vendor_version_target); return false; } + } else { - PX4_ERR("Wrong flight version: tag: %s, got: 0x%x, expected: 0x%x", version_tag, flight_version_result, flight_version_target); + PX4_ERR("Wrong flight version: tag: %s, got: 0x%x, expected: 0x%x", version_tag, flight_version_result, + flight_version_target); return false; } } @@ -31,9 +37,9 @@ bool VersioningTest::_test_tag_to_version_number(const char *version_tag, uint32 bool VersioningTest::run_tests() { ut_assert_true(_test_tag_to_version_number("v11.45.99-1.2.3", 0x0B2D63FF, 0x010203FF)); - ut_assert_true(_test_tag_to_version_number("v11.45.99-01.02.03", 0x0B2D63FF, 0x010203FF)); - ut_assert_true(_test_tag_to_version_number("v011.045.099-001.002.003", 0x0B2D63FF, 0x010203FF)); - ut_assert_true(_test_tag_to_version_number("v011.045.099-1.2.3", 0x0B2D63FF, 0x010203FF)); + ut_assert_true(_test_tag_to_version_number("v11.45.99-01.02.03", 0x0B2D63FF, 0x010203FF)); + ut_assert_true(_test_tag_to_version_number("v011.045.099-001.002.003", 0x0B2D63FF, 0x010203FF)); + ut_assert_true(_test_tag_to_version_number("v011.045.099-1.2.3", 0x0B2D63FF, 0x010203FF)); ut_assert_true(_test_tag_to_version_number("v1.2.3", 0x010203FF, 0x000000FF)); ut_assert_true(_test_tag_to_version_number("v255.255.255", 0xFFFFFFFF, 0x000000FF)); ut_assert_true(_test_tag_to_version_number("v255.255.255-11", 0xFFFFFF00, 0x00000000)); @@ -62,7 +68,7 @@ bool VersioningTest::run_tests() ut_assert_true(_test_tag_to_version_number("v1.6.2-rc2", 0x010602C0, 0x000000C0)); ut_assert_true(_test_tag_to_version_number("v1.6.2rc1", 0x010602C0, 0x000000C0)); ut_assert_true(_test_tag_to_version_number("v1.6.10-100-g890c415", 0x01060A00, 0x00000000)); - ut_assert_true(_test_tag_to_version_number("v1.6.10-99999999999999-g890c415", 0x01060A00, 0x00000000)); + ut_assert_true(_test_tag_to_version_number("v1.6.10-99999999999999-g890c415", 0x01060A00, 0x00000000)); ut_assert_true(_test_tag_to_version_number("v1.6.2-0.8.7-67-g1d5e979", 0x01060200, 0x00080700)); ut_assert_true(_test_tag_to_version_number("randomtext", 0x00000000, 0x00000000)); ut_assert_true(_test_tag_to_version_number("randomtextwithnumber12", 0x00000000, 0x00000000)); @@ -71,7 +77,7 @@ bool VersioningTest::run_tests() ut_assert_true(_test_tag_to_version_number("v12.12-randomtextwithnumber", 0x00000000, 0x00000000)); ut_assert_true(_test_tag_to_version_number("...-...", 0x00000000, 0x00000000)); ut_assert_true(_test_tag_to_version_number("v...-...", 0x00000000, 0x00000000)); - + return (_tests_failed == 0); }