From 359ad56e176ef59d7f72a51b24ab80df3f178497 Mon Sep 17 00:00:00 2001
From: Marcus Tillmanns <marcus.tillmanns@qt.io>
Date: Fri, 14 Oct 2022 10:21:49 +0200
Subject: [PATCH] Docker: combine escapeMountPath function

Change-Id: Ib04f8245d2da096a9d9fdbdf9b5243ca80d52bfa
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/docker/dockerdevice.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp
index 1fd44e721a4..96bdc53a64f 100644
--- a/src/plugins/docker/dockerdevice.cpp
+++ b/src/plugins/docker/dockerdevice.cpp
@@ -520,18 +520,21 @@ QString escapeMountPathWin(const FilePath &fp)
     return result;
 }
 
+QString escapeMountPath(const FilePath &fp)
+{
+    if (HostOsInfo::isWindowsHost())
+        return escapeMountPathWin(fp);
+
+    return escapeMountPathUnix(fp);
+}
+
 QStringList toMountArg(const DockerDevicePrivate::TemporaryMountInfo &mi)
 {
     QString escapedPath;
     QString escapedContainerPath;
 
-    if (HostOsInfo::isWindowsHost()) {
-        escapedPath = escapeMountPathWin(mi.path);
-        escapedContainerPath = escapeMountPathWin(mi.containerPath);
-    } else {
-        escapedPath = escapeMountPathUnix(mi.path);
-        escapedContainerPath = escapeMountPathUnix(mi.containerPath);
-    }
+    escapedPath = escapeMountPath(mi.path);
+    escapedContainerPath = escapeMountPath(mi.containerPath);
 
     const QString mountArg = QString(R"(type=bind,"source=%1","destination=%2")")
                                  .arg(escapedPath)