Address more review comments

This commit is contained in:
fearlessTobi 2018-09-17 20:58:24 +02:00
parent b4ace6ec6f
commit 120d8f3bf7
2 changed files with 5 additions and 5 deletions

View file

@ -73,7 +73,7 @@ endif()
# DiscordRPC # DiscordRPC
if (USE_DISCORD_PRESENCE) if (USE_DISCORD_PRESENCE)
add_subdirectory(discord-rpc) add_subdirectory(discord-rpc EXCLUDE_FROM_ALL)
target_include_directories(discord-rpc INTERFACE ./discord-rpc/include) target_include_directories(discord-rpc INTERFACE ./discord-rpc/include)
endif() endif()
@ -81,11 +81,11 @@ if (ENABLE_WEB_SERVICE)
# LibreSSL # LibreSSL
set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "") set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")
add_definitions(-DHAVE_INET_NTOP) add_definitions(-DHAVE_INET_NTOP)
add_subdirectory(libressl) add_subdirectory(libressl EXCLUDE_FROM_ALL)
target_include_directories(ssl INTERFACE ./libressl/include) target_include_directories(ssl INTERFACE ./libressl/include)
# lurlparser # lurlparser
add_subdirectory(lurlparser) add_subdirectory(lurlparser EXCLUDE_FROM_ALL)
# httplib # httplib
add_library(httplib INTERFACE) add_library(httplib INTERFACE)
@ -94,4 +94,4 @@ if (ENABLE_WEB_SERVICE)
# JSON # JSON
add_library(json-headers INTERFACE) add_library(json-headers INTERFACE)
target_include_directories(json-headers INTERFACE ./json) target_include_directories(json-headers INTERFACE ./json)
endif() endif()

View file

@ -33,7 +33,7 @@ static u64 GenerateTelemetryId() {
mbedtls_ctr_drbg_init(&ctr_drbg); mbedtls_ctr_drbg_init(&ctr_drbg);
ASSERT(mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy, ASSERT(mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy,
reinterpret_cast<const unsigned char*>(personalization.c_str()), reinterpret_cast<const unsigned char*>(personalization.c_str()),
personalization.size()) == 0) personalization.size()) == 0);
ASSERT(mbedtls_ctr_drbg_random(&ctr_drbg, reinterpret_cast<unsigned char*>(&telemetry_id), ASSERT(mbedtls_ctr_drbg_random(&ctr_drbg, reinterpret_cast<unsigned char*>(&telemetry_id),
sizeof(u64)) == 0); sizeof(u64)) == 0);