i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove 'always true' if statements (PVS 547)

Browse Source 
Change-Id: I8d50e0ca48b48e4ce5091efee65949c6d65099a3
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2057
Reviewed-by: Axel Dörfler <[email protected]>
This commit is contained in:
Zotyamester
2019-12-27 13:40:05 +00:00
committed by Axel Dörfler
parent d9e196c7f5
commit a9e97bc01f
2 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/netfs/server/ClientConnection.cpp
+7 -12
View File
@@ -955,8 +955,7 @@ ClientConnection::VisitCloseRequest(CloseRequest* request)
// no volume ID given, so this is a query handle // no volume ID given, so this is a query handle
// lock the handle // lock the handle
QueryHandle* handle = NULL; QueryHandle* handle = NULL;
if (result == B_OK) SET_ERROR(result, _LockQueryHandle(request->cookie, &handle));
SET_ERROR(result, _LockQueryHandle(request->cookie, &handle));
QueryHandleUnlocker handleUnlocker(this, handle); QueryHandleUnlocker handleUnlocker(this, handle);
// close it // close it
@@ -2366,12 +2365,10 @@ ClientConnection::VisitOpenQueryRequest(OpenQueryRequest* request)
VolumeManagerLocker managerLocker; VolumeManagerLocker managerLocker;
// open the query // open the query
status_t result = B_OK; status_t result;
QueryHandle* handle = NULL; QueryHandle* handle = NULL;
if (result == B_OK) { result = _OpenQuery(request->queryString.GetString(),
result = _OpenQuery(request->queryString.GetString(),
request->flags, request->port, request->token, &handle); request->flags, request->port, request->token, &handle);
}
QueryHandleUnlocker handleUnlocker(this, handle); QueryHandleUnlocker handleUnlocker(this, handle);
// prepare the reply // prepare the reply
@@ -2890,12 +2887,10 @@ ClientConnection::_NodeMonitoringProcessor()
ObjectDeleter<NodeMonitoringRequest> requestDeleter(request); ObjectDeleter<NodeMonitoringRequest> requestDeleter(request);
// send the request // send the request
if (error == B_OK) { error = fConnection->SendRequest(request);
error = fConnection->SendRequest(request); if (error != B_OK) {
if (error != B_OK) { ERROR(("ClientConnection::_NodeMonitoringProcessor(): "
ERROR(("ClientConnection::_NodeMonitoringProcessor(): " "Failed to send request.\n"));
"Failed to send request.\n"));
}
} }
} }
return 0; return 0;
src/add-ons/kernel/network/stack/net_socket.cpp
+3 -7
View File
@@ -1468,7 +1468,7 @@ socket_send(net_socket* socket, msghdr* header, const void* data, size_t length,
} }
// attach ancillary data to the first buffer // attach ancillary data to the first buffer
status_t status = B_OK; status_t status;
if (ancillaryData != NULL) { if (ancillaryData != NULL) {
gNetBufferModule.set_ancillary_data(buffer, ancillaryData); gNetBufferModule.set_ancillary_data(buffer, ancillaryData);
ancillaryDataDeleter.Detach(); ancillaryDataDeleter.Detach();
@@ -1481,10 +1481,7 @@ socket_send(net_socket* socket, msghdr* header, const void* data, size_t length,
memcpy(buffer->destination, address, addressLength); memcpy(buffer->destination, address, addressLength);
buffer->destination->sa_len = addressLength; buffer->destination->sa_len = addressLength;
if (status == B_OK) { status = socket->first_info->send_data(socket->first_protocol, buffer);
status = socket->first_info->send_data(socket->first_protocol,
buffer);
}
if (status != B_OK) { if (status != B_OK) {
size_t sizeAfterSend = buffer->size; size_t sizeAfterSend = buffer->size;
gNetBufferModule.free(buffer); gNetBufferModule.free(buffer);
@@ -1655,8 +1652,7 @@ socket_socketpair(int family, int type, int protocol, net_socket* sockets[2])
if (error != B_OK) if (error != B_OK)
return error; return error;
if (error == B_OK) error = socket_open(family, type, protocol, &sockets[1]);
error = socket_open(family, type, protocol, &sockets[1]);
// bind one // bind one
if (error == B_OK) if (error == B_OK)