More trivial warning fixes.

dolphin-emu · Sep 2, 2013 · de0a5fd · de0a5fd
1 parent c08f06f
commit de0a5fd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
@@ -123,8 +123,8 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress)
 	{
 		ReturnValue = FS_RESULT_FATAL;
 
-		const u64 fileSize = file.GetSize();
-		INFO_LOG(WII_IPC_FILEIO, "FileIO: Seek Pos: 0x%08x, Mode: %i (%s, Length=0x%08llx)", SeekPosition, Mode, m_Name.c_str(), fileSize);
+		const s32 fileSize = (s32) file.GetSize();
+		INFO_LOG(WII_IPC_FILEIO, "FileIO: Seek Pos: 0x%08x, Mode: %i (%s, Length=0x%08x)", SeekPosition, Mode, m_Name.c_str(), fileSize);
 
 		switch (Mode)
 		{

diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
@@ -1090,7 +1090,7 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtlV(u32 CommandAddress)
 	u32 BufferInSize = 0, BufferInSize2 = 0, BufferInSize3 = 0;
 
 	u32 _BufferOut = 0, _BufferOut2 = 0;
-	u32 BufferOutSize = 0, BufferOutSize2 = 0;
+	u32 BufferOutSize = 0;
 
 	if (CommandBuffer.InBuffer.size() > 0)
 	{
@@ -1116,9 +1116,8 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtlV(u32 CommandAddress)
 	if (CommandBuffer.PayloadBuffer.size() > 1)
 	{
 		_BufferOut2 = CommandBuffer.PayloadBuffer.at(1).m_Address;
-		BufferOutSize2 = CommandBuffer.PayloadBuffer.at(1).m_Size;
 	}
-	
+
 	u32 param = 0, param2 = 0, param3, param4, param5 = 0;
 
 	switch (CommandBuffer.Parameter)
@@ -1134,9 +1133,9 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtlV(u32 CommandAddress)
 			param5 = Memory::Read_U32(_BufferOut+4);
 		}
 
-		INFO_LOG(WII_IPC_NET,"IOCTLV_SO_GETINTERFACEOPT(%08X, %08X) "
-			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i)",
-			param, param2,
+		INFO_LOG(WII_IPC_NET,"IOCTLV_SO_GETINTERFACEOPT(%08X, %08X, %X, %X, %X) "
+			"BufferIn: (%08x, %i), BufferIn2: (%08x, %i) ",
+			param, param2, param3, param4, param5,
 			_BufferIn, BufferInSize, _BufferIn2, BufferInSize2);
 
 		switch (param2)

diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h
@@ -480,7 +480,7 @@ class CWII_IPC_HLE_Device_net_kd_time : public IWII_IPC_HLE_Device
 		u32 result = 0;
 		u32 common_result = 0;
 		// TODO Writes stuff to /shared2/nwc24/misc.bin
-		u32 update_misc = 0;
+		//u32 update_misc = 0;
 
 		switch (Parameter)
 		{
@@ -490,12 +490,12 @@ class CWII_IPC_HLE_Device_net_kd_time : public IWII_IPC_HLE_Device
 
 		case IOCTL_NW24_SET_UNIVERSAL_TIME:
 			SetAdjustedUTC(Memory::Read_U64(BufferIn));
-			update_misc = Memory::Read_U32(BufferIn + 8);
+			//update_misc = Memory::Read_U32(BufferIn + 8);
 			break;
 
 		case IOCTL_NW24_SET_RTC_COUNTER:
 			rtc = Memory::Read_U32(BufferIn);
-			update_misc = Memory::Read_U32(BufferIn + 4);
+			//update_misc = Memory::Read_U32(BufferIn + 4);
 			break;
 
 		case IOCTL_NW24_GET_TIME_DIFF:

diff --git a/Source/Core/Core/Src/IPC_HLE/WII_Socket.cpp b/Source/Core/Core/Src/IPC_HLE/WII_Socket.cpp
@@ -518,7 +518,7 @@ void WiiSocket::update(bool read, bool write, bool except)
 			|| (it->is_ssl && ReturnValue != SSL_ERR_WAGAIN && ReturnValue != SSL_ERR_RAGAIN))
 		{
 			DEBUG_LOG(WII_IPC_NET, "IOCTL(V) Sock: %08x ioctl/v: %d returned: %d nonBlock: %d forceNonBlock: %d", 
-				fd, it->is_ssl ? it->ssl_type : it->net_type, ReturnValue, nonBlock, forceNonBlock);
+				fd, it->is_ssl ? (int) it->ssl_type : (int) it->net_type, ReturnValue, nonBlock, forceNonBlock);
 			WiiSockMan::EnqueueReply(it->_CommandAddress, ReturnValue);
 			it = pending_sockops.erase(it);
 		}
@@ -646,7 +646,7 @@ void WiiSockMan::Convert(sockaddr_in const & from, WiiSockAddrIn& to, s32 addrle
 	to.addr.addr = from.sin_addr.s_addr;
 	to.family = from.sin_family & 0xFF;
 	to.port = from.sin_port;
-	if (addrlen < 0 || addrlen > sizeof(WiiSockAddrIn))
+	if (addrlen < 0 || addrlen > (s32) sizeof(WiiSockAddrIn))
 		to.len = sizeof(WiiSockAddrIn);
 	else
 		to.len = addrlen;