Skip to content

Commit 5761173

Browse files
committed
Accept std::string_view arguments in CuttlefishConfig::*Path
https://abseil.io/tips/1 Bug: b/470439524
1 parent c5e96b9 commit 5761173

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

base/cvd/cuttlefish/host/libs/config/cuttlefish_config.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,16 @@
2424
#include <memory>
2525
#include <set>
2626
#include <string>
27+
#include <string_view>
2728
#include <vector>
2829

29-
#include <android-base/logging.h>
30-
#include <android-base/strings.h>
31-
#include <fmt/core.h>
32-
#include <fmt/format.h>
33-
#include <json/reader.h>
34-
#include <json/value.h>
30+
#include "absl/strings/str_cat.h"
31+
#include "android-base/logging.h"
32+
#include "android-base/strings.h"
33+
#include "fmt/core.h"
34+
#include "fmt/format.h"
35+
#include "json/reader.h"
36+
#include "json/value.h"
3537

3638
#include "cuttlefish/common/libs/utils/environment.h"
3739
#include "cuttlefish/common/libs/utils/files.h"
@@ -565,18 +567,16 @@ std::string CuttlefishConfig::instances_dir() const {
565567
return AbsolutePath(root_dir() + "/instances");
566568
}
567569

568-
std::string CuttlefishConfig::InstancesPath(
569-
const std::string& file_name) const {
570-
return AbsolutePath(instances_dir() + "/" + file_name);
570+
std::string CuttlefishConfig::InstancesPath(std::string_view file_name) const {
571+
return AbsolutePath(absl::StrCat(instances_dir(), "/", file_name));
571572
}
572573

573574
std::string CuttlefishConfig::assembly_dir() const {
574575
return AbsolutePath(root_dir() + "/assembly");
575576
}
576577

577-
std::string CuttlefishConfig::AssemblyPath(
578-
const std::string& file_name) const {
579-
return AbsolutePath(assembly_dir() + "/" + file_name);
578+
std::string CuttlefishConfig::AssemblyPath(std::string_view file_name) const {
579+
return AbsolutePath(absl::StrCat(assembly_dir(), "/", file_name));
580580
}
581581

582582
static constexpr char kInstancesUdsDir[] = "instances_uds_dir";
@@ -588,17 +588,17 @@ std::string CuttlefishConfig::instances_uds_dir() const {
588588
}
589589

590590
std::string CuttlefishConfig::InstancesUdsPath(
591-
const std::string& file_name) const {
592-
return AbsolutePath(instances_uds_dir() + "/" + file_name);
591+
std::string_view file_name) const {
592+
return AbsolutePath(absl::StrCat(instances_uds_dir(), "/", file_name));
593593
}
594594

595595
std::string CuttlefishConfig::environments_dir() const {
596596
return AbsolutePath(root_dir() + "/environments");
597597
}
598598

599599
std::string CuttlefishConfig::EnvironmentsPath(
600-
const std::string& file_name) const {
601-
return AbsolutePath(environments_dir() + "/" + file_name);
600+
std::string_view file_name) const {
601+
return AbsolutePath(absl::StrCat(environments_dir(), "/", file_name));
602602
}
603603

604604
static constexpr char kEnvironmentsUdsDir[] = "environments_uds_dir";
@@ -610,8 +610,8 @@ std::string CuttlefishConfig::environments_uds_dir() const {
610610
}
611611

612612
std::string CuttlefishConfig::EnvironmentsUdsPath(
613-
const std::string& file_name) const {
614-
return AbsolutePath(environments_uds_dir() + "/" + file_name);
613+
std::string_view file_name) const {
614+
return AbsolutePath(absl::StrCat(environments_uds_dir(), "/", file_name));
615615
}
616616

617617
CuttlefishConfig::MutableInstanceSpecific CuttlefishConfig::ForInstance(int num) {

base/cvd/cuttlefish/host/libs/config/cuttlefish_config.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,22 +72,22 @@ class CuttlefishConfig {
7272
void set_root_dir(const std::string& root_dir);
7373

7474
std::string instances_dir() const;
75-
std::string InstancesPath(const std::string&) const;
75+
std::string InstancesPath(std::string_view) const;
7676

7777
std::string assembly_dir() const;
78-
std::string AssemblyPath(const std::string&) const;
78+
std::string AssemblyPath(std::string_view) const;
7979

8080
void set_instances_uds_dir(const std::string&);
8181
std::string instances_uds_dir() const;
82-
std::string InstancesUdsPath(const std::string&) const;
82+
std::string InstancesUdsPath(std::string_view) const;
8383

8484
void set_environments_dir(const std::string&);
8585
std::string environments_dir() const;
86-
std::string EnvironmentsPath(const std::string&) const;
86+
std::string EnvironmentsPath(std::string_view) const;
8787

8888
void set_environments_uds_dir(const std::string&);
8989
std::string environments_uds_dir() const;
90-
std::string EnvironmentsUdsPath(const std::string&) const;
90+
std::string EnvironmentsUdsPath(std::string_view) const;
9191

9292
VmmMode vm_manager() const;
9393
void set_vm_manager(VmmMode vmm);

0 commit comments

Comments
 (0)