diff options
Diffstat (limited to 'src/core/io_cube.h')
| -rw-r--r-- | src/core/io_cube.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/core/io_cube.h b/src/core/io_cube.h index 0c18f34..39f3545 100644 --- a/src/core/io_cube.h +++ b/src/core/io_cube.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | STATIC cube_t readcube(const char *, const char *); | 1 | STATIC cube_t readcube(const char *, const char *); |
| 2 | STATIC int64_t writecube(const char *, cube_t, uint64_t, char *); | 2 | STATIC int64_t writecube(const char *, cube_t, size_t n, char [n]); |
| 3 | STATIC void log_available_formats(void); | 3 | STATIC void log_available_formats(void); |
| 4 | STATIC uint8_t readco(const char *); | 4 | STATIC uint8_t readco(const char *); |
| 5 | STATIC uint8_t readcp(const char *); | 5 | STATIC uint8_t readcp(const char *); |
| @@ -10,10 +10,10 @@ STATIC cube_t readcube_H48(const char *); | |||
| 10 | STATIC uint8_t readpiece_LST(const char **); | 10 | STATIC uint8_t readpiece_LST(const char **); |
| 11 | STATIC cube_t readcube_LST(const char *); | 11 | STATIC cube_t readcube_LST(const char *); |
| 12 | 12 | ||
| 13 | STATIC int64_t writepiece_LST(uint8_t, uint64_t, char *); | 13 | STATIC int64_t writepiece_LST(uint8_t, size_t n, char [n]); |
| 14 | STATIC int64_t writecube_B32(cube_t, uint64_t, char *); | 14 | STATIC int64_t writecube_B32(cube_t, size_t n, char [n]); |
| 15 | STATIC int64_t writecube_H48(cube_t, uint64_t, char *); | 15 | STATIC int64_t writecube_H48(cube_t, size_t n, char [n]); |
| 16 | STATIC int64_t writecube_LST(cube_t, uint64_t, char *); | 16 | STATIC int64_t writecube_LST(cube_t, size_t n, char [n]); |
| 17 | 17 | ||
| 18 | STATIC uint8_t b32toedge(char); | 18 | STATIC uint8_t b32toedge(char); |
| 19 | STATIC uint8_t b32tocorner(char); | 19 | STATIC uint8_t b32tocorner(char); |
| @@ -23,7 +23,7 @@ STATIC char cornertob32(uint8_t); | |||
| 23 | STATIC struct { | 23 | STATIC struct { |
| 24 | const char *name; | 24 | const char *name; |
| 25 | cube_t (*read)(const char *); | 25 | cube_t (*read)(const char *); |
| 26 | int64_t (*write)(cube_t, uint64_t, char *); | 26 | int64_t (*write)(cube_t, size_t n, char [n]); |
| 27 | } ioformat[] = | 27 | } ioformat[] = |
| 28 | { | 28 | { |
| 29 | { .name = "B32", .read = readcube_B32, .write = writecube_B32 }, | 29 | { .name = "B32", .read = readcube_B32, .write = writecube_B32 }, |
| @@ -47,7 +47,7 @@ readcube(const char *format, const char *buf) | |||
| 47 | } | 47 | } |
| 48 | 48 | ||
| 49 | STATIC int64_t | 49 | STATIC int64_t |
| 50 | writecube(const char *format, cube_t cube, uint64_t buf_size, char *buf) | 50 | writecube(const char *format, cube_t cube, size_t buf_size, char buf[buf_size]) |
| 51 | { | 51 | { |
| 52 | int i; | 52 | int i; |
| 53 | 53 | ||
| @@ -233,10 +233,10 @@ readcube_LST(const char *buf) | |||
| 233 | } | 233 | } |
| 234 | 234 | ||
| 235 | STATIC int64_t | 235 | STATIC int64_t |
| 236 | writepiece_LST(uint8_t piece, uint64_t buf_size, char *buf) | 236 | writepiece_LST(uint8_t piece, size_t buf_size, char buf[buf_size]) |
| 237 | { | 237 | { |
| 238 | char digits[3]; | 238 | char digits[3]; |
| 239 | uint64_t i, len; | 239 | size_t i, len; |
| 240 | 240 | ||
| 241 | if (piece > 99 || buf_size < 3) | 241 | if (piece > 99 || buf_size < 3) |
| 242 | return 0; | 242 | return 0; |
| @@ -263,7 +263,7 @@ writepiece_LST(uint8_t piece, uint64_t buf_size, char *buf) | |||
| 263 | } | 263 | } |
| 264 | 264 | ||
| 265 | STATIC int64_t | 265 | STATIC int64_t |
| 266 | writecube_B32(cube_t cube, uint64_t buf_size, char *buf) | 266 | writecube_B32(cube_t cube, size_t buf_size, char buf[buf_size]) |
| 267 | { | 267 | { |
| 268 | int i; | 268 | int i; |
| 269 | uint8_t corner[8], edge[12]; | 269 | uint8_t corner[8], edge[12]; |
| @@ -291,7 +291,7 @@ writecube_B32(cube_t cube, uint64_t buf_size, char *buf) | |||
| 291 | } | 291 | } |
| 292 | 292 | ||
| 293 | STATIC int64_t | 293 | STATIC int64_t |
| 294 | writecube_H48(cube_t cube, uint64_t buf_size, char *buf) | 294 | writecube_H48(cube_t cube, size_t buf_size, char buf[buf_size]) |
| 295 | { | 295 | { |
| 296 | uint8_t piece, perm, orient, corner[8], edge[12]; | 296 | uint8_t piece, perm, orient, corner[8], edge[12]; |
| 297 | int i; | 297 | int i; |
| @@ -331,7 +331,7 @@ writecube_H48(cube_t cube, uint64_t buf_size, char *buf) | |||
| 331 | } | 331 | } |
| 332 | 332 | ||
| 333 | STATIC int64_t | 333 | STATIC int64_t |
| 334 | writecube_LST(cube_t cube, uint64_t buf_size, char *buf) | 334 | writecube_LST(cube_t cube, size_t buf_size, char buf[buf_size]) |
| 335 | { | 335 | { |
| 336 | int i; | 336 | int i; |
| 337 | uint64_t ptr; | 337 | uint64_t ptr; |
