morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 00:14:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

[c23] simplify boolean checks

Browse Source
This commit is contained in:
Armin Novak
2026-02-24 21:44:33 +01:00
parent f9ad8dd488
commit e58819830a
134 changed files with 505 additions and 944 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/proxy/channels/pf_channel_drdynvc.c
View File

@@ -434,8 +434,8 @@ static PfChannelResult DynvcTrackerHandleCreateBack(ChannelStateTracker* tracker
dynChannel->openStatus = CHANNEL_OPENSTATE_WAITING_OPEN_STATUS;
const BOOL firstPacket = (flags & CHANNEL_FLAG_FIRST) ? TRUE : FALSE;
const BOOL lastPacket = (flags & CHANNEL_FLAG_LAST) ? TRUE : FALSE;
const BOOL firstPacket = (flags & CHANNEL_FLAG_FIRST) != 0;
const BOOL lastPacket = (flags & CHANNEL_FLAG_LAST) != 0;
// NOLINTNEXTLINE(clang-analyzer-unix.Malloc): HashTable_Insert owns dynChannel
return channelTracker_flushCurrent(tracker, firstPacket, lastPacket, FALSE);
@@ -463,8 +463,8 @@ static PfChannelResult DynvcTrackerHandleCreateFront(ChannelStateTracker* tracke
if (dynChannel && (creationStatus == 0))
dynChannel->openStatus = CHANNEL_OPENSTATE_OPENED;
const BOOL firstPacket = (flags & CHANNEL_FLAG_FIRST) ? TRUE : FALSE;
const BOOL lastPacket = (flags & CHANNEL_FLAG_LAST) ? TRUE : FALSE;
const BOOL firstPacket = (flags & CHANNEL_FLAG_FIRST) != 0;
const BOOL lastPacket = (flags & CHANNEL_FLAG_LAST) != 0;
return channelTracker_flushCurrent(tracker, firstPacket, lastPacket, TRUE);
}
@@ -482,7 +482,7 @@ static PfChannelResult DynvcTrackerHandleCreate(ChannelStateTracker* tracker, wS
(DynChannelContext*)channelTracker_getCustomData(tracker);
WINPR_ASSERT(dynChannelContext);
const BOOL lastPacket = (flags & CHANNEL_FLAG_LAST) ? TRUE : FALSE;
const BOOL lastPacket = (flags & CHANNEL_FLAG_LAST) != 0;
const BOOL isBackData = (tracker == dynChannelContext->backTracker);
proxyData* pdata = channelTracker_getPData(tracker);

18
server/proxy/channels/pf_channel_rdpdr.c
View File

@@ -473,7 +473,7 @@ static UINT rdpdr_process_client_name_request(pf_channel_server_context* rdpdr,
return ERROR_INVALID_DATA;
Stream_Read_UINT32(s, unicodeFlag);
rdpdr->common.computerNameUnicode = ((unicodeFlag & 1) != 0) ? TRUE : FALSE;
rdpdr->common.computerNameUnicode = ((unicodeFlag & 1) != 0);
Stream_Read_UINT32(s, codePage);
WINPR_UNUSED(codePage); /* Field is ignored */
@@ -694,9 +694,7 @@ static BOOL rdpdr_write_printer_capset(wLog* log, pf_channel_common_context* rdp
const RDPDR_CAPABILITY_HEADER header = { CAP_PRINTER_TYPE, 8,
rdpdr->capabilityVersions[CAP_PRINTER_TYPE] };
if (rdpdr_write_capset_header(log, s, &header) != CHANNEL_RC_OK)
return FALSE;
return TRUE;
return (rdpdr_write_capset_header(log, s, &header) == CHANNEL_RC_OK);
}
WINPR_ATTR_NODISCARD
@@ -707,9 +705,7 @@ static BOOL rdpdr_write_port_capset(wLog* log, pf_channel_common_context* rdpdr,
const RDPDR_CAPABILITY_HEADER header = { CAP_PORT_TYPE, 8,
rdpdr->capabilityVersions[CAP_PORT_TYPE] };
if (rdpdr_write_capset_header(log, s, &header) != CHANNEL_RC_OK)
return FALSE;
return TRUE;
return (rdpdr_write_capset_header(log, s, &header) == CHANNEL_RC_OK);
}
WINPR_ATTR_NODISCARD
@@ -720,9 +716,7 @@ static BOOL rdpdr_write_drive_capset(wLog* log, pf_channel_common_context* rdpdr
const RDPDR_CAPABILITY_HEADER header = { CAP_DRIVE_TYPE, 8,
rdpdr->capabilityVersions[CAP_DRIVE_TYPE] };
if (rdpdr_write_capset_header(log, s, &header) != CHANNEL_RC_OK)
return FALSE;
return TRUE;
return (rdpdr_write_capset_header(log, s, &header) == CHANNEL_RC_OK);
}
WINPR_ATTR_NODISCARD
@@ -733,9 +727,7 @@ static BOOL rdpdr_write_smartcard_capset(wLog* log, pf_channel_common_context* r
const RDPDR_CAPABILITY_HEADER header = { CAP_SMARTCARD_TYPE, 8,
rdpdr->capabilityVersions[CAP_SMARTCARD_TYPE] };
if (rdpdr_write_capset_header(log, s, &header) != CHANNEL_RC_OK)
return FALSE;
return TRUE;
return (rdpdr_write_capset_header(log, s, &header) == CHANNEL_RC_OK);
}
WINPR_ATTR_NODISCARD

5
server/proxy/pf_client.c
View File

@@ -67,10 +67,7 @@ static BOOL proxy_server_reactivate(rdpContext* ps, const rdpContext* pc)
* which causes the reactivation.
*/
WINPR_ASSERT(ps->update);
if (!ps->update->DesktopResize(ps))
return FALSE;
return TRUE;
return (ps->update->DesktopResize(ps));
}
static void pf_client_on_error_info(void* ctx, const ErrorInfoEventArgs* e)

5
server/proxy/pf_config.c
View File

@@ -203,10 +203,7 @@ static BOOL pf_config_get_bool(wIniFile* ini, const char* section, const char* k
num_value = IniFile_GetKeyValueInt(ini, section, key);
if (num_value != 0)
return TRUE;
return FALSE;
return (num_value != 0);
}
WINPR_ATTR_NODISCARD

8
server/proxy/pf_server.c
View File

@@ -393,9 +393,7 @@ static BOOL pf_server_logon(freerdp_peer* peer, const SEC_WINNT_AUTH_IDENTITY* i
info.identity = identity;
info.automatic = automatic;
if (!pf_modules_run_filter(pdata->module, FILTER_TYPE_SERVER_PEER_LOGON, pdata, &info))
return FALSE;
return TRUE;
return (pf_modules_run_filter(pdata->module, FILTER_TYPE_SERVER_PEER_LOGON, pdata, &info));
}
WINPR_ATTR_NODISCARD
@@ -571,9 +569,7 @@ static BOOL pf_server_initialize_peer_connection(freerdp_peer* peer)
pdata->server_receive_channel_data_original = peer->ReceiveChannelData;
peer->ReceiveChannelData = pf_server_receive_channel_data_hook;
if (!stream_dump_register_handlers(peer->context, CONNECTION_STATE_NEGO, TRUE))
return FALSE;
return TRUE;
return (stream_dump_register_handlers(peer->context, CONNECTION_STATE_NEGO, TRUE));
}
/**