Juan Lang : netapi32: Fix dead stores.
Alexandre Julliard
julliard at winehq.org
Wed Nov 19 08:35:02 CST 2008
Module: wine
Branch: master
Commit: 9f8ae26c13a32adaa85da17b71683438047a62ca
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f8ae26c13a32adaa85da17b71683438047a62ca
Author: Juan Lang <juan.lang at gmail.com>
Date: Tue Nov 18 15:44:38 2008 -0800
netapi32: Fix dead stores.
---
dlls/netapi32/nbt.c | 9 +++++----
dlls/netapi32/netbios.c | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c
index a47229c..8db87b4 100644
--- a/dlls/netapi32/nbt.c
+++ b/dlls/netapi32/nbt.c
@@ -415,10 +415,7 @@ static BOOL NetBTFindNameAnswerCallback(void *pVoid, WORD answerCount,
if (queryData->cacheEntry)
queryData->cacheEntry->numAddresses = 0;
else
- {
- ret = FALSE;
queryData->ret = NRC_OSRESNOTAV;
- }
}
if (rLen == 6 && queryData->cacheEntry &&
queryData->cacheEntry->numAddresses < answerCount)
@@ -850,8 +847,8 @@ static UCHAR NetBTAstat(void *adapt, PNCB ncb)
astat->max_sess_pkt_size = 0xffff;
astat->xmit_success = adapter->xmit_success;
astat->recv_success = adapter->recv_success;
+ ret = NRC_GOODRET;
}
- ret = NRC_GOODRET;
}
else
ret = NetBTAstatRemote(adapter, ncb);
@@ -1183,6 +1180,7 @@ static UCHAR NetBTRecv(void *adapt, void *sess, PNCB ncb)
* message header. */
NetBIOSHangupSession(ncb);
ret = NRC_SABORT;
+ goto error;
}
else if (buffer[0] != NBSS_MSG)
{
@@ -1190,6 +1188,7 @@ static UCHAR NetBTRecv(void *adapt, void *sess, PNCB ncb)
FIXME("Received unexpected session msg type %d\n", buffer[0]);
NetBIOSHangupSession(ncb);
ret = NRC_SABORT;
+ goto error;
}
else
{
@@ -1199,6 +1198,7 @@ static UCHAR NetBTRecv(void *adapt, void *sess, PNCB ncb)
FIXME("Received a message that's too long for my taste\n");
NetBIOSHangupSession(ncb);
ret = NRC_SABORT;
+ goto error;
}
else
{
@@ -1226,6 +1226,7 @@ static UCHAR NetBTRecv(void *adapt, void *sess, PNCB ncb)
adapter->recv_success++;
}
}
+error:
TRACE("returning 0x%02x\n", ret);
return ret;
}
diff --git a/dlls/netapi32/netbios.c b/dlls/netapi32/netbios.c
index a55f556..8d0de1f 100644
--- a/dlls/netapi32/netbios.c
+++ b/dlls/netapi32/netbios.c
@@ -637,7 +637,7 @@ static UCHAR nbInternalHangup(NetBIOSAdapter *adapter, NetBIOSSession *session)
EnterCriticalSection(&adapter->cs);
memset(session, 0, sizeof(NetBIOSSession));
LeaveCriticalSection(&adapter->cs);
- return NRC_GOODRET;
+ return ret;
}
static UCHAR nbHangup(NetBIOSAdapter *adapter, const NCB *ncb)
More information about the wine-cvs
mailing list