Perform incantations so the byteptr.h macros are valid ISO C

This commit is contained in:
toaster 2022-09-05 16:49:27 +01:00
parent e9d7c2eee3
commit 9e11eff9d8

View file

@ -139,7 +139,7 @@ FUNCINLINE static ATTRINLINE UINT32 readulong(void *ptr)
#undef DEALIGNED #undef DEALIGNED
#define WRITESTRINGN(p, s, n) ({ \ #define WRITESTRINGN(p, s, n) do { \
size_t tmp_i; \ size_t tmp_i; \
\ \
for (tmp_i = 0; tmp_i < n && s[tmp_i] != '\0'; tmp_i++) \ for (tmp_i = 0; tmp_i < n && s[tmp_i] != '\0'; tmp_i++) \
@ -147,70 +147,70 @@ FUNCINLINE static ATTRINLINE UINT32 readulong(void *ptr)
\ \
if (tmp_i < n) \ if (tmp_i < n) \
WRITECHAR(p, '\0'); \ WRITECHAR(p, '\0'); \
}) } while (0)
#define WRITESTRINGL(p, s, n) ({ \ #define WRITESTRINGL(p, s, n) do { \
size_t tmp_i; \ size_t tmp_i; \
\ \
for (tmp_i = 0; tmp_i < n - 1 && s[tmp_i] != '\0'; tmp_i++) \ for (tmp_i = 0; tmp_i < n - 1 && s[tmp_i] != '\0'; tmp_i++) \
WRITECHAR(p, s[tmp_i]); \ WRITECHAR(p, s[tmp_i]); \
\ \
WRITECHAR(p, '\0'); \ WRITECHAR(p, '\0'); \
}) } while (0)
#define WRITESTRING(p, s) ({ \ #define WRITESTRING(p, s) do { \
size_t tmp_i; \ size_t tmp_i; \
\ \
for (tmp_i = 0; s[tmp_i] != '\0'; tmp_i++) \ for (tmp_i = 0; s[tmp_i] != '\0'; tmp_i++) \
WRITECHAR(p, s[tmp_i]); \ WRITECHAR(p, s[tmp_i]); \
\ \
WRITECHAR(p, '\0'); \ WRITECHAR(p, '\0'); \
}) } while (0)
#define WRITEMEM(p, s, n) ({ \ #define WRITEMEM(p, s, n) do { \
memcpy(p, s, n); \ memcpy(p, s, n); \
p += n; \ p += n; \
}) } while (0)
#define SKIPSTRING(p) while (READCHAR(p) != '\0') #define SKIPSTRING(p) while (READCHAR(p) != '\0')
#define SKIPSTRINGN(p, n) ({ \ #define SKIPSTRINGN(p, n) do { \
size_t tmp_i = 0; \ size_t tmp_i = 0; \
\ \
while (tmp_i < n && READCHAR(p) != '\0') \ while (tmp_i < n && READCHAR(p) != '\0') \
tmp_i++; \ tmp_i++; \
}) } while (0)
#define SKIPSTRINGL(p, n) SKIPSTRINGN(p, n) #define SKIPSTRINGL(p, n) SKIPSTRINGN(p, n)
#define READSTRINGN(p, s, n) ({ \ #define READSTRINGN(p, s, n) do { \
size_t tmp_i = 0; \ size_t tmp_i = 0; \
\ \
while (tmp_i < n && (s[tmp_i] = READCHAR(p)) != '\0') \ while (tmp_i < n && (s[tmp_i] = READCHAR(p)) != '\0') \
tmp_i++; \ tmp_i++; \
\ \
s[tmp_i] = '\0'; \ s[tmp_i] = '\0'; \
}) } while (0)
#define READSTRINGL(p, s, n) ({ \ #define READSTRINGL(p, s, n) do { \
size_t tmp_i = 0; \ size_t tmp_i = 0; \
\ \
while (tmp_i < n - 1 && (s[tmp_i] = READCHAR(p)) != '\0') \ while (tmp_i < n - 1 && (s[tmp_i] = READCHAR(p)) != '\0') \
tmp_i++; \ tmp_i++; \
\ \
s[tmp_i] = '\0'; \ s[tmp_i] = '\0'; \
}) } while (0)
#define READSTRING(p, s) ({ \ #define READSTRING(p, s) do { \
size_t tmp_i = 0; \ size_t tmp_i = 0; \
\ \
while ((s[tmp_i] = READCHAR(p)) != '\0') \ while ((s[tmp_i] = READCHAR(p)) != '\0') \
tmp_i++; \ tmp_i++; \
\ \
s[tmp_i] = '\0'; \ s[tmp_i] = '\0'; \
}) } while (0)
#define READMEM(p, s, n) ({ \ #define READMEM(p, s, n) do { \
memcpy(s, p, n); \ memcpy(s, p, n); \
p += n; \ p += n; \
}) } while (0)