FIX: several clang warnings fixed

Oldes · Oldes · commit 1d56a21620f6 · 2019-07-30T13:06:35.000+02:00
diff --git a/src/core/n-crypt.c b/src/core/n-crypt.c
@@ -621,7 +621,7 @@ static uECC_Curve get_ecc_curve(REBCNT curve_type) {
 
 	if (ref_init) {
 		if(!uECC_make_key(ecc->public, ecc->private, curve)) {
-			puts("failed to init ECDH key");
+			//puts("failed to init ECDH key");
 			Trap0(RE_INVALID_HANDLE); //TODO: change to something better!
 		} else return R_ARG1;
 	}
@@ -757,6 +757,7 @@ static uECC_Curve get_ecc_curve(REBCNT curve_type) {
 			return R_FALSE;
 		}
 	}
+	return R_UNSET;
 }
 
 
@@ -798,7 +799,7 @@ static uECC_Curve get_ecc_curve(REBCNT curve_type) {
 	if (IS_BINARY(val_ctx)) {
 		len = VAL_LEN(val_ctx);
 		if (!(len == 32 || len == 16)) {
-			printf("ChaCha20 key must be of size 32 or 16 bytes! Is: %i\n", len);
+			//printf("ChaCha20 key must be of size 32 or 16 bytes! Is: %i\n", len);
 			Trap1(RE_INVALID_DATA, val_ctx);
 			return R_NONE;
 		}
diff --git a/src/core/n-io.c b/src/core/n-io.c
@@ -869,7 +869,7 @@ static REBSER *Read_All_File(char *fname)
 	REBSER *blk;
 	REBSER *dir;
 
-	while (n = (REBCNT)LEN_STR(str)) {
+	while ((n = (REBCNT)LEN_STR(str))) {
 		len++;
 		str += n + 1; // next
 	}
@@ -888,7 +888,7 @@ static REBSER *Read_All_File(char *fname)
 		dir = To_REBOL_Path(str, n, -1, TRUE);
 		str += n + 1; // next
 		len = dir->tail;
-		while (n = (REBCNT)LEN_STR(str)) {
+		while ((n = (REBCNT)LEN_STR(str))) {
 			dir->tail = len;
 			Append_Uni_Uni(dir, str, n);
 			Set_Series(REB_FILE, Append_Value(blk), Copy_String(dir, 0, -1));
diff --git a/src/core/t-tuple.c b/src/core/t-tuple.c
@@ -188,7 +188,7 @@
 	REBVAL	*arg;
 	REBYTE	*vp = NULL;
 	REBYTE	*ap = NULL;
-	REBINT	len = 0;
+	REBCNT	len = 0;
 	REBINT	alen;
 	REBINT	v;
 	REBINT	a;
diff --git a/src/core/u-compress.c b/src/core/u-compress.c
@@ -82,7 +82,7 @@ void Trap_ZStream_Error(z_stream *stream, int err, REBOOL while_compression)
 {
 	REBVAL *ret = DS_RETURN;
 	if(stream->msg) {
-		REBSER* msg = Append_UTF8(NULL, cs_cast(stream->msg), cast(REBINT, strlen(stream->msg)));
+		REBSER* msg = Append_UTF8(NULL, cb_cast(stream->msg), cast(REBINT, strlen(stream->msg)));
 		SET_STRING(ret, msg);
 	} else {
 		SET_INTEGER(ret, err);
diff --git a/src/core/u-iconv.c b/src/core/u-iconv.c
@@ -518,13 +518,13 @@ static REBINT get_codepage_id(REBVAL *cp)
 
 	//printf("get_codepage_id from: %s\n", name);
 #ifdef TO_WINDOWS
-	if (_strnicmp(name, "cp", 2) == 0)
-		return atoi(name + 2); /* CP123 */
+	if (_strnicmp(cs_cast(name), "cp", 2) == 0)
+		return atoi(cs_cast(name + 2)); /* CP123 */
 	else if ('0' <= name[0] && name[0] <= '9')
-		return atoi(name);     /* 123 */
+		return atoi(cs_cast(name));     /* 123 */
 
 	for (i = 0; codepage_alias[i].name != NULL; ++i)
-		if (_stricmp(name, codepage_alias[i].name) == 0)
+		if (_stricmp(cs_cast(name), codepage_alias[i].name) == 0)
 			return codepage_alias[i].codepage;
 #else
 	if (strncasecmp(name, "cp", 2) == 0)
@@ -628,11 +628,11 @@ static REBYTE* get_codepage_name(REBVAL *cp)
 	}
 	
 	if (VAL_LEN(data) > 0) {
-		dst_len = MultiByteToWideChar(cp, 0, VAL_BIN_DATA(data), src_len, NULL, 0);
+		dst_len = MultiByteToWideChar(cp, 0, cs_cast(VAL_BIN_DATA(data)), src_len, NULL, 0);
 		if (dst_len <= 0) return R_NONE; //@@ or error?
 
 		dst_wide = Make_Series(dst_len, 2, FALSE);
-		dst_len = MultiByteToWideChar(cp, 0, VAL_BIN_DATA(data), src_len, (REBCHR*)BIN_HEAD(dst_wide), dst_len);
+		dst_len = MultiByteToWideChar(cp, 0, cs_cast(VAL_BIN_DATA(data)), src_len, (REBCHR*)BIN_HEAD(dst_wide), dst_len);
 		dst_wide->tail = dst_len;
 	} else {
 		dst_wide = Make_Series(1, 2, FALSE);
@@ -670,7 +670,7 @@ static REBYTE* get_codepage_name(REBVAL *cp)
 				if (dst_len <= 0) return R_NONE; //@@ or error?
 
 				dest = Make_Series(dst_len, 1, FALSE);
-				dst_len = WideCharToMultiByte(tp, 0, (REBCHR*)BIN_HEAD(dst_wide), dst_wide->tail, BIN_HEAD(dest), dst_len, 0, &default_char_used);
+				dst_len = WideCharToMultiByte(tp, 0, (REBCHR*)BIN_HEAD(dst_wide), dst_wide->tail, s_cast(BIN_HEAD(dest)), dst_len, 0, &default_char_used);
 				dest->tail = dst_len;
 			}
 			else {
diff --git a/src/include/reb-ext.h b/src/include/reb-ext.h
@@ -166,3 +166,6 @@ enum {
 	RXC_QUEUED,		// pending in event queue
 	RXC_DONE,		// call completed, structs can be freed
 };
+
+
+#define AS_WORD(w) RL_MAP_WORD(b_cast(w)) // may be used to awoid warning casting from char* to REBYTE*
diff --git a/src/os/host-ext-test.c b/src/os/host-ext-test.c
@@ -178,7 +178,7 @@ REBCNT Test_Async_Callback(REBSER *obj, REBCNT word)
 RXIEXT int RX_Call(int cmd, RXIFRM *frm, void *ctx) {
 	REBYTE *str;
 
-	printf("Context ptr: %08X\n", ctx);
+	printf("Context ptr: %p\n", ctx);
 
 	switch (cmd) {
 
@@ -196,7 +196,7 @@ RXIEXT int RX_Call(int cmd, RXIFRM *frm, void *ctx) {
 		break;
 
 	case 3: //command [{return system word from internal string}]
-		RXA_WORD(frm, 1) = RL_MAP_WORD("system"); //?? is frame always long enough??
+		RXA_WORD(frm, 1) = AS_WORD("system"); //?? is frame always long enough??
 		RXA_TYPE(frm, 1) = RXT_WORD;
 		break;
 
@@ -247,7 +247,7 @@ RXIEXT int RX_Call(int cmd, RXIFRM *frm, void *ctx) {
 	case 11: //command [{creates a handle}]"
 		{
 			RXA_HANDLE(frm, 1) = (void*)42;
-			RXA_HANDLE_TYPE(frm, 1) = RL_MAP_WORD("xtest");
+			RXA_HANDLE_TYPE(frm, 1) = AS_WORD("xtest");
 			RXA_TYPE(frm, 1) = RXT_HANDLE;
 		}
 		break;
@@ -270,7 +270,7 @@ RXIEXT int RX_Call(int cmd, RXIFRM *frm, void *ctx) {
 	case 14: //command [{return vector size in values (from object)} o [object!]]
 		{
 			RXIARG vec;
-			REBCNT type = RL_GET_FIELD(RXA_OBJECT(frm, 1), RL_MAP_WORD("v"), &vec);
+			REBCNT type = RL_GET_FIELD(RXA_OBJECT(frm, 1), AS_WORD("v"), &vec);
 			if(type == RXT_VECTOR) {
 				REBSER *vecs = (REBSER*)vec.series;
 				u16* data = (u16*)vecs->data;
@@ -287,8 +287,8 @@ RXIEXT int RX_Call(int cmd, RXIFRM *frm, void *ctx) {
 			REBSER *blk = RXA_SERIES(frm, 1);
 			REBCNT n, type;
 			RXIARG val;
-			printf("\nBlock with %i values:\n", RL_SERIES(blk, RXI_SER_TAIL));
-			for(n = 0; type = RL_GET_VALUE(blk, n, &val); n++) {
+			printf("\nBlock with %llu values:\n", RL_SERIES(blk, RXI_SER_TAIL));
+			for(n = 0; (type = RL_GET_VALUE(blk, n, &val)); n++) {
 				if(type == RXT_END) break;
 				printf("\t%i -> %i\n", n, type);
 			}
@@ -306,5 +306,5 @@ RXIEXT int RX_Call(int cmd, RXIFRM *frm, void *ctx) {
 
 void Init_Ext_Test(void)
 {
-	RL = RL_Extend(&RX_Spec[0], (RXICAL)&RX_Call);
+	RL = RL_Extend(b_cast(&RX_Spec[0]), (RXICAL)&RX_Call);
 }

Original file line number	Diff line number	Diff line change
`@@ -621,7 +621,7 @@ static uECC_Curve get_ecc_curve(REBCNT curve_type) {`
`621`	`621`
`622`	`622`	`if (ref_init) {`
`623`	`623`	`if(!uECC_make_key(ecc->public, ecc->private, curve)) {`
`624`		`- puts("failed to init ECDH key");`
	`624`	`+ //puts("failed to init ECDH key");`
`625`	`625`	`Trap0(RE_INVALID_HANDLE); //TODO: change to something better!`
`626`	`626`	`} else return R_ARG1;`
`627`	`627`	`}`
`@@ -757,6 +757,7 @@ static uECC_Curve get_ecc_curve(REBCNT curve_type) {`
`757`	`757`	`return R_FALSE;`
`758`	`758`	`}`
`759`	`759`	`}`
	`760`	`+ return R_UNSET;`
`760`	`761`	`}`
`761`	`762`
`762`	`763`
`@@ -798,7 +799,7 @@ static uECC_Curve get_ecc_curve(REBCNT curve_type) {`
`798`	`799`	`if (IS_BINARY(val_ctx)) {`
`799`	`800`	`len = VAL_LEN(val_ctx);`
`800`	`801`	`if (!(len == 32 \|\| len == 16)) {`
`801`		`- printf("ChaCha20 key must be of size 32 or 16 bytes! Is: %i\n", len);`
	`802`	`+ //printf("ChaCha20 key must be of size 32 or 16 bytes! Is: %i\n", len);`
`802`	`803`	`Trap1(RE_INVALID_DATA, val_ctx);`
`803`	`804`	`return R_NONE;`
`804`	`805`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ void Trap_ZStream_Error(z_stream *stream, int err, REBOOL while_compression)`
`82`	`82`	`{`
`83`	`83`	`REBVAL *ret = DS_RETURN;`
`84`	`84`	`if(stream->msg) {`
`85`		`- REBSER* msg = Append_UTF8(NULL, cs_cast(stream->msg), cast(REBINT, strlen(stream->msg)));`
	`85`	`+ REBSER* msg = Append_UTF8(NULL, cb_cast(stream->msg), cast(REBINT, strlen(stream->msg)));`
`86`	`86`	`SET_STRING(ret, msg);`
`87`	`87`	`} else {`
`88`	`88`	`SET_INTEGER(ret, err);`