From 7b3bfaf34fb0f0989a14e1d549777076a3bd8139 Mon Sep 17 00:00:00 2001 From: mbrumbelow Date: Mon, 24 Apr 2023 00:35:45 -0400 Subject: [PATCH] netfs: Removed 'result' variable Return B_NO_MEMORY on error creating volumeIDs object in VisitReadQueryRequest() and return nothing on error in ProcessQueryEvent() because the method's return value is void. Change-Id: I23c6f12258a702b6ffff667639e01fdbac928d6d Reviewed-on: https://review.haiku-os.org/c/haiku/+/6371 Reviewed-by: waddlesplash --- .../kernel/file_systems/netfs/server/ClientConnection.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/add-ons/kernel/file_systems/netfs/server/ClientConnection.cpp b/src/add-ons/kernel/file_systems/netfs/server/ClientConnection.cpp index 292f23bb90..c4a932fb56 100644 --- a/src/add-ons/kernel/file_systems/netfs/server/ClientConnection.cpp +++ b/src/add-ons/kernel/file_systems/netfs/server/ClientConnection.cpp @@ -2405,11 +2405,11 @@ ClientConnection::VisitReadQueryRequest(ReadQueryRequest* request) // create an array for the IDs of the client volumes a found entry may // reside on - status_t result = B_OK; int32 volumeCount = fVolumes->Size(); int32* volumeIDs = new(std::nothrow) int32[volumeCount]; if (!volumeIDs) - result = B_NO_MEMORY; + return B_NO_MEMORY; + ArrayDeleter volumeIDsDeleter(volumeIDs); // get the query handle @@ -2585,11 +2585,11 @@ ClientConnection::ProcessQueryEvent(NodeMonitoringEvent* event) // create an array for the IDs of the client volumes a found entry may // reside on - status_t result = B_OK; int32 volumeCount = fVolumes->Size(); int32* volumeIDs = new(std::nothrow) int32[volumeCount]; if (!volumeIDs) - result = B_NO_MEMORY; + return; + ArrayDeleter volumeIDsDeleter(volumeIDs); HasQueryPermissionClientVolumeFilter filter;