Eliminating more compiler warning on MSVC

Author: ktakashi

ext/odbc/CMakeLists.txt

@@ -11,7 +11,6 @@ ENDIF()
 
 IF (HAVE_SQL_H)
   MESSAGE(STATUS "Sagittarius supports ODBC")
-
   ADD_DEFINITIONS(-DHAVE_SQL_H)
   IF (HAVE_SQLEXT_H)
     ADD_DEFINITIONS(-DHAVE_SQLEXT_H)

ext/odbc/odbc.c

@@ -507,7 +507,7 @@ static SgObject make_blob_input_port(SQLHSTMT stmt, int index, int stringP)
 }
 
 static SgObject read_var_data_impl(SQLHSTMT stmt, int index,
-				   int len, int stringP, int asPortP)
+				   SQLLEN len, int stringP, int asPortP)
 {
   uint8_t buf[256] = {0};
   SgObject port, bv;
@@ -597,7 +597,7 @@ static SgObject timestamp_to_obj(SQL_TIMESTAMP_STRUCT *data)
 }
 
 static SgObject try_known_name_data(SgObject stmt, int index,
-				    int length, const char * name)
+				    SQLLEN length, const char * name)
 {
   /* unicode varchar is -9, but not defined in ODBC */
   if (strcmp(name, "VARCHAR2") == 0) {
@@ -622,7 +622,7 @@ static SgObject try_known_name_data(SgObject stmt, int index,
   return SG_UNDEF;		/* dummy */
 }
 
-int Sg_ColumnSize(SgObject stmt, int index)
+SQLLEN Sg_ColumnSize(SgObject stmt, int index)
 {
   SQLRETURN ret;
   SQLLEN len;
@@ -733,7 +733,7 @@ SgObject Sg_GetData(SgObject stmt, int index)
   return SG_UNDEF;
 }
 
-int Sg_RowCount(SgObject stmt)
+SQLLEN Sg_RowCount(SgObject stmt)
 {
   SQLRETURN ret;
   SQLLEN len;

ext/odbc/odbc.h

@@ -138,10 +138,10 @@ int      Sg_ExecuteDirect(SgObject stmt, SgString *text);
 int      Sg_Fetch(SgObject stmt);
 SgObject Sg_GetData(SgObject stmt, int index);
 
-int      Sg_RowCount(SgObject stmt);
+SQLLEN   Sg_RowCount(SgObject stmt);
 /* returns result column names */
 int      Sg_ColumnCount(SgObject stmt);
-int      Sg_ColumnSize(SgObject stmt, int index);
+SQLLEN   Sg_ColumnSize(SgObject stmt, int index);
 SgObject Sg_ResultColumns(SgObject stmt);
 
 /* meta information */

ext/odbc/odbc_stub.stub

@@ -64,11 +64,11 @@
 (define-c-proc get-data (stmt::<odbc-stmt> index::<fixnum>)
   (result (Sg_GetData stmt index)))
 
-(define-c-proc row-count (stmt::<odbc-stmt>) ::<fixnum>
-  (result (Sg_RowCount stmt)))
+(define-c-proc row-count (stmt::<odbc-stmt>)
+  (result (Sg_MakeIntegerFromS64 (Sg_RowCount stmt))))
 
-(define-c-proc column-size (stmt::<odbc-stmt> index::<fixnum>) ::<fixnum>
-  (result (Sg_ColumnSize stmt index)))
+(define-c-proc column-size (stmt::<odbc-stmt> index::<fixnum>)
+  (result (Sg_MakeIntegerFromS64 (Sg_ColumnSize stmt index))))
 
 (define-c-proc column-count (stmt::<odbc-stmt>) ::<fixnum>
   (result (Sg_ColumnCount stmt)))

src/geninsn

@@ -225,8 +225,8 @@ struct InsnInfoRec
   int         label;
 };
 #define INSN(o)            ((o) & INSN_MASK)
-#define INSN_VALUE1(insn) (((int)(insn)) >> INSN_VALUE1_SHIFT)
-#define INSN_VALUE2(insn) (((int)(insn)) >> INSN_VALUE2_SHIFT)
+#define INSN_VALUE1(insn) (((int)(intptr_t)(insn)) >> INSN_VALUE1_SHIFT)
+#define INSN_VALUE2(insn) (((int)(intptr_t)(insn)) >> INSN_VALUE2_SHIFT)
 #define INSN_VAL1(v, insn) ((v) = INSN_VALUE1(insn))
 #define INSN_VAL2(v1, v2, insn)	\\
   do {				\\

src/lib_core.stub

@@ -947,7 +947,7 @@
     (bv-check-literal bytevector-u16-native-set! bv)
     (bv-check-index bytevector-u16-native-set! bv index 1)
     (bv-check-value bytevector-u16-native-set! value 0 #xFFFF)
-    (Sg_ByteVectorU16NativeSet bv index value))
+    (Sg_ByteVectorU16NativeSet bv index (cast uint16_t value)))
 
   (define-c-proc bytevector-u16-ref
     (bv::<bytevector> index::<fixnum> endian::<symbol>) ::<fixnum> :constant
@@ -967,9 +967,9 @@
     (bv-check-index bytevector-u16-set! bv index 1)
     (bv-check-value bytevector-u16-set! value 0 #xFFFF)
     (cond ((SG_EQ endian 'big)
-	   (Sg_ByteVectorU16BigSet bv index value))
+	   (Sg_ByteVectorU16BigSet bv index (cast uint16_t value)))
 	  ((SG_EQ endian 'little)
-	   (Sg_ByteVectorU16LittleSet bv index value))
+	   (Sg_ByteVectorU16LittleSet bv index (cast uint16_t value)))
 	  (else
 	   (assertion-violation 'bytevector-u16-set!
 				"unsupported endianness" endian))))
@@ -987,7 +987,7 @@
     (bv-check-literal bytevector-s16-native-set! bv)
     (bv-check-index bytevector-s16-native-set! bv index 1)
     (bv-check-value bytevector-s16-native-set! value #x-8000 #x7FFF)
-    (Sg_ByteVectorS16NativeSet bv index value))
+    (Sg_ByteVectorS16NativeSet bv index (cast int16_t value)))
 
   (define-c-proc bytevector-s16-ref
     (bv::<bytevector> index::<fixnum> endian::<symbol>) ::<fixnum> :constant
@@ -1007,9 +1007,9 @@
     (bv-check-index bytevector-s16-set! bv index 1)
     (bv-check-value bytevector-s16-set! value #x-8000 #x7FFF)
     (cond ((SG_EQ endian 'big)
-	   (Sg_ByteVectorS16BigSet bv index value))
+	   (Sg_ByteVectorS16BigSet bv index (cast int16_t value)))
 	  ((SG_EQ endian 'little)
-	   (Sg_ByteVectorS16LittleSet bv index value))
+	   (Sg_ByteVectorS16LittleSet bv index (cast int16_t value)))
 	  (else
 	   (assertion-violation 'bytevector-s16-set! "unsupported endianness"
 				endian))))
@@ -1967,7 +1967,7 @@
 	     (result SG_EOF))
 	    (else
 	     (unless (== res 512)
-	       (set! (SG_BVECTOR_SIZE buf) res))
+	       (set! (SG_BVECTOR_SIZE buf) (cast long res)))
 	     (result buf)))))
 
   (define-c-proc get-bytevector-all (p::<port> :optional (reckless #f))
@@ -1981,7 +1981,7 @@
 	  (res::int64_t (Sg_ReadbAll p (& buf))))
       (if (== res 0)
 	  (result SG_EOF)
-	  (let ((r (Sg_MakeByteVectorFromU8Array buf res)))
+	  (let ((r (Sg_MakeByteVectorFromU8Array buf (cast long res))))
 	    (set! buf NULL)		; gc friendliness 
 	    (result r)))))
 
@@ -2050,7 +2050,7 @@
 		(SG_PORT_UNLOCK_READ p)
 		(if (== len count)
 		    (result buf)
-		    (result (Sg_Substring buf 0 len))))))))
+		    (result (Sg_Substring buf 0 (cast long len)))))))))
 
   (define-c-proc get-string-n!
     (p::<port> s::<string> start::<fixnum> count::<fixnum>)
@@ -2103,7 +2103,7 @@
 			((< len 1024)
 			 (when firstP 
 			   (SG_PORT_UNLOCK_READ p)
-			   (return (Sg_Substring buf 0 len)))
+			   (return (Sg_Substring buf 0 (cast long len))))
 			 (Sg_Writes out (SG_STRING_VALUE buf) len)
 			 (break))
 			(else
@@ -2287,7 +2287,7 @@
       (check-binary-port put-u8 p))
     (check-output-port put-u8 p)
     (check-fixnum-range put-u8 octet 0 255 <= <=)
