diff --git a/src/gn/innerapis_publicinfo_generator.cc b/src/gn/innerapis_publicinfo_generator.cc index 7405845f1014802e7ad008b97270d54fbdfa0224..682cf541170bb79b26efb1ae66024fa0930b3d66 100644 --- a/src/gn/innerapis_publicinfo_generator.cc +++ b/src/gn/innerapis_publicinfo_generator.cc @@ -5,7 +5,6 @@ #include "gn/innerapis_publicinfo_generator.h" #include -#include #include #include diff --git a/src/gn/ohos_components.cc b/src/gn/ohos_components.cc index 706439ca96ef4e7ccad76397fb53d2f5c2fc0405..a074037f118df08ce7d02b27fe34fc67378453fa 100644 --- a/src/gn/ohos_components.cc +++ b/src/gn/ohos_components.cc @@ -48,7 +48,7 @@ void OhosComponent::addInnerApi(const std::string &name, const std::string &labe { std::string la = label; size_t pos = label.find(":"); - if (pos > 0) { + if (pos != std::string::npos) { if ((label[pos - 1]) == '/') { // some are like this : "//components/foo/libfoo/:libfoo" unsigned long indexToRemove = pos - 1; if (indexToRemove >= 0 && indexToRemove <= la.length()) { @@ -341,7 +341,7 @@ bool OhosComponentsImpl::GetExternalDepsLabel(const Value &external_dep, std::st { std::string str_val = external_dep.string_value(); size_t sep = str_val.find(":"); - if (sep <= 0) { + if (sep == std::string::npos) { *err = Err(external_dep, "OHOS component external_deps format error: (" + external_dep.string_value() + ")," "it should be a string like \"component_name:innerapi_name\"."); diff --git a/src/gn/ohos_components_checker.cc b/src/gn/ohos_components_checker.cc index a93eb2bd200a549d508b11b9c3e7597aac3e585b..fc81c7bd206af6e0bcdb0965be4519d116a72885 100644 --- a/src/gn/ohos_components_checker.cc +++ b/src/gn/ohos_components_checker.cc @@ -4,7 +4,6 @@ #include "gn/ohos_components_checker.h" -#include #include #include #include diff --git a/src/gn/ohos_components_mapping.cc b/src/gn/ohos_components_mapping.cc index bcb4c2cb5f3ba2ec02170ee4221f50326964032f..b1064a425e88e468d1cc334a9a5b0394327f1f73 100644 --- a/src/gn/ohos_components_mapping.cc +++ b/src/gn/ohos_components_mapping.cc @@ -4,7 +4,6 @@ #include "gn/ohos_components_mapping.h" -#include #include #include #include @@ -107,7 +106,7 @@ const std::string OhosComponentMapping::MappingTargetAbsoluteDpes(const BuildSet } size_t pos = deps.find(":"); - if (pos <= 0) { + if (pos == std::string::npos) { return ""; } return deps_component->getInnerApi(deps.substr(pos + 1));