Skip to content

Commit f6160f8

Browse files
committed
Resolving some of compiler's warnings
1 parent 54ddcb1 commit f6160f8

File tree

7 files changed

+22
-19
lines changed

7 files changed

+22
-19
lines changed

src/core/a-lib.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -478,9 +478,9 @@ extern int Do_Callback(REBSER *obj, u32 name, RXIARG *args, RXIARG *result);
478478
// }
479479
} else {
480480
if (VAL_ERR_NUM(top) != RE_HALT) {
481-
Put_Str(b_cast("\x1B[1;35m"));
481+
Out_Str(cb_cast("\x1B[1;35m"), 0);
482482
Out_Value(top, 640, FALSE, 0); // error FORMed
483-
Put_Str(b_cast("\x1B[0m"));
483+
Out_Str(cb_cast("\x1B[0m"), 0);
484484
// if (VAL_ERR_NUM(top) > RE_THROW_MAX) {
485485
// Out_Str("** Note: use WHY? for more about this error", 1);
486486
// }

src/core/n-loop.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,9 @@
172172
***********************************************************************/
173173
{
174174
REBVAL *result;
175-
REBDEC s;
176-
REBDEC e;
177-
REBDEC i;
175+
REBDEC s=0;
176+
REBDEC e=0;
177+
REBDEC i=0;
178178

179179
if (IS_INTEGER(start)) s = (REBDEC)VAL_INT64(start);
180180
else if (IS_DECIMAL(start) || IS_PERCENT(start)) s = VAL_DECIMAL(start);

src/core/t-date.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -787,11 +787,11 @@
787787
/*
788788
***********************************************************************/
789789
{
790-
REBI64 secs;
791-
REBDAT date;
790+
REBI64 secs = 0;
791+
REBDAT date = {0};
792792
REBINT day = 0, month = 0, year = 0, tz = 0;
793793
REBVAL *val;
794-
REBVAL *arg = NULL;
794+
REBVAL *arg = D_RET; // using D_RET to silent compiler's warnings (it's redefined if needed)
795795
REBINT num;
796796
REBVAL *spec;
797797

src/core/t-gob.c

+10-6
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,10 @@ const REBCNT Gob_Flag_Words[] = {
324324
/*
325325
***********************************************************************/
326326
{
327+
#ifdef HAS_WIDGET_GOB
327328
REBVAL *spec;
328329
REBVAL *hndl;
330+
#endif
329331

330332
switch (VAL_WORD_CANON(word)) {
331333
case SYM_OFFSET:
@@ -643,7 +645,7 @@ const REBCNT Gob_Flag_Words[] = {
643645
REBSER *ser = Make_Block(10);
644646
REBVAL *val;
645647
REBVAL *val1;
646-
REBCNT sym;
648+
REBCNT sym = 0;
647649

648650
val = Append_Value(ser);
649651
Init_Word(val, SYM_OFFSET);
@@ -693,9 +695,11 @@ const REBCNT Gob_Flag_Words[] = {
693695
sym = SYM_EFFECT;
694696
break;
695697
}
696-
Init_Word(val1, sym);
697-
VAL_SET(val1, REB_SET_WORD);
698-
Get_GOB_Var(gob, val1, val);
698+
if (sym) {
699+
Init_Word(val1, sym);
700+
VAL_SET(val1, REB_SET_WORD);
701+
Get_GOB_Var(gob, val1, val);
702+
}
699703
}
700704

701705
return ser;
@@ -781,14 +785,14 @@ const REBCNT Gob_Flag_Words[] = {
781785
arg = D_ARG(2);
782786
val = D_RET;
783787
*val = *D_ARG(1);
784-
gob = 0;
785-
788+
786789
if (IS_GOB(val)) {
787790
gob = VAL_GOB(val);
788791
index = VAL_GOB_INDEX(val);
789792
tail = GOB_PANE(gob) ? GOB_TAIL(gob) : 0;
790793
} else if (!(IS_DATATYPE(val) && action == A_MAKE)){
791794
Trap_Arg(val);
795+
return R_FALSE; // shut-up compiler's warnings
792796
}
793797

794798
// unary actions

src/core/u-compress.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ void Trap_ZStream_Error(z_stream *stream, int err, REBOOL while_compression)
181181
// Get the uncompressed size from last 4 source data bytes.
182182
if (len < 4) Trap0(RE_PAST_END); // !!! better msg needed
183183
size = cast(REBU64, Bytes_To_REBCNT(BIN_SKIP(input, len) - sizeof(REBCNT)));
184-
if (size > len * 14) Trap_Num(RE_SIZE_LIMIT, size); // check for a realistic limit
184+
if (size > (uLongf)len * 14) Trap_Num(RE_SIZE_LIMIT, size); // check for a realistic limit
185185
}
186186

187187
output = Make_Binary(size);

src/core/u-iconv.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,6 @@ static REBINT get_codepage_id(REBVAL *cp)
542542
static REBYTE* get_codepage_name(REBVAL *cp)
543543
{
544544
REBINT id, i;
545-
REBYTE *name;
546545

547546
if (IS_WORD(cp)) {
548547
return VAL_WORD_NAME(cp);
@@ -571,7 +570,7 @@ static REBYTE* get_codepage_name(REBVAL *cp)
571570
***********************************************************************/
572571
{
573572
//printf("Swap_Endianess_U16 len: %d\n", len);
574-
int i;
573+
REBCNT i;
575574
for (i = 0; i < len; ++i) {
576575
u16 num = data[i];
577576
data[i] = (num>>8) | (num<<8);

src/os/host-main.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@ void Host_Repl() {
104104

105105
#define MAX_CONT_LEVEL 1024
106106
REBYTE cont_str[] = "\x1B[1;31;49m \x1B[1;33;49m ";
107-
int cont_level = 0;
107+
REBCNT cont_level = 0;
108108
REBYTE cont_stack[MAX_CONT_LEVEL] = { 0 };
109109

110-
int input_max = 32768;
110+
REBCNT input_max = 32768;
111111
int input_len = 0;
112112
REBYTE *input = OS_Make(input_max);
113113

0 commit comments

Comments
 (0)