From b6071f19c318fd19ed37d9fa4ba0cf77d7d32d13 Mon Sep 17 00:00:00 2001 From: "T.J. Mercier" Date: Wed, 7 Aug 2024 16:35:55 +0000 Subject: [PATCH] libprocessgroup: Convert CGROUPV2_HIERARCHY_NAME to std::string Almost everywhere CGROUPV2_HIERARCHY_NAME is used a std::string is required, so change its type to avoid temporaries. Change-Id: I4466838c510f2eb8212fc71999cdaa47359ce9c3 --- libprocessgroup/include/processgroup/processgroup.h | 2 +- libprocessgroup/setup/cgroup_map_write.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libprocessgroup/include/processgroup/processgroup.h b/libprocessgroup/include/processgroup/processgroup.h index 02f7c2508..d27b56895 100644 --- a/libprocessgroup/include/processgroup/processgroup.h +++ b/libprocessgroup/include/processgroup/processgroup.h @@ -26,7 +26,7 @@ __BEGIN_DECLS -static constexpr const char* CGROUPV2_HIERARCHY_NAME = "cgroup2"; +static constexpr std::string CGROUPV2_HIERARCHY_NAME = "cgroup2"; bool CgroupsAvailable(); bool CgroupGetControllerPath(const std::string& cgroup_name, std::string* path); diff --git a/libprocessgroup/setup/cgroup_map_write.cpp b/libprocessgroup/setup/cgroup_map_write.cpp index d05bf2408..c4e1fb680 100644 --- a/libprocessgroup/setup/cgroup_map_write.cpp +++ b/libprocessgroup/setup/cgroup_map_write.cpp @@ -222,7 +222,7 @@ static bool SetupCgroup(const CgroupDescriptor& descriptor) { const CgroupController* controller = descriptor.controller(); if (controller->version() == 2) { - if (!strcmp(controller->name(), CGROUPV2_HIERARCHY_NAME)) { + if (controller->name() == CGROUPV2_HIERARCHY_NAME) { return MountV2CgroupController(descriptor); } else { return ActivateV2CgroupController(descriptor);