diff options
| author | oy <Tom_Adams@web.de> | 2011-03-28 22:08:52 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-03-28 22:08:52 +0200 |
| commit | 9d930e15f8b0da420bc0695f1dc430328344e935 (patch) | |
| tree | b76918d696dedd42b885a878f4d1a239945a66c7 | |
| parent | 867f9444593f414e0d73b6e85f341f49b0b3aad5 (diff) | |
| download | zcatch-9d930e15f8b0da420bc0695f1dc430328344e935.tar.gz zcatch-9d930e15f8b0da420bc0695f1dc430328344e935.zip | |
fixed some compiler warnings
| -rw-r--r-- | src/base/system.c | 15 | ||||
| -rw-r--r-- | src/engine/shared/demo.cpp | 5 |
2 files changed, 12 insertions, 8 deletions
diff --git a/src/base/system.c b/src/base/system.c index d4c81cf4..ef3a38bf 100644 --- a/src/base/system.c +++ b/src/base/system.c @@ -710,16 +710,19 @@ int net_addr_from_str(NETADDR *addr, const char *string) /* ipv6 */ struct sockaddr_in6 sa6; char buf[128]; - int i, size; + int i; for(i = 0; i < 127 && str[i] && str[i] != ']'; i++) buf[i] = str[i]; buf[i] = 0; str += i; #if defined(CONF_FAMILY_WINDOWS) - sa6.sin6_family = AF_INET6; - size = (int)sizeof(sa6); - if(WSAStringToAddress(buf, AF_INET6, NULL, (struct sockaddr *)&sa6, &size) != 0) - return -1; + { + int size; + sa6.sin6_family = AF_INET6; + size = (int)sizeof(sa6); + if(WSAStringToAddress(buf, AF_INET6, NULL, (struct sockaddr *)&sa6, &size) != 0) + return -1; + } #else if(inet_pton(AF_INET6, buf, &sa6) != 1) return -1; @@ -1112,7 +1115,7 @@ int net_tcp_connect(NETSOCKET sock, const NETADDR *a) int net_tcp_connect_non_blocking(NETSOCKET sock, const NETADDR *a) { - struct sockaddr addr; + /* struct sockaddr addr; */ int res = 0; /* diff --git a/src/engine/shared/demo.cpp b/src/engine/shared/demo.cpp index ab0b2c91..1eb33696 100644 --- a/src/engine/shared/demo.cpp +++ b/src/engine/shared/demo.cpp @@ -583,10 +583,11 @@ int CDemoPlayer::Load(class IStorage *pStorage, class IConsole *pConsole, const // get demo type if(!str_comp(m_Info.m_Header.m_aType, "client")) - m_DemoType = DEMOTYPE_CLIENT; + m_DemoType = DEMOTYPE_CLIENT; else if(!str_comp(m_Info.m_Header.m_aType, "server")) m_DemoType = DEMOTYPE_SERVER; - else DEMOTYPE_INVALID; + else + m_DemoType = DEMOTYPE_INVALID; // read map int MapSize = (m_Info.m_Header.m_aMapSize[0]<<24) | (m_Info.m_Header.m_aMapSize[1]<<16) | (m_Info.m_Header.m_aMapSize[2]<<8) | (m_Info.m_Header.m_aMapSize[3]); |