Merge pull request #9 from Oldes/cast

FIX: fighting with Clang warnings

Author: Oldes

src/core/a-constants.c

@@ -88,7 +88,7 @@ const REBYTE Month_Lengths[12] = {
 	31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
 };
 
-const REBYTE * const Month_Names[12] = {
+const REBYTE * Month_Names[12] = {
 	BP"January",	BP"February", BP"March",
 	BP"April",	BP"May",		 BP"June",
 	BP"July",	BP"August",	 BP"September",

src/core/a-lib.c

@@ -677,11 +677,9 @@ RL_API REBYTE *RL_Word_String(u32 word)
 */
 {
 	REBYTE *s1, *s2;
-	// !!This code should use a function from c-words.c (but nothing perfect yet.)
-	if (word == 0 || word >= PG_Word_Table.series->tail) return 0;
-	s1 = VAL_SYM_NAME(BLK_SKIP(PG_Word_Table.series, word));
-	s2 = OS_MAKE(strlen(s1));
-	strcpy(s2, s1);
+	s1 = Get_Sym_Name(word);
+	s2 = OS_MAKE(strlen(cs_cast(s1)));
+	strcpy(s_cast(s2), cs_cast(s1));
 	return s2;
 }
 

src/core/b-init.c

@@ -114,7 +114,7 @@ extern const REBYTE Str_Banner[];
 ***********************************************************************/
 {
 	if (rargs->options & RO_VERS) {
-		Debug_Fmt((REBYTE*)Str_Banner, REBOL_VER, REBOL_REV, REBOL_UPD, REBOL_SYS, REBOL_VAR);
+		Debug_Fmt(Str_Banner, REBOL_VER, REBOL_REV, REBOL_UPD, REBOL_SYS, REBOL_VAR);
 		OS_EXIT(0);
 	}
 }
@@ -179,7 +179,7 @@ extern const REBYTE Str_Banner[];
 		Free_Series(text);
 	}
 
-	Set_Root_Series(ROOT_BOOT, boot, "boot block");	// Do not let it get GC'd
+	Set_Root_Series(ROOT_BOOT, boot, cb_cast("boot block"));	// Do not let it get GC'd
 
 	Boot_Block = (BOOT_BLK *)VAL_BLK(BLK_HEAD(boot));
 
@@ -200,9 +200,9 @@ extern const REBYTE Str_Banner[];
 		}
 	}
 
-	ASSERT(!CMP_BYTES("end!", Get_Sym_Name(SYM_END_TYPE)), RP_BAD_END_CANON_WORD);
-	ASSERT(!CMP_BYTES("true", Get_Sym_Name(SYM_TRUE)), RP_BAD_TRUE_CANON_WORD);
-	ASSERT(!CMP_BYTES("line", BOOT_STR(RS_SCAN,1)), RP_BAD_BOOT_STRING);
+	ASSERT(!CMP_BYTES(cb_cast("end!"), Get_Sym_Name(SYM_END_TYPE)), RP_BAD_END_CANON_WORD);
+	ASSERT(!CMP_BYTES(cb_cast("true"), Get_Sym_Name(SYM_TRUE)), RP_BAD_TRUE_CANON_WORD);
+	ASSERT(!CMP_BYTES(cb_cast("line"), BOOT_STR(RS_SCAN,1)), RP_BAD_BOOT_STRING);
 }
 
 
