Merge branch 'master' into bertk/job-object-helper-v2-imp

This commit is contained in:
Bert Kleewein 2024-10-22 08:10:25 -07:00
Родитель 700217bca2 bbc959b9e9
Коммит 11a78f6072
2 изменённых файлов: 6 добавлений и 2 удалений

Просмотреть файл

@ -12,6 +12,7 @@ resources:
jobs:
- template: /pipeline_templates/build_all_flavors.yml@c_build_tools
parameters:
cmake_options: -Drun_unittests:BOOL=ON -Drun_e2e_tests:BOOL=ON -Drun_int_tests:BOOL=ON -Drun_perf_tests:BOOL=ON -Drun_traceability:BOOL=ON -Duse_cppunittest:BOOL=ON -Drun_reals_check:BOOL=ON
GBALLOC_LL_TYPE_VALUES: ["PASSTHROUGH", "JEMALLOC"]
- template: /pipeline_templates/run_master_check.yml@c_build_tools
@ -118,5 +119,4 @@ jobs:
# targetType: filePath
# filePath: './build/linux/build_linux_iwyu.sh'
# arguments: '$(Build.Repository.LocalPath)'
# workingDirectory: '$(Build.Repository.LocalPath)'
# workingDirectory: '$(Build.Repository.LocalPath)'

Просмотреть файл

@ -839,6 +839,7 @@ SOCKET_HANDLE socket_transport_get_underlying_socket(SOCKET_TRANSPORT_HANDLE soc
bool socket_transport_is_valid_socket(SOCKET_TRANSPORT_HANDLE socket_transport_handle)
{
bool result;
// Codes_SOCKET_TRANSPORT_WIN32_09_093: [ If socket_transport_handle is NULL, socket_transport_is_valid_socket shall fail and return false. ]
if (socket_transport_handle == NULL)
{
result = false;
@ -846,13 +847,16 @@ bool socket_transport_is_valid_socket(SOCKET_TRANSPORT_HANDLE socket_transport_h
}
else
{
// Codes_SOCKET_TRANSPORT_WIN32_09_092: [ socket_transport_is_valid_socket checks that the internal socket is valid. ]
if (socket_transport_handle->socket == INVALID_SOCKET)
{
// Codes_SOCKET_TRANSPORT_WIN32_09_094: [ If the socket inside socket_transport_handle is an INVALID_SOCKET, socket_transport_is_valid_socket shall fail and return false. ]
result = false;
LogError("Invalid socket in argument: SOCKET_TRANSPORT_HANDLE socket_transport_handle: %p", socket_transport_handle);
}
else
{
// Codes_SOCKET_TRANSPORT_WIN32_09_095: [ On success, socket_transport_is_valid_socket shall return true. ]
result = true;
}
}