home
·
contact
·
privacy
projects
/
plomrogue
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a1b7e56
)
Use preprocessor macro instead of constant variable for uchar size.
author
Christian Heller
<c.heller@plomlompom.de>
Thu, 20 Jun 2013 01:39:37 +0000
(
03:39
+0200)
committer
Christian Heller
<c.heller@plomlompom.de>
Thu, 20 Jun 2013 01:39:37 +0000
(
03:39
+0200)
src/readwrite.c
patch
|
blob
|
history
diff --git
a/src/readwrite.c
b/src/readwrite.c
index ed5a3a3180f990ec8af3c001a44c85c557a3f80e..fd520685a935f978584851feaaf69a51878de802 100644
(file)
--- a/
src/readwrite.c
+++ b/
src/readwrite.c
@@
-1,40
+1,36
@@
#include <stdio.h>
#include <limits.h>
#include <stdint.h>
#include <stdio.h>
#include <limits.h>
#include <stdint.h>
+#define UCHARSIZE (UCHAR_MAX + 1)
uint16_t read_uint16_bigendian(FILE * file) {
// Read uint16 from file in big-endian order.
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);
unsigned char a = fgetc(file);
unsigned char b = fgetc(file);
- return (a *
nchar
) + b; }
+ return (a *
UCHARSIZE
) + b; }
void write_uint16_bigendian(uint16_t x, FILE * file) {
// Write uint16 to file in beg-endian order.
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 / UCHARSIZE;
+ unsigned char b = x % UCHARSIZE;
fputc(a, file);
fputc(b, file); }
uint32_t read_uint32_bigendian(FILE * file) {
// Read uint32 from file in big-endian order.
fputc(a, file);
fputc(b, file); }
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);
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 *
UCHARSIZE * UCHARSIZE * UCHARSIZE) + (b * UCHARSIZE * UCHARSIZE) + (c * UCHARSIZE
) + d; }
void write_uint32_bigendian(uint32_t x, FILE * file) {
// Write uint32 to file in beg-endian order.
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 / (UCHARSIZE * UCHARSIZE * UCHARSIZE);
+ unsigned char b = (x - (a * UCHARSIZE * UCHARSIZE * UCHARSIZE)) / (UCHARSIZE * UCHARSIZE);
+ unsigned char c = (x - ((a * UCHARSIZE * UCHARSIZE * UCHARSIZE) + (b * UCHARSIZE * UCHARSIZE))) / UCHARSIZE;
+ unsigned char d = x % UCHARSIZE;
fputc(a, file);
fputc(b, file);
fputc(c, file);
fputc(d, file); }
fputc(a, file);
fputc(b, file);
fputc(c, file);
fputc(d, file); }
-