diff options
Diffstat (limited to 'src/solvers/coord/utils.h')
| -rw-r--r-- | src/solvers/coord/utils.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/solvers/coord/utils.h b/src/solvers/coord/utils.h index ef3f817..aa4d74c 100644 --- a/src/solvers/coord/utils.h +++ b/src/solvers/coord/utils.h | |||
| @@ -2,7 +2,7 @@ STATIC coord_t *parse_coord(size_t n, const char [n]); | |||
| 2 | STATIC uint8_t parse_axis(size_t n, const char [n]); | 2 | STATIC uint8_t parse_axis(size_t n, const char [n]); |
| 3 | STATIC void parse_coord_and_axis( | 3 | STATIC void parse_coord_and_axis( |
| 4 | size_t n, const char [n], coord_t **, uint8_t *); | 4 | size_t n, const char [n], coord_t **, uint8_t *); |
| 5 | STATIC int64_t dataid_coord(const char *, char [static NISSY_SIZE_DATAID]); | 5 | STATIC long long dataid_coord(const char *, char [static NISSY_SIZE_DATAID]); |
| 6 | 6 | ||
| 7 | STATIC coord_t * | 7 | STATIC coord_t * |
| 8 | parse_coord(size_t n, const char coord[n]) | 8 | parse_coord(size_t n, const char coord[n]) |
| @@ -38,20 +38,22 @@ parse_coord_and_axis( | |||
| 38 | uint8_t *axis | 38 | uint8_t *axis |
| 39 | ) | 39 | ) |
| 40 | { | 40 | { |
| 41 | const char *s; | ||
| 41 | size_t i; | 42 | size_t i; |
| 42 | 43 | ||
| 44 | s = str + 6; | ||
| 43 | for (i = 0; i < n; i++) | 45 | for (i = 0; i < n; i++) |
| 44 | if (str[i] == '_') | 46 | if (s[i] == '_') |
| 45 | break; | 47 | break; |
| 46 | 48 | ||
| 47 | if (coord != NULL) | 49 | if (coord != NULL) |
| 48 | *coord = parse_coord(i, str); | 50 | *coord = parse_coord(i, s); |
| 49 | 51 | ||
| 50 | if (axis != NULL) | 52 | if (axis != NULL) |
| 51 | *axis = i == n ? UINT8_ERROR : parse_axis(n-i-1, str+i+1); | 53 | *axis = i == n ? UINT8_ERROR : parse_axis(n-i-1, s+i+1); |
| 52 | } | 54 | } |
| 53 | 55 | ||
| 54 | STATIC int64_t | 56 | STATIC long long |
| 55 | dataid_coord(const char *ca, char dataid[static NISSY_SIZE_DATAID]) | 57 | dataid_coord(const char *ca, char dataid[static NISSY_SIZE_DATAID]) |
| 56 | { | 58 | { |
| 57 | coord_t *c; | 59 | coord_t *c; |
