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

[core,license] fix unused result warnings

Browse Source
This commit is contained in:
Armin Novak
2026-03-02 12:08:27 +01:00
parent 2b0637d629
commit 7d2f75881c
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
libfreerdp/core/license.c
View File

@@ -224,8 +224,7 @@ WINPR_ATTR_NODISCARD
static BOOL license_send_error_alert(rdpLicense* license, UINT32 dwErrorCode, static BOOL license_send_error_alert(rdpLicense* license, UINT32 dwErrorCode,
UINT32 dwStateTransition, const LICENSE_BLOB* info); UINT32 dwStateTransition, const LICENSE_BLOB* info);
WINPR_ATTR_NODISCARD static void license_set_state(rdpLicense* license, LICENSE_STATE state);
static BOOL license_set_state(rdpLicense* license, LICENSE_STATE state);
WINPR_ATTR_NODISCARD WINPR_ATTR_NODISCARD
static const char* license_get_state_string(LICENSE_STATE state); static const char* license_get_state_string(LICENSE_STATE state);
@@ -1034,8 +1033,7 @@ state_run_t license_server_recv(rdpLicense* license, wStream* s)
if (!license_send_platform_challenge_packet(license)) if (!license_send_platform_challenge_packet(license))
goto fail; goto fail;
license->update = FALSE; license->update = FALSE;
if (!license_set_state(license, LICENSE_STATE_PLATFORM_CHALLENGE)) license_set_state(license, LICENSE_STATE_PLATFORM_CHALLENGE);
goto fail;
break; break;
case LICENSE_INFO: case LICENSE_INFO:
if (!license_ensure_state(license, LICENSE_STATE_REQUEST, bMsgType)) if (!license_ensure_state(license, LICENSE_STATE_REQUEST, bMsgType))
@@ -1045,8 +1043,7 @@ state_run_t license_server_recv(rdpLicense* license, wStream* s)
// TODO: Validate license info // TODO: Validate license info
if (!license_send_platform_challenge_packet(license)) if (!license_send_platform_challenge_packet(license))
goto fail; goto fail;
if (!license_set_state(license, LICENSE_STATE_PLATFORM_CHALLENGE)) license_set_state(license, LICENSE_STATE_PLATFORM_CHALLENGE);
goto fail;
license->update = TRUE; license->update = TRUE;
break; break;
@@ -1095,7 +1092,12 @@ fail:
if (state_run_failed(rc)) if (state_run_failed(rc))
{ {
if (flags & EXTENDED_ERROR_MSG_SUPPORTED) if (flags & EXTENDED_ERROR_MSG_SUPPORTED)
license_send_error_alert(license, ERR_INVALID_CLIENT, ST_TOTAL_ABORT, nullptr); {
if (!license_send_error_alert(license, ERR_INVALID_CLIENT, ST_TOTAL_ABORT, nullptr))
{
WLog_Print(license->log, WLOG_ERROR, "license_send_error_alert failed");
}
}
license_set_state(license, LICENSE_STATE_ABORTED); license_set_state(license, LICENSE_STATE_ABORTED);
} }
@@ -1834,7 +1836,7 @@ void license_free_scope_list(SCOPE_LIST* scopeList)
if (!scopeList) if (!scopeList)
return; return;
license_scope_list_resize(scopeList, 0); (void)license_scope_list_resize(scopeList, 0);
free(scopeList); free(scopeList);
} }
@@ -2348,7 +2350,8 @@ BOOL license_read_new_or_upgrade_license_packet(rdpLicense* license, wStream* s)
goto fail; goto fail;
license->type = LICENSE_TYPE_ISSUED; license->type = LICENSE_TYPE_ISSUED;
ret = license_set_state(license, LICENSE_STATE_COMPLETED); license_set_state(license, LICENSE_STATE_COMPLETED);
ret = TRUE;
if (!license->rdp->settings->OldLicenseBehaviour) if (!license->rdp->settings->OldLicenseBehaviour)
ret = saveCal(license->log, license->rdp->settings, Stream_Pointer(licenseStream), ret = saveCal(license->log, license->rdp->settings, Stream_Pointer(licenseStream),
@@ -2391,7 +2394,8 @@ BOOL license_read_error_alert_packet(rdpLicense* license, wStream* s)
if (dwErrorCode == STATUS_VALID_CLIENT) if (dwErrorCode == STATUS_VALID_CLIENT)
{ {
license->type = LICENSE_TYPE_NONE; license->type = LICENSE_TYPE_NONE;
return license_set_state(license, LICENSE_STATE_COMPLETED); license_set_state(license, LICENSE_STATE_COMPLETED);
return TRUE;
} }
switch (dwStateTransition) switch (dwStateTransition)
@@ -2933,7 +2937,7 @@ LICENSE_TYPE license_get_type(const rdpLicense* license)
return license->type; return license->type;
} }
BOOL license_set_state(rdpLicense* license, LICENSE_STATE state) void license_set_state(rdpLicense* license, LICENSE_STATE state)
{ {
WINPR_ASSERT(license); WINPR_ASSERT(license);
license->state = state; license->state = state;
@@ -2946,8 +2950,6 @@ BOOL license_set_state(rdpLicense* license, LICENSE_STATE state)
license->type = LICENSE_TYPE_INVALID; license->type = LICENSE_TYPE_INVALID;
break; break;
} }
return TRUE;
} }
const char* license_get_state_string(LICENSE_STATE state) const char* license_get_state_string(LICENSE_STATE state)
@@ -2981,7 +2983,8 @@ BOOL license_server_send_request(rdpLicense* license)
return FALSE; return FALSE;
if (!license_send_license_request_packet(license)) if (!license_send_license_request_packet(license))
return FALSE; return FALSE;
return license_set_state(license, LICENSE_STATE_REQUEST); license_set_state(license, LICENSE_STATE_REQUEST);
return TRUE;
} }
WINPR_ATTR_NODISCARD WINPR_ATTR_NODISCARD
@@ -3098,7 +3101,8 @@ BOOL license_server_configure(rdpLicense* license)
return FALSE; return FALSE;
} }
return license_set_state(license, LICENSE_STATE_CONFIGURED); license_set_state(license, LICENSE_STATE_CONFIGURED);
return TRUE;
} }
rdpLicense* license_get(rdpContext* context) rdpLicense* license_get(rdpContext* context)