From 9affdfda03b660e32235f4b4198a25da20725b37 Mon Sep 17 00:00:00 2001 From: sangbumlikeagod Date: Mon, 30 Dec 2024 01:04:33 +0900 Subject: [PATCH] change log message --- trunk/src/app/srs_app_config.cpp | 8 ++++---- trunk/src/app/srs_app_server.cpp | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index ea2fb6d57a..6b2ef51236 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -2533,10 +2533,10 @@ srs_error_t SrsConfig::check_normal_config() ); bool isNotSameHttp = intersection_result.size() == 0; - bool isFullyContainedHttp = intersection_result.size() != 0 && intersection_result.size() == api_vec.size(); + bool isFullyContainedHttp = !isNotSameHttp && intersection_result.size() == api_vec.size(); if (!isNotSameHttp && !isFullyContainedHttp) { - return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "http api and server have a intersection, but http server doesn't fully contain http api"); + return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "http api and http server intersect in functionality, but an http server does not fully encapsulate an http api"); } vector apis_vec = get_https_apis_listens(); vector servers_vec = get_https_streams_listens(); @@ -2550,10 +2550,10 @@ srs_error_t SrsConfig::check_normal_config() ); bool isNotSameHttps = intersections_result.size() == 0; - bool isFullyContainedHttps = intersections_result.size() != 0 && intersections_result.size() == apis_vec.size(); + bool isFullyContainedHttps = !isNotSameHttps && intersections_result.size() == apis_vec.size(); if (!isNotSameHttps && !isFullyContainedHttps) { - return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "https api and server have a intersection, but https server doesn't fully contain https api"); + return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "https api and https server intersect in functionality, but an https server does not fully encapsulate an https api"); } if (!isNotSameHttp && isNotSameHttps) { return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "for same http, https api != server"); diff --git a/trunk/src/app/srs_app_server.cpp b/trunk/src/app/srs_app_server.cpp index 735286a8bf..640aab8061 100644 --- a/trunk/src/app/srs_app_server.cpp +++ b/trunk/src/app/srs_app_server.cpp @@ -544,13 +544,13 @@ srs_error_t SrsServer::initialize() std::back_inserter(intersections_result) ); bool isNotSameHttp = intersection_result.size() == 0; - bool isFullyContainedHttp = intersection_result.size() != 0 && intersection_result.size() == api_vec.size(); + bool isFullyContainedHttp = !isNotSameHttp && intersection_result.size() == api_vec.size(); bool isNotSameHttps = intersections_result.size() == 0; - bool isFullyContainedHttps = intersections_result.size() != 0 && intersections_result.size() == apis_vec.size(); + bool isFullyContainedHttps = !isNotSameHttps && intersections_result.size() == apis_vec.size(); if ((!isNotSameHttp && !isFullyContainedHttp) || (!isNotSameHttps && !isFullyContainedHttps)) { - return srs_error_wrap(err, "http api and http server have a intersection. but http server doesn't fully contain http api"); + return srs_error_wrap(err, "http api and http server intersect in functionality, but an http server does not fully encapsulate an http api"); } if (stream && api && isFullyContainedHttp && isFullyContainedHttps)