[gnome-commander] Simplify the get_child method of GnomeCmdPlainPath class using g_build_path
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander] Simplify the get_child method of GnomeCmdPlainPath class using g_build_path
- Date: Thu, 6 Jan 2022 22:27:53 +0000 (UTC)
commit f3bb67e4a0d6fe80a91e34422d4bdbf8fdb12d2e
Author: Uwe Scholz <u scholz83 gmx de>
Date: Thu Jan 6 21:08:35 2022 +0100
Simplify the get_child method of GnomeCmdPlainPath class using g_build_path
src/gnome-cmd-plain-path.cc | 21 +++------------------
1 file changed, 3 insertions(+), 18 deletions(-)
---
diff --git a/src/gnome-cmd-plain-path.cc b/src/gnome-cmd-plain-path.cc
index 3d9a70f6..c77a7dd2 100644
--- a/src/gnome-cmd-plain-path.cc
+++ b/src/gnome-cmd-plain-path.cc
@@ -1,4 +1,4 @@
-/**
+/**
* @file gnome-cmd-plain-path.cc
* @copyright (C) 2001-2006 Marcus Bjurman\n
* @copyright (C) 2007-2012 Piotr Eljasiak\n
@@ -55,23 +55,8 @@ GnomeCmdPath *GnomeCmdPlainPath::get_parent()
GnomeCmdPath *GnomeCmdPlainPath::get_child(const gchar *child)
{
g_return_val_if_fail(child != nullptr, nullptr);
-
- auto fullPath = *path == '/'
- ? *child != '/' && strlen(path) > 1
- ? g_strconcat(path, G_DIR_SEPARATOR_S, child, nullptr)
- : g_strconcat(path, child, nullptr)
- : *child != '/'
- ? g_strconcat(G_DIR_SEPARATOR_S, path, G_DIR_SEPARATOR_S, child, nullptr)
- : g_strconcat(G_DIR_SEPARATOR_S, path, child, nullptr);
-
- auto childGFile = g_file_new_for_path(fullPath);
+ auto fullPath = g_build_path(G_DIR_SEPARATOR_S, path && path[0] != '\0' ? path : G_DIR_SEPARATOR_S,
child, nullptr);
+ auto child_path = new GnomeCmdPlainPath(fullPath);
g_free (fullPath);
-
- gchar *pathString = g_file_get_path(childGFile);
- g_object_unref(childGFile);
-
- GnomeCmdPath *child_path = new GnomeCmdPlainPath(pathString);
- g_free (pathString);
-
return child_path;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]