summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
a0aa8e7)
This patch removes some conversion warnings and
better describe where we are going to expect a
small integer.
Signed-off-by: Marco Costalba <mcostalba@gmail.com>
uint64_t book_color_key(const Position &pos);
uint64_t read_integer(FILE *file, int size);
uint64_t book_color_key(const Position &pos);
uint64_t read_integer(FILE *file, int size);
+ uint16_t read_small_integer(FILE *file, int size);
}
entry.key = read_integer(bookFile, 8);
}
entry.key = read_integer(bookFile, 8);
- entry.move = read_integer(bookFile, 2);
- entry.count = read_integer(bookFile, 2);
- entry.n = read_integer(bookFile, 2);
- entry.sum = read_integer(bookFile, 2);
+ entry.move = read_small_integer(bookFile, 2);
+ entry.count = read_small_integer(bookFile, 2);
+ entry.n = read_small_integer(bookFile, 2);
+ entry.sum = read_small_integer(bookFile, 2);
uint64_t read_integer(FILE *file, int size) {
uint64_t read_integer(FILE *file, int size) {
+ uint16_t read_small_integer(FILE *file, int size) {
+
+ assert(size > 0 && size <= 5); // 16 bit integer
+ uint64_t n = read_integer(file, size);
+ assert(n == (uint16_t)n);
+ return (uint16_t)n;
+ }
+