diff --git a/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c b/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c index 75147f6ad..d81c8f495 100644 --- a/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c +++ b/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c @@ -904,7 +904,7 @@ static int test_progressive_decode(PROGRESSIVE_CONTEXT* progressive, EGFX_SAMPLE if (cnt) { - float rate = ((float)cnt) / ((float)size) * 100.0f; + const float rate = ((float)cnt) / ((float)size) * 100.0f; printf("Progressive RemoteFX decompression failure\n"); printf("Actual, Expected (%d/%d = %.3f%%):\n", cnt, size, rate); } diff --git a/libfreerdp/core/nla.c b/libfreerdp/core/nla.c index e3a0edf53..ba8ad719a 100644 --- a/libfreerdp/core/nla.c +++ b/libfreerdp/core/nla.c @@ -1168,10 +1168,10 @@ static BOOL nla_encode_ts_credentials(rdpNla* nla) goto out; /* pin [0] OCTET STRING */ - size_t s; + size_t ss; octet_string.data = - (BYTE*)freerdp_settings_get_string_as_utf16(settings, FreeRDP_Password, &s); - octet_string.len = s * sizeof(WCHAR); + (BYTE*)freerdp_settings_get_string_as_utf16(settings, FreeRDP_Password, &ss); + octet_string.len = ss * sizeof(WCHAR); const BOOL res = WinPrAsn1EncContextualOctetString(enc, 0, &octet_string) > 0; free(octet_string.data); if (!res) @@ -1195,8 +1195,8 @@ static BOOL nla_encode_ts_credentials(rdpNla* nla) octet_string.len = len * sizeof(WCHAR); if (octet_string.len) { - const BOOL res2 = WinPrAsn1EncContextualOctetString(enc, cspData_fields[i].tag, &octet_string) > - 0; + const BOOL res2 = WinPrAsn1EncContextualOctetString(enc, cspData_fields[i].tag, + &octet_string) > 0; free(octet_string.data); if (!res2) goto out; diff --git a/libfreerdp/primitives/test/TestPrimitivesYCbCr.c b/libfreerdp/primitives/test/TestPrimitivesYCbCr.c index 1476a42ec..97184e526 100644 --- a/libfreerdp/primitives/test/TestPrimitivesYCbCr.c +++ b/libfreerdp/primitives/test/TestPrimitivesYCbCr.c @@ -1657,11 +1657,11 @@ static int test_PrimitivesYCbCr(const primitives_t* prims, UINT32 format, prim_s if (compare) { cnt[2] = test_bmp_cmp_count(actual, expected, dstSize, 2, margin); /* red */ - err[2] = ((float)cnt[2]) / ((float)dstSize / 4) * 100.0f; + err[2] = ((float)cnt[2]) / ((float)dstSize / 4.0f) * 100.0f; cnt[1] = test_bmp_cmp_count(actual, expected, dstSize, 1, margin); /* green */ - err[1] = ((float)cnt[1]) / ((float)dstSize / 4) * 100.0f; + err[1] = ((float)cnt[1]) / ((float)dstSize / 4.0f) * 100.0f; cnt[0] = test_bmp_cmp_count(actual, expected, dstSize, 0, margin); /* blue */ - err[0] = ((float)cnt[0]) / ((float)dstSize / 4) * 100.0f; + err[0] = ((float)cnt[0]) / ((float)dstSize / 4.0f) * 100.0f; if (cnt[0] || cnt[1] || cnt[2]) { @@ -1678,11 +1678,11 @@ static int test_PrimitivesYCbCr(const primitives_t* prims, UINT32 format, prim_s } cnt[2] = test_bmp_cmp_count(actual1, expected, dstSize, 2, margin); /* red */ - err[2] = ((float)cnt[2]) / ((float)dstSize / 4) * 100.0f; + err[2] = ((float)cnt[2]) / ((float)dstSize / 4.0f) * 100.0f; cnt[1] = test_bmp_cmp_count(actual1, expected, dstSize, 1, margin); /* green */ - err[1] = ((float)cnt[1]) / ((float)dstSize / 4) * 100.0f; + err[1] = ((float)cnt[1]) / ((float)dstSize / 4.0f) * 100.0f; cnt[0] = test_bmp_cmp_count(actual1, expected, dstSize, 0, margin); /* blue */ - err[0] = ((float)cnt[0]) / ((float)dstSize / 4) * 100.0f; + err[0] = ((float)cnt[0]) / ((float)dstSize / 4.0f) * 100.0f; if (cnt[0] || cnt[1] || cnt[2]) { diff --git a/libfreerdp/primitives/test/prim_test.c b/libfreerdp/primitives/test/prim_test.c index fd61226d8..7f5d39d79 100644 --- a/libfreerdp/primitives/test/prim_test.c +++ b/libfreerdp/primitives/test/prim_test.c @@ -73,19 +73,19 @@ void _floatprint(float t, char* output) f *= 10.0; f /= 1000.0; - i = ((int)(t / f + 0.5)) * (int)f; + i = ((int)(t / f + 0.5f)) * (int)f; - if (t < 0.0) + if (t < 0.0f) sprintf(output, "%f", t); else if (i == 0) - sprintf(output, "%d", (int)(t + 0.5)); - else if (t < 1e+3) + sprintf(output, "%d", (int)(t + 0.5f)); + else if (t < 1e+3f) sprintf(output, "%3d", i); - else if (t < 1e+6) + else if (t < 1e+6f) sprintf(output, "%3d,%03d", i / 1000, i % 1000); - else if (t < 1e+9) + else if (t < 1e+9f) sprintf(output, "%3d,%03d,000", i / 1000000, (i % 1000000) / 1000); - else if (t < 1e+12) + else if (t < 1e+12f) sprintf(output, "%3d,%03d,000,000", i / 1000000000, (i % 1000000000) / 1000000); else sprintf(output, "%f", t); diff --git a/winpr/libwinpr/clipboard/synthetic.c b/winpr/libwinpr/clipboard/synthetic.c index eab143133..845f7dd80 100644 --- a/winpr/libwinpr/clipboard/synthetic.c +++ b/winpr/libwinpr/clipboard/synthetic.c @@ -168,11 +168,6 @@ static void* clipboard_synthesize_utf8_string(wClipboard* clipboard, UINT32 form return NULL; size = ConvertLineEndingToLF(pDstData, size); - if (size < 0) - { - free(pDstData); - return NULL; - } *pSize = (UINT32)size; return pDstData; } diff --git a/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c b/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c index 4f05dd57b..76a98f044 100644 --- a/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c +++ b/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c @@ -208,7 +208,7 @@ static CK_RV object_load_attributes(NCryptP11ProviderHandle* provider, CK_SESSIO case CKR_OK: if (!attributes_have_unallocated_buffers(attributes, count)) return rv; - /* fallthrought */ + /* fallthrough */ case CKR_ATTRIBUTE_SENSITIVE: case CKR_ATTRIBUTE_TYPE_INVALID: case CKR_BUFFER_TOO_SMALL: diff --git a/winpr/libwinpr/utils/test/TestPrint.c b/winpr/libwinpr/utils/test/TestPrint.c index e5a96f43f..e709439d2 100644 --- a/winpr/libwinpr/utils/test/TestPrint.c +++ b/winpr/libwinpr/utils/test/TestPrint.c @@ -321,7 +321,7 @@ int TestPrint(int argc, char* argv[]) _printf("%3d\n", b); _printf("%03d\n", b); c = 15.3f; - d = c / 3; + d = c / 3.0f; _printf("%3.2f\n", d); /**