FIX: some of xcode warnings

Author: Oldes

src/core/t-time.c

@@ -80,7 +80,7 @@
 	REBINT	part1, part2, part3 = -1;
 	REBINT	part4 = -1;
 
-	if (*cp == '-') cp++, neg = TRUE;
+	if (*cp == '-') {cp++; neg = TRUE;}
 	else if (*cp == '+') cp++;
 
 	if (*cp == '-' || *cp == '+') return 0; // small hole: --1:23

src/core/u-bincode.c

@@ -525,7 +525,7 @@ static REBCNT EncodedU32_Size(u32 value) {
 
 					case SYM_ENCODEDU32:
 						if (IS_INTEGER(next)) {
-							count += EncodedU32_Size(VAL_INT64(next));
+							count += EncodedU32_Size(VAL_UNT32(next));
 							continue;
 						}
 						goto error;
@@ -902,12 +902,12 @@ static REBCNT EncodedU32_Size(u32 value) {
 
 					case SYM_ENCODEDU32:
 						ASSERT_U32_RANGE(next);
-						ulong = (u32)VAL_INT64(next);
+						ulong = VAL_UNT32(next);
 						if (ulong == 0) {
 							n = 1;
 							cp[0] = 0;
 						} else {
-							n = EncodedU32_Size(VAL_INT64(next));
+							n = EncodedU32_Size(VAL_UNT32(next));
 							for (u = 0; u < n-1; u++) {
 								cp[u] = (char)(128 + ((ulong >> (u * 7)) & 127));
 							}
@@ -1019,7 +1019,7 @@ static REBCNT EncodedU32_Size(u32 value) {
 		inBit = IS_OBJECT(val_ctx) ? VAL_INT32(VAL_OBJ_VALUE(val_ctx, BINCODE_READ_BITMASK)): 0;
 
 		if (IS_INTEGER(val_read)) {
-			n = VAL_INT64(val_read);
+			n = (REBCNT)VAL_INT64(val_read);
 			ASSERT_READ_SIZE(val_read, cp, ep, n);
 			if(ref_into) {
 				Trap0(RE_FEATURE_NA);
@@ -1376,7 +1376,7 @@ static REBCNT EncodedU32_Size(u32 value) {
 								VAL_SERIES(temp) = bin_new;
 								VAL_INDEX(temp) = 0;
 								if (cmd == SYM_STRING_BYTES) {
-									VAL_TAIL(temp) = strnlen(cs_cast(VAL_BIN(temp)), n);
+									VAL_TAIL(temp) = (REBCNT)strnlen(cs_cast(VAL_BIN(temp)), n);
 								}
 							}
 							break;
@@ -1387,7 +1387,7 @@ static REBCNT EncodedU32_Size(u32 value) {
 								if(bp == ep) Trap1(RE_OUT_OF_RANGE, value);
 								bp++;
 							}
-							n = bp - cp;
+							n = (REBCNT)(bp - cp);
 							VAL_SET(temp, REB_STRING);
 							bin_new = Copy_Series_Part(bin, VAL_INDEX(buffer_read), n);
 							SET_STR_END(bin_new, n);
@@ -1436,20 +1436,22 @@ static REBCNT EncodedU32_Size(u32 value) {
 							goto readNBytes;
 						case SYM_UI32BYTES:
 							ASSERT_READ_SIZE(value, cp, ep, 4);
-							n = ((u64)cp[3]      ) |
+							n = (REBCNT)(
+                                ((u64)cp[3]      ) |
 							    ((u64)cp[2] << 8 ) |
 							    ((u64)cp[1] << 16) |
-							    ((u64)cp[0] << 24) ;
+							    ((u64)cp[0] << 24));
 							ASSERT_READ_SIZE(value, cp, ep, n);
 							cp += 4;
 							VAL_INDEX(buffer_read) += 4;
 							goto readNBytes;
 						case SYM_UI32LEBYTES:
 							ASSERT_READ_SIZE(value, cp, ep, 4);
-							n = ((u64)cp[0]      ) |
+                            n = (REBCNT)(
+                                ((u64)cp[0]      ) |
 							    ((u64)cp[1] << 8 ) |
 							    ((u64)cp[2] << 16) |
-							    ((u64)cp[3] << 24) ;
+							    ((u64)cp[3] << 24));
 							ASSERT_READ_SIZE(value, cp, ep, n);
 							cp += 4;
 							VAL_INDEX(buffer_read) += 4;

src/core/u-chacha20.c

@@ -243,7 +243,6 @@ static inline void chacha_nonce(chacha20_ctx *ctx, u8 *nonce) {
 
 static inline int poly1305_generate_key(u8 *key256, u8 *nonce, u32 noncelen, u8 *poly_key, u32 counter) {
 	struct chacha20_ctx ctx;
-	u64 ctr;
 	u64 sequence = 0;
 	u32 state[16];
 	int i = 10;

src/core/u-iconv.c

@@ -527,13 +527,13 @@ static REBINT get_codepage_id(REBVAL *cp)
 		if (_stricmp(cs_cast(name), codepage_alias[i].name) == 0)
 			return codepage_alias[i].codepage;
 #else
-	if (strncasecmp(name, "cp", 2) == 0)
-		return atoi(name + 2); /* CP123 */
+	if (strncasecmp(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 (strcasecmp(name, codepage_alias[i].name) == 0)
+		if (strcasecmp(cs_cast(name), codepage_alias[i].name) == 0)
 			return codepage_alias[i].codepage;
 #endif
 	return -1;
@@ -596,11 +596,12 @@ static REBYTE* get_codepage_name(REBVAL *cp)
 	REBVAL *val_to   = D_ARG(4);
 
 	REBCNT  src_len = VAL_LEN(data);
-	REBINT  dst_len = 0;
 	REBSER *dst_wide;
-	REBSER *dest;
+	
 
 #ifdef TO_WINDOWS
+    REBINT  dst_len = 0;
+    REBSER *dest;
 	REBINT cp, tp;
 	  BOOL default_char_used;
 
@@ -717,13 +718,13 @@ static REBYTE* get_codepage_name(REBVAL *cp)
 	size_t dst_size;
 	size_t nread;
 	REBCNT tail;
-	const char *fromcode = get_codepage_name(val_from);
+	const char *fromcode = cs_cast(get_codepage_name(val_from));
 	const char *tocode;
 	int wide;
 
 	if (!fromcode) Trap1(RE_INVALID_ARG, val_from);
 	if (ref_to) {
-		tocode = get_codepage_name(val_to);
+		tocode = cs_cast(get_codepage_name(val_to));
 		if (!tocode) Trap1(RE_INVALID_ARG, val_to);
 		wide = 1; // result is raw binary series
 	} else {
@@ -756,7 +757,7 @@ static REBYTE* get_codepage_name(REBVAL *cp)
 				// There is not sufficient room at destination
 				if (SERIES_SPACE(dst_wide) < (4 * src_len)) {
 					// expand the destination series; maximum 4x of the source
-					tail = ((REBYTE*)dst - BIN_HEAD(dst_wide)) / wide;
+					tail = (REBCNT)((REBYTE*)dst - BIN_HEAD(dst_wide)) / wide;
 					SERIES_TAIL(dst_wide) = tail;
 					//printf("\n---expand delta: %d\n", src_len);
 					Expand_Series(dst_wide, tail, src_len / 2);
@@ -782,7 +783,7 @@ static REBYTE* get_codepage_name(REBVAL *cp)
 		}
 		if (src_size == 0) break;
 	}
-	SERIES_TAIL(dst_wide) = ((REBYTE*)dst - BIN_HEAD(dst_wide)) / wide;
+	SERIES_TAIL(dst_wide) = (REBCNT)((REBYTE*)dst - BIN_HEAD(dst_wide)) / wide;
 	if (ref_to) {
 		SET_BINARY(D_RET, dst_wide);
 	}
@@ -796,4 +797,4 @@ static REBYTE* get_codepage_name(REBVAL *cp)
 	return R_RET;
 #endif
 
-}
+}

src/include/reb-c.h

@@ -237,7 +237,7 @@ enum {
 typedef long (__stdcall *FUNCPTR)();
 typedef void(__cdecl *CFUNC)(void *);
 #else
-typedef long (*FUNCPTR)();
+typedef long (*FUNCPTR)(void);
 typedef void(*CFUNC)(void *);
 #endif
 

src/include/sys-value.h

@@ -135,7 +135,8 @@ typedef struct Reb_Type {
 #define NONE_VALUE		ROOT_NONEVAL
 
 #define VAL_INT32(v)	(REBINT)((v)->data.integer)
-#define VAL_INT64(v)	((v)->data.integer)
+#define VAL_INT64(v)    ((v)->data.integer)
+#define VAL_UNT32(v)    (REBCNT)((v)->data.integer)
 #define VAL_UNT64(v)	((v)->data.unteger)
 #define	SET_INTEGER(v,n) VAL_SET(v, REB_INTEGER), ((v)->data.integer) = (n)
 #define	SET_INT32(v,n)  ((v)->data.integer) = (REBINT)(n)