diff options
| author | Sebastiano Tronto <sebastiano@tronto.net> | 2025-04-21 14:33:01 +0200 |
|---|---|---|
| committer | Sebastiano Tronto <sebastiano@tronto.net> | 2025-04-21 14:44:07 +0200 |
| commit | 510a7471348788fccba6b7c4b9f7b7cc9aee6ba9 (patch) | |
| tree | 58df7791242d9a4f52e80da93ad3af20ed5e3528 /cpp | |
| parent | 1d9b8acfeece68c4f55d2499d8aed127f98a383c (diff) | |
| download | nissy-core-510a7471348788fccba6b7c4b9f7b7cc9aee6ba9.tar.gz nissy-core-510a7471348788fccba6b7c4b9f7b7cc9aee6ba9.zip | |
Always use unsigned char * for data buffers
Before this commit I was inconsistently using one of void *, char *
and uint8_t *.
Diffstat (limited to '')
| -rw-r--r-- | cpp/nissy.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/cpp/nissy.cpp b/cpp/nissy.cpp index 92b10bd..88df0f2 100644 --- a/cpp/nissy.cpp +++ b/cpp/nissy.cpp | |||
| @@ -18,11 +18,12 @@ extern "C" { | |||
| 18 | long long nissy_getcube(long long, long long, long long, long long, | 18 | long long nissy_getcube(long long, long long, long long, long long, |
| 19 | const char *, char *); | 19 | const char *, char *); |
| 20 | long long nissy_solverinfo(const char *, char *); | 20 | long long nissy_solverinfo(const char *, char *); |
| 21 | long long nissy_gendata(const char *, unsigned long long, char *); | 21 | long long nissy_gendata(const char *, unsigned long long, |
| 22 | long long nissy_checkdata(unsigned long long, const char *); | 22 | unsigned char *); |
| 23 | long long nissy_checkdata(unsigned long long, const unsigned char *); | ||
| 23 | long long nissy_solve(const char *, const char *, unsigned, unsigned, | 24 | long long nissy_solve(const char *, const char *, unsigned, unsigned, |
| 24 | unsigned, unsigned, unsigned, unsigned, unsigned long long, | 25 | unsigned, unsigned, unsigned, unsigned, unsigned long long, |
| 25 | const char *, unsigned, char *, long long *); | 26 | const unsigned char *, unsigned, char *, long long *); |
| 26 | long long nissy_countmoves(const char *); | 27 | long long nissy_countmoves(const char *); |
| 27 | long long nissy_setlogger(void (*)(const char *, void *), void *); | 28 | long long nissy_setlogger(void (*)(const char *, void *), void *); |
| 28 | } | 29 | } |
| @@ -156,7 +157,7 @@ namespace nissy { | |||
| 156 | { | 157 | { |
| 157 | data.resize(size); | 158 | data.resize(size); |
| 158 | auto err = nissy_gendata(name.c_str(), | 159 | auto err = nissy_gendata(name.c_str(), |
| 159 | size, reinterpret_cast<char *>(data.data())); | 160 | size, reinterpret_cast<unsigned char *>(data.data())); |
| 160 | return error{err}; | 161 | return error{err}; |
| 161 | } | 162 | } |
| 162 | 163 | ||
| @@ -169,7 +170,7 @@ namespace nissy { | |||
| 169 | error solver::check_data() | 170 | error solver::check_data() |
| 170 | { | 171 | { |
| 171 | auto err_value = nissy_checkdata(data.size(), | 172 | auto err_value = nissy_checkdata(data.size(), |
| 172 | reinterpret_cast<const char *>(data.data())); | 173 | reinterpret_cast<const unsigned char *>(data.data())); |
| 173 | error err{err_value}; | 174 | error err{err_value}; |
| 174 | data_checked = err.ok(); | 175 | data_checked = err.ok(); |
| 175 | return err; | 176 | return err; |
| @@ -199,7 +200,7 @@ namespace nissy { | |||
| 199 | auto err = nissy_solve(cube.to_string().c_str(), | 200 | auto err = nissy_solve(cube.to_string().c_str(), |
| 200 | name.c_str(), niss.value, minmoves, maxmoves, maxsols, | 201 | name.c_str(), niss.value, minmoves, maxmoves, maxsols, |
| 201 | optimal, threads, data.size(), | 202 | optimal, threads, data.size(), |
| 202 | reinterpret_cast<const char *>(data.data()), len, | 203 | reinterpret_cast<const unsigned char *>(data.data()), len, |
| 203 | csols.data(), result.stats.data()); | 204 | csols.data(), result.stats.data()); |
| 204 | result.err = error{err}; | 205 | result.err = error{err}; |
| 205 | 206 | ||
