vstudio: lyra warning fixes + project dups

noisyjack · Aug 22, 2015 · e441475 · e441475
1 parent e3548f4
commit e441475
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/ccminer.vcxproj b/ccminer.vcxproj
@@ -493,12 +493,6 @@
     <CudaCompile Include="x17\cuda_x17_sha512.cu">
       <MaxRegCount>80</MaxRegCount>
     </CudaCompile>
-    <CudaCompile Include="x15\x14.cu">
-    </CudaCompile>
-    <CudaCompile Include="x15\x15.cu">
-    </CudaCompile>
-    <CudaCompile Include="x17\x17.cu">
-    </CudaCompile>
   </ItemGroup>
   <ItemGroup>
     <Image Include="res\ccminer.ico" />

diff --git a/lyra2/Lyra2.c b/lyra2/Lyra2.c
@@ -66,12 +66,12 @@ int LYRA2(void *K, int64_t kLen, const void *pwd, int32_t pwdlen, const void *sa
 	// for Lyra2REv2, nCols = 4, v1 was using 8
 	const int64_t BLOCK_LEN = (nCols == 4) ? BLOCK_LEN_BLAKE2_SAFE_INT64 : BLOCK_LEN_BLAKE2_SAFE_BYTES;
 
-	i = (int64_t)ROW_LEN_BYTES * nRows;
-	uint64_t *wholeMatrix = malloc(i);
+	size_t sz = (size_t)ROW_LEN_BYTES * nRows;
+	uint64_t *wholeMatrix = malloc(sz);
 	if (wholeMatrix == NULL) {
 		return -1;
 	}
-	memset(wholeMatrix, 0, i);
+	memset(wholeMatrix, 0, sz);
 
 	//Allocates pointers to each row of the matrix
 	uint64_t **memMatrix = malloc(sizeof(uint64_t*) * nRows);
@@ -103,7 +103,7 @@ int LYRA2(void *K, int64_t kLen, const void *pwd, int32_t pwdlen, const void *sa
 	memcpy(ptrByte, salt, saltlen);
 	ptrByte += saltlen;
 
-	memset(ptrByte, 0, nBlocksInput * BLOCK_LEN_BLAKE2_SAFE_BYTES - (saltlen + pwdlen));
+	memset(ptrByte, 0, (size_t) (nBlocksInput * BLOCK_LEN_BLAKE2_SAFE_BYTES - (saltlen + pwdlen)));
 
 	//Concatenates the basil: every integer passed as parameter, in the order they are provided by the interface
 	memcpy(ptrByte, &kLen, sizeof(int64_t));