Skip to content

Commit 17cd373

Browse files
committed
Changed indentation
1 parent eb3be39 commit 17cd373

File tree

2 files changed

+33
-31
lines changed

2 files changed

+33
-31
lines changed

src/include/reb-ext.h

+29-28
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
** REBOL [R3] Language Interpreter and Run-time Environment
44
**
55
** Copyright 2012 REBOL Technologies
6+
** Copyright 2012-2023 Rebol Open Source Developers
67
** REBOL is a trademark of REBOL Technologies
78
**
89
** Licensed under the Apache License, Version 2.0 (the "License");
@@ -118,35 +119,35 @@ typedef int (*RXICAL)(int cmd, RXIFRM *args, REBCEC *ctx);
118119
#pragma pack()
119120

120121
// Access macros (indirect access via RXIFRM pointer):
121-
#define RXA_ARG(f,n) ((f)->args[n])
122-
#define RXA_COUNT(f) (RXA_ARG(f,0).bytes[0]) // number of args
123-
#define RXA_TYPE(f,n) (RXA_ARG(f,0).bytes[n]) // types (of first 7 args)
124-
#define RXA_REF(f,n) (RXA_ARG(f,n).int32a)
125-
126-
#define RXA_INT64(f,n) (RXA_ARG(f,n).int64)
127-
#define RXA_INT32(f,n) (i32)(RXA_ARG(f,n).int64)
128-
#define RXA_DEC64(f,n) (RXA_ARG(f,n).dec64)
129-
#define RXA_LOGIC(f,n) (RXA_ARG(f,n).int32a)
130-
#define RXA_CHAR(f,n) (RXA_ARG(f,n).int32a)
131-
#define RXA_TIME(f,n) (RXA_ARG(f,n).int64)
132-
#define RXA_DATE(f,n) (RXA_ARG(f,n).int32a)
133-
#define RXA_WORD(f,n) (RXA_ARG(f,n).int32a)
134-
#define RXA_PAIR(f,n) (RXA_ARG(f,n).pair)
135-
#define RXA_TUPLE(f,n) (RXA_ARG(f,n).tuple_bytes)
136-
#define RXA_TUPLE_LEN(f,n) (RXA_ARG(f,n).tuple_len)
137-
#define RXA_SERIES(f,n) (RXA_ARG(f,n).series)
138-
#define RXA_INDEX(f,n) (RXA_ARG(f,n).index)
139-
#define RXA_OBJECT(f,n) (RXA_ARG(f,n).addr)
140-
#define RXA_MODULE(f,n) (RXA_ARG(f,n).addr)
141-
#define RXA_HANDLE(f,n) (RXA_ARG(f,n).handle.ptr)
122+
#define RXA_ARG(f,n) ((f)->args[n])
123+
#define RXA_COUNT(f) (RXA_ARG(f,0).bytes[0]) // number of args
124+
#define RXA_TYPE(f,n) (RXA_ARG(f,0).bytes[n]) // types (of first 7 args)
125+
#define RXA_REF(f,n) (RXA_ARG(f,n).int32a)
126+
127+
#define RXA_INT64(f,n) (RXA_ARG(f,n).int64)
128+
#define RXA_INT32(f,n) (i32)(RXA_ARG(f,n).int64)
129+
#define RXA_DEC64(f,n) (RXA_ARG(f,n).dec64)
130+
#define RXA_LOGIC(f,n) (RXA_ARG(f,n).int32a)
131+
#define RXA_CHAR(f,n) (RXA_ARG(f,n).int32a)
132+
#define RXA_TIME(f,n) (RXA_ARG(f,n).int64)
133+
#define RXA_DATE(f,n) (RXA_ARG(f,n).int32a)
134+
#define RXA_WORD(f,n) (RXA_ARG(f,n).int32a)
135+
#define RXA_PAIR(f,n) (RXA_ARG(f,n).pair)
136+
#define RXA_TUPLE(f,n) (RXA_ARG(f,n).tuple_bytes)
137+
#define RXA_TUPLE_LEN(f,n) (RXA_ARG(f,n).tuple_len)
138+
#define RXA_SERIES(f,n) (RXA_ARG(f,n).series)
139+
#define RXA_INDEX(f,n) (RXA_ARG(f,n).index)
140+
#define RXA_OBJECT(f,n) (RXA_ARG(f,n).addr)
141+
#define RXA_MODULE(f,n) (RXA_ARG(f,n).addr)
142+
#define RXA_HANDLE(f,n) (RXA_ARG(f,n).handle.ptr)
142143
#define RXA_HANDLE_CONTEXT(f,n) (RXA_ARG(f,n).handle.hob)
143-
#define RXA_HANDLE_TYPE(f,n) (RXA_ARG(f,n).handle.type)
144-
#define RXA_HANDLE_FLAGS(f,n) (RXA_ARG(f,n).handle.flags)
145-
#define RXA_HANDLE_INDEX(f,n) (RXA_ARG(f,n).handle.index)
146-
#define RXA_IMAGE(f,n) (RXA_ARG(f,n).image)
147-
#define RXA_IMAGE_BITS(f,n) ((REBYTE *)RL_SERIES((RXA_ARG(f,n).image), RXI_SER_DATA))
148-
#define RXA_IMAGE_WIDTH(f,n) (RXA_ARG(f,n).width)
149-
#define RXA_IMAGE_HEIGHT(f,n) (RXA_ARG(f,n).height)
144+
#define RXA_HANDLE_TYPE(f,n) (RXA_ARG(f,n).handle.type)
145+
#define RXA_HANDLE_FLAGS(f,n) (RXA_ARG(f,n).handle.flags)
146+
#define RXA_HANDLE_INDEX(f,n) (RXA_ARG(f,n).handle.index)
147+
#define RXA_IMAGE(f,n) (RXA_ARG(f,n).image)
148+
#define RXA_IMAGE_BITS(f,n) ((REBYTE *)RL_SERIES((RXA_ARG(f,n).image), RXI_SER_DATA))
149+
#define RXA_IMAGE_WIDTH(f,n) (RXA_ARG(f,n).width)
150+
#define RXA_IMAGE_HEIGHT(f,n) (RXA_ARG(f,n).height)
150151