@@ -463,7 +463,7 @@ extern const REBYTE Str_Banner[];
 ***********************************************************************/
 {
 	DS_Series = Make_Block(size);
-	Set_Root_Series(TASK_STACK, DS_Series, "data stack"); // uses special GC
+	Set_Root_Series(TASK_STACK, DS_Series, cb_cast("data stack")); // uses special GC
 	DS_Base = BLK_HEAD(DS_Series);
 	DSP = DSF = 0;
 	SET_NONE(DS_TOP); // avoids it being set to END (GC problem)
@@ -509,7 +509,7 @@ extern const REBYTE Str_Banner[];
 
 /***********************************************************************
 **
-*/	void Set_Root_Series(REBVAL *value, REBSER *ser, REBYTE *label)
+*/	void Set_Root_Series(REBVAL *value, REBSER *ser, const REBYTE *label)
 /*
 **		Used to set block and string values in the ROOT context.
 **
@@ -699,14 +699,14 @@ extern const REBYTE Str_Banner[];
 
 /***********************************************************************
 **
-*/	void Register_Codec(REBYTE *name, codo dispatcher)
+*/	void Register_Codec(const char *name, codo dispatcher)
 /*
 **		Internal function for adding a codec.
 **
 ***********************************************************************/
 {
 	REBVAL *value = Get_System(SYS_CODECS, 0);
-	REBCNT sym = Make_Word(name, 0);
+	REBCNT sym = Make_Word(cb_cast(name), 0);
 
 	value = Append_Frame(VAL_OBJ_FRAME(value), 0, sym);
 	SET_HANDLE(value, dispatcher);
@@ -719,8 +719,8 @@ extern const REBYTE Str_Banner[];
 /*
 ***********************************************************************/
 {
-	Register_Codec((REBYTE*)"text", Codec_Text);
-	Register_Codec((REBYTE*)"markup", Codec_Markup);
+	Register_Codec("text", Codec_Text);
+	Register_Codec("markup", Codec_Markup);
 #ifdef USE_BMP_CODEC
 	Init_BMP_Codec();
 #endif

src/core/c-error.c

@@ -680,7 +680,7 @@ static REBOL_STATE Top_State; // Boot var: holds error state during boot
 	errs = Construct_Object(0, VAL_BLK(errors), 0);
 	Set_Object(Get_System(SYS_CATALOG, CAT_ERRORS), errs);
 
-	Set_Root_Series(TASK_ERR_TEMPS, Make_Block(3), "task errors");
+	Set_Root_Series(TASK_ERR_TEMPS, Make_Block(3), cb_cast("task errors"));
 
 	// Create objects for all error types:
 	for (val = BLK_SKIP(errs, 1); NOT_END(val); val++) {

src/core/c-frame.c

@@ -100,7 +100,7 @@
 	//Debug_Fmt("Bind Table (Size: %d)", SERIES_TAIL(Bind_Table));
 	for (n = 0; n < SERIES_TAIL(Bind_Table); n++) {
 		if (binds[n]) {
-			Debug_Fmt("Bind table fault: %3d to %3d (%s)", n, binds[n], Get_Sym_Name(n));
+			Debug_Fmt(cb_cast("Bind table fault: %3d to %3d (%s)"), n, binds[n], Get_Sym_Name(n));
 		}
 	}
 }
@@ -1395,12 +1395,12 @@
 
 	for (n = 0; n < tail; n++, values++, words++) {
 		if (IS_END(words) || IS_END(values)) {
-			Debug_Fmt("** Early %s end at index: %d", IS_END(words) ? "words" : "values", n);
+			Debug_Fmt(cb_cast("** Early %s end at index: %d"), IS_END(words) ? "words" : "values", n);
 		}
 	}
 
 	if (NOT_END(words) || NOT_END(values))
-		Debug_Fmt("** Missing %s end at index: %d type: %d", NOT_END(words) ? "words" : "values", n, VAL_TYPE(words));
+		Debug_Fmt(cb_cast("** Missing %s end at index: %d type: %d"), NOT_END(words) ? "words" : "values", n, VAL_TYPE(words));
 }
 
 
@@ -1411,5 +1411,5 @@
 ***********************************************************************/
 {
 	// Temporary block used while scanning for frame words:
-	Set_Root_Series(TASK_BUF_WORDS, Make_Block(100), "word cache"); // just holds words, no GC
+	Set_Root_Series(TASK_BUF_WORDS, Make_Block(100), cb_cast("word cache")); // just holds words, no GC
 }

src/core/c-port.c

@@ -207,11 +207,12 @@
 	REBINT result;
 	REBCNT wt = 1;
 	REBCNT res = (timeout >= 1000) ? 0 : 16;  // OS dependent?
-	REBCNT old_time = -1;
+	REBINT old_time = -1;
 
 	while (wt) {
 		if (GET_SIGNAL(SIG_ESCAPE)) {
 			CLR_SIGNAL(SIG_ESCAPE);
+			Out_Str(cb_cast("[ESC]"), 1);
 			Halt_Code(RE_HALT, 0); // Throws!
 		}
 
@@ -235,12 +236,13 @@
 			if (old_time >= 0
 				&& time - old_time < res) {
 				res = time - old_time;
+				// printf("=== res: %u old_time: %i time: %u \n", res, old_time, time);
 			}
 
 			old_time = time;
 		}
 
-		//printf("%d %d %d\n", dt, time, timeout);
+		// printf("base: %ull res: %u wt: %u old_time: %i time: %u timeout: %u\n", base, res, wt, old_time, time, timeout);
 
 		// Wait for events or time to expire:
 		//Debug_Num("OSW", wt);

src/core/c-word.c

@@ -170,7 +170,7 @@
 
 /***********************************************************************
 **
-*/	static REBCNT Make_Word_Name(REBYTE *str, REBCNT len)
+*/	static REBCNT Make_Word_Name(const REBYTE *str, REBCNT len)
 /*
 **		Allocates and copies the text string of the word.
 **
@@ -186,7 +186,7 @@
 
 /***********************************************************************
 **
-*/	REBCNT Make_Word(REBYTE *str, REBCNT len)
+*/	REBCNT Make_Word(const REBYTE *str, REBCNT len)
 /*
 **		Given a string and its length, compute its hash value,
 **		search for a match, and if not found, add it to the table.

src/core/d-crash.c

@@ -78,9 +78,9 @@ enum Crash_Msg_Nums {
 
 	// "REBOL PANIC #nnn:"
 	COPY_BYTES(buf, Crash_Msgs[CM_ERROR], CRASH_BUF_SIZE);
-	APPEND_BYTES(buf, " #", CRASH_BUF_SIZE);
+	APPEND_BYTES(buf, cb_cast(" #"), CRASH_BUF_SIZE);
 	Form_Int(buf + LEN_BYTES(buf), id);
-	APPEND_BYTES(buf, ": ", CRASH_BUF_SIZE);
+	APPEND_BYTES(buf, cb_cast(": "), CRASH_BUF_SIZE);
 
 	// "REBOL PANIC #nnn: put error message here"
 	// The first few error types only print general error message.

src/core/d-dump.c

@@ -33,7 +33,7 @@
 
 /***********************************************************************
 **
-*/	void Dump_Series(REBSER *series, REBYTE *memo)
+*/	void Dump_Series(REBSER *series, const char *memo)
 /*
 ***********************************************************************/
 {
@@ -100,7 +100,7 @@
 		for (tp = str; *tp;) *cp++ = *tp++;
 
 		*cp = 0;
-		Debug_Str(buf);
+		Debug_Str(cs_cast(buf));
 		if (cnt >= limit) break;
 		cp = buf;
 	}
@@ -119,7 +119,7 @@
 	REBYTE *cp;
 	REBCNT l, n;
 	REBCNT *bp = (REBCNT*)vp;
-	REBYTE *type;
+	const REBYTE *type;
 
 	cp = buf;
 	for (l = 0; l < count; l++) {
@@ -141,12 +141,12 @@
 		}
 		n = 0;
 		if (IS_WORD((REBVAL*)val) || IS_GET_WORD((REBVAL*)val) || IS_SET_WORD((REBVAL*)val)) {
-			char * name = Get_Word_Name((REBVAL*)val);
-			n = snprintf(cp, sizeof(buf) - (cp - buf), " (%s)", name);
+			const char * name = cs_cast(Get_Word_Name((REBVAL*)val));
+			n = snprintf(s_cast(cp), sizeof(buf) - (cp - buf), " (%s)", name);
 		}
 
 		*(cp + n) = 0;
-		Debug_Str(buf);
+		Debug_Str(s_cast(buf));
 		cp = buf;
 	}
 }
@@ -377,7 +377,7 @@ xx*/	void Dump_Bind_Table()
 			args = BLK_HEAD(VAL_FUNC_ARGS(DSF_FUNC(dsf)));
 			m = SERIES_TAIL(VAL_FUNC_ARGS(DSF_FUNC(dsf)));
 			for (n = 1; n < m; n++)
-				Debug_Fmt("\t%s: %72r", Get_Word_Name(args+n), DSF_ARGS(dsf, n));
+				Debug_Fmt(cb_cast("\t%s: %72r"), Get_Word_Name(args+n), DSF_ARGS(dsf, n));
 		}
 		//Debug_Fmt(Str_Stack[2], PRIOR_DSF(dsf));
 		if (PRIOR_DSF(dsf) > 0) Dump_Stack(PRIOR_DSF(dsf), dsf-1);