Skip to content

Commit bdb70c1

Browse files
committed
tidy(util.fs): 更改名称
1 parent 8957c1f commit bdb70c1

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

modules/util/fs.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ std::string Dirname(const std::string &full_path)
448448
* "/some/a.b/c" -> "c"
449449
* "" -> ""
450450
*/
451-
std::string GetFileStem(const std::string &filepath)
451+
std::string FilenameStem(const std::string &filepath)
452452
{
453453
std::string::size_type start_pos = 0;
454454

@@ -471,7 +471,7 @@ std::string GetFileStem(const std::string &filepath)
471471
* "/w/a.b" -> "b"
472472
* "" -> ""
473473
*/
474-
std::string GetFileSuffix(const std::string &filepath)
474+
std::string FilenameSuffix(const std::string &filepath)
475475
{
476476
auto last_dot_pos = filepath.find_last_of('.');
477477
if (last_dot_pos == std::string::npos)

modules/util/fs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,12 +278,12 @@ std::string Dirname(const std::string &full_path);
278278
/**
279279
* 获取文件名的主体,如:"config.json" -> "config"
280280
*/
281-
std::string GetFileStem(const std::string &file_path);
281+
std::string FilenameStem(const std::string &file_path);
282282

283283
/**
284284
* 获取文件名的后缀,如:"config.json" -> "json"
285285
*/
286-
std::string GetFileSuffix(const std::string &file_path);
286+
std::string FilenameSuffix(const std::string &file_path);
287287

288288
/**
289289
* 重命名

modules/util/fs_test.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -228,22 +228,22 @@ TEST(fs, Basename) {
228228
EXPECT_EQ(Basename(std::string()), "");
229229
}
230230

231-
TEST(fs, GetFileStem) {
232-
EXPECT_EQ(GetFileStem("a.b"), "a");
233-
EXPECT_EQ(GetFileStem("a"), "a");
234-
EXPECT_EQ(GetFileStem("a."), "a");
235-
EXPECT_EQ(GetFileStem("/w/a.b"), "a");
236-
EXPECT_EQ(GetFileStem("/w.x/a"), "a");
237-
EXPECT_EQ(GetFileStem(""), "");
231+
TEST(fs, FilenameStem) {
232+
EXPECT_EQ(FilenameStem("a.b"), "a");
233+
EXPECT_EQ(FilenameStem("a"), "a");
234+
EXPECT_EQ(FilenameStem("a."), "a");
235+
EXPECT_EQ(FilenameStem("/w/a.b"), "a");
236+
EXPECT_EQ(FilenameStem("/w.x/a"), "a");
237+
EXPECT_EQ(FilenameStem(""), "");
238238
}
239239

240-
TEST(fs, GetFileSuffix) {
241-
EXPECT_EQ(GetFileSuffix("a.b"), "b");
242-
EXPECT_EQ(GetFileSuffix("a"), "");
243-
EXPECT_EQ(GetFileSuffix("a."), "");
244-
EXPECT_EQ(GetFileSuffix("/w/a.b"), "b");
245-
EXPECT_EQ(GetFileSuffix("/w.x/a"), "");
246-
EXPECT_EQ(GetFileSuffix(""), "");
240+
TEST(fs, FilenameSuffix) {
241+
EXPECT_EQ(FilenameSuffix("a.b"), "b");
242+
EXPECT_EQ(FilenameSuffix("a"), "");
243+
EXPECT_EQ(FilenameSuffix("a."), "");
244+
EXPECT_EQ(FilenameSuffix("/w/a.b"), "b");
245+
EXPECT_EQ(FilenameSuffix("/w.x/a"), "");
246+
EXPECT_EQ(FilenameSuffix(""), "");
247247
}
248248

249249
TEST(fs, RemoveDirectory) {

0 commit comments

Comments
 (0)