151152
// Command function return values:
152153
enum rxi_return {

src/os/host-ext-test.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,9 @@ REBCNT Test_Async_Callback(REBSER *obj, REBCNT word)
175175
// These cannot be on the stack, because they are used
176176
// when the callback happens later.
177177
cbi = MAKE_NEW(*cbi);
178-
CLEAR(cbi, sizeof(cbi));
179178
args = MAKE_MEM(sizeof(RXIARG) * 4);
179+
if (!cbi || !args) return 0; // silent compiler's warnings
180+
CLEAR(cbi, sizeof(cbi));
180181
CLEAR(args, sizeof(RXIARG) * 4);
181182
cbi->obj = obj;
182183
cbi->word = word;
@@ -195,7 +196,7 @@ REBCNT Test_Async_Callback(REBSER *obj, REBCNT word)
195196
}
196197

197198
RXIEXT int RX_Call(int cmd, RXIFRM *frm, void *ctx) {
198-
REBYTE *str;
199+
REBYTE *str = NULL;
199200

200201
//printf("Context ptr: %p\n", ctx);
201202

@@ -306,7 +307,7 @@ RXIEXT int RX_Call(int cmd, RXIFRM *frm, void *ctx) {
306307
REBSER *blk = RXA_SERIES(frm, 1);
307308
REBCNT n, type;
308309
RXIARG val;
309-
printf("\nBlock with %lu values:\n", RL_SERIES(blk, RXI_SER_TAIL));
310+
printf("\nBlock with %i values:\n", RL_SERIES(blk, RXI_SER_TAIL));
310311
for(n = 0; (type = RL_GET_VALUE(blk, n, &val)); n++) {
311312
if(type == RXT_END) break;
312313
printf("\t%i -> %i\n", n, type);

0 commit comments

Comments
 (0)