-    (binary-port-write-u8-op p octet Sg_Putb))
+    (binary-port-write-u8-op p (cast uint8_t octet) Sg_Putb))
 
   (define-c-proc put-bytevector
     (p::<port> bv::<bytevector>

src/lib_fixnums.stub

@@ -149,7 +149,7 @@
 (define-cise-stmt result-fixnum
   ((_ ret who fx1 fx2)
    `(if (fixnum-fits? ,ret)
-	(result ret)
+	(result (cast long ret))
 	(implementation-restriction-violation ',who "result is not a fixnum"
 	 (SG_LIST2 (SG_MAKE_INT fx1) (SG_MAKE_INT fx2))))))
 

src/sagittarius/private/sagittariusdefs.h

@@ -329,7 +329,7 @@ typedef enum  {
 #define SG_INT_VALUE(obj)  (((long)SG_WORD(obj)) >> 2)
 #define SG_MAKE_INT(obj)   SG_OBJ((intptr_t)((long)((unsigned long)(obj) << 2) + 1))
 /* Do not use this!!! */
-#define SG_ENSURE_INT(obj) SG_OBJ((long)(obj) | 1)
+#define SG_ENSURE_INT(obj) SG_OBJ((intptr_t)((long)(intptr_t)(obj) | 1))
 #define SG_UINTP(obj)      (SG_INTP(obj)&&((long)SG_WORD(obj) >= 0))
 #define SG_INT_SIZE        (SIZEOF_LONG * 8 - 3)
 #define SG_INT_MAX         ((1L << SG_INT_SIZE) - 1)