comparison src/dmfile.c @ 2586:9807ae37ad69

Require stdbool.h, we require C11 now.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 08 Dec 2022 15:59:22 +0200
parents 36edd316184a
children
comparison
equal deleted inserted replaced
2585:ef6c826c5b7a 2586:9807ae37ad69
5 * (C) Copyright 2011 Tecnic Software productions (TNSP) 5 * (C) Copyright 2011 Tecnic Software productions (TNSP)
6 */ 6 */
7 #include "dmfile.h" 7 #include "dmfile.h"
8 8
9 9
10 BOOL dm_fread_str(FILE *f, void *buf, const size_t len) 10 bool dm_fread_str(FILE *f, void *buf, const size_t len)
11 { 11 {
12 return fread(buf, len, 1, f) == 1; 12 return fread(buf, len, 1, f) == 1;
13 } 13 }
14 14
15 15
16 BOOL dm_fread_byte(FILE *f, Uint8 *val) 16 bool dm_fread_byte(FILE *f, Uint8 *val)
17 { 17 {
18 int tmp = fgetc(f); 18 int tmp = fgetc(f);
19 *val = tmp; 19 *val = tmp;
20 return tmp != EOF; 20 return tmp != EOF;
21 } 21 }
22 22
23 23
24 #define DM_DEFINE_FFUNC(xname, xtype, xmacro) \ 24 #define DM_DEFINE_FFUNC(xname, xtype, xmacro) \
25 BOOL dm_fread_ ## xname (FILE *f, xtype *v) { \ 25 bool dm_fread_ ## xname (FILE *f, xtype *v) { \
26 xtype result; \ 26 xtype result; \
27 if (fread(&result, sizeof( xtype ), 1, f) != 1) \ 27 if (fread(&result, sizeof( xtype ), 1, f) != 1) \
28 return FALSE; \ 28 return false; \
29 *v = DM_ ## xmacro ## _TO_NATIVE (result); \ 29 *v = DM_ ## xmacro ## _TO_NATIVE (result); \
30 return TRUE; \ 30 return true; \
31 } 31 }
32 32
33 #include "dmfiletmpl.h" 33 #include "dmfiletmpl.h"
34 34
35 #undef DM_DEFINE_FFUNC 35 #undef DM_DEFINE_FFUNC
36 36
37 37
38 BOOL dm_fwrite_str(FILE *f, const void *buf, const size_t len) 38 bool dm_fwrite_str(FILE *f, const void *buf, const size_t len)
39 { 39 {
40 return fwrite(buf, len, 1, f) == 1; 40 return fwrite(buf, len, 1, f) == 1;
41 } 41 }
42 42
43 43
44 BOOL dm_fwrite_byte(FILE *f, const Uint8 val) 44 bool dm_fwrite_byte(FILE *f, const Uint8 val)
45 { 45 {
46 return fputc(val, f) == val; 46 return fputc(val, f) == val;
47 } 47 }
48 48
49 49
50 #define DM_DEFINE_FFUNC(xname, xtype, xmacro) \ 50 #define DM_DEFINE_FFUNC(xname, xtype, xmacro) \
51 BOOL dm_fwrite_ ## xname (FILE *f, const xtype v) { \ 51 bool dm_fwrite_ ## xname (FILE *f, const xtype v) { \
52 xtype result = DM_NATIVE_TO_ ## xmacro (v); \ 52 xtype result = DM_NATIVE_TO_ ## xmacro (v); \
53 return fwrite(&result, sizeof( xtype ), 1, f) == 1; \ 53 return fwrite(&result, sizeof( xtype ), 1, f) == 1; \
54 } 54 }
55 55
56 #include "dmfiletmpl.h" 56 #include "dmfiletmpl.h"