Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-05 22:24:47 +08:00
Code Issues Actions 31 Packages Projects Releases Wiki Activity

Fixed formatting

Browse Source
This commit is contained in:
garfieldG
2017-07-09 13:40:31 +03:00
committed by Lorenz Meier
parent be41cf8ba1
commit a9750f7ccb
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/version/version.c
+12 -13
View File
@@ -59,9 +59,9 @@ enum FIRMWARE_TYPE {
}; };
typedef enum { typedef enum {
PATCH=0, PATCH = 0,
MINOR=8, MINOR = 8,
MAJOR=16 MAJOR = 16
} version_type_t; } version_type_t;
/** /**
@@ -76,8 +76,7 @@ static uint32_t string_to_int(const char *tag, int start, int end)
const char *curr = &tag[start]; const char *curr = &tag[start];
uint32_t temp_ver = 0; uint32_t temp_ver = 0;
while (curr <= &tag[end]) while (curr <= &tag[end]) {
{
temp_ver = (temp_ver * 10) + (*curr - '0'); temp_ver = (temp_ver * 10) + (*curr - '0');
curr++; curr++;
@@ -113,35 +112,35 @@ static uint32_t version_tag_to_number(const char *tag)
} }
if (tag[i] >= '0' && tag[i] <= '9') { if (tag[i] >= '0' && tag[i] <= '9') {
if (!end) if (!end) {
{
end = i; end = i;
} }
if (i == 0) if (i == 0) {
{
uint32_t temp_ver = string_to_int(tag, i, end); uint32_t temp_ver = string_to_int(tag, i, end);
ver = (temp_ver << v_type) + ver; ver = (temp_ver << v_type) + ver;
} }
} else if ((tag[i] == '.') || (i==0)) { } else if ((tag[i] == '.') || (i == 0)) {
uint32_t temp_ver = string_to_int(tag, (i + 1), end); uint32_t temp_ver = string_to_int(tag, (i + 1), end);
ver = (temp_ver << v_type) + ver; ver = (temp_ver << v_type) + ver;
end = 0; end = 0;
switch(v_type) switch (v_type) {
{
case PATCH: case PATCH:
v_type = MINOR; v_type = MINOR;
break; break;
case MINOR: case MINOR:
v_type = MAJOR; v_type = MAJOR;
break; break;
case MAJOR: case MAJOR:
default: default:
break; break;
} }
} else if (i > 3 && type == -1) { } else if (i > 3 && type == -1) {
/* scan and look for signature characters for each type */ /* scan and look for signature characters for each type */
const char *curr = &tag[i - 1]; const char *curr = &tag[i - 1];