X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Freadwrite.c;h=9f089ea34da821394313b4b81835f5e10ed158c0;hb=2653efdf1ee13bae3357e0c2964b77588d95b27b;hp=ed5a3a3180f990ec8af3c001a44c85c557a3f80e;hpb=e9d8b1aca776341c9cdaa2ea6406336661d82a76;p=plomrogue
diff --git a/src/readwrite.c b/src/readwrite.c
index ed5a3a3..9f089ea 100644
--- a/src/readwrite.c
+++ b/src/readwrite.c
@@ -2,39 +2,36 @@
#include
#include
-uint16_t read_uint16_bigendian(FILE * file) {
+static const uint16_t uchar_s = UCHAR_MAX + 1;
+
+extern uint16_t read_uint16_bigendian(FILE * file) {
// Read uint16 from file in big-endian order.
- const uint16_t nchar = UCHAR_MAX + 1;
unsigned char a = fgetc(file);
unsigned char b = fgetc(file);
- return (a * nchar) + b; }
+ return (a * uchar_s) + b; }
-void write_uint16_bigendian(uint16_t x, FILE * file) {
+extern void write_uint16_bigendian(uint16_t x, FILE * file) {
// Write uint16 to file in beg-endian order.
- const uint16_t nchar = UCHAR_MAX + 1;
- unsigned char a = x / nchar;
- unsigned char b = x % nchar;
+ unsigned char a = x / uchar_s;
+ unsigned char b = x % uchar_s;
fputc(a, file);
fputc(b, file); }
-uint32_t read_uint32_bigendian(FILE * file) {
+extern uint32_t read_uint32_bigendian(FILE * file) {
// Read uint32 from file in big-endian order.
- const uint16_t nchar = UCHAR_MAX + 1;
unsigned char a = fgetc(file);
unsigned char b = fgetc(file);
unsigned char c = fgetc(file);
unsigned char d = fgetc(file);
- return (a * nchar * nchar * nchar) + (b * nchar * nchar) + (c * nchar) + d; }
+ return (a * uchar_s * uchar_s * uchar_s) + (b * uchar_s * uchar_s) + (c * uchar_s) + d; }
-void write_uint32_bigendian(uint32_t x, FILE * file) {
+extern void write_uint32_bigendian(uint32_t x, FILE * file) {
// Write uint32 to file in beg-endian order.
- const uint16_t nchar = UCHAR_MAX + 1;
- unsigned char a = x / (nchar * nchar * nchar);
- unsigned char b = (x - (a * nchar * nchar * nchar)) / (nchar * nchar);
- unsigned char c = (x - ((a * nchar * nchar * nchar) + (b * nchar * nchar))) / nchar;
- unsigned char d = x % nchar;
+ unsigned char a = x / (uchar_s * uchar_s * uchar_s);
+ unsigned char b = (x - (a * uchar_s * uchar_s * uchar_s)) / (uchar_s * uchar_s);
+ unsigned char c = (x - ((a * uchar_s * uchar_s * uchar_s) + (b * uchar_s * uchar_s))) / uchar_s;
+ unsigned char d = x % uchar_s;
fputc(a, file);
fputc(b, file);
fputc(c, file);
fputc(d, file); }
-