From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Tue, 4 Oct 2011 21:29:26 +0000 (-0400)
Subject: Windows: char* is not a Unicode string
X-Git-Tag: upstream/1.6.1.pre1^2~198
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=74a08db14306bf5a7666951c09a6b8866e94e087;p=packages%2Fo%2Fopenafs.git

Windows: char* is not a Unicode string

Do not treat the output of NetbiosName() as a wide_t when
it is a char*.

Reviewed-on: http://gerrit.openafs.org/5549
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
(cherry picked from commit 4e02cb72be034ddad019d2ee70e8009ee762d9ed)

Change-Id: I03523441c3520f316232956d22d0f0a7203e4f36
Reviewed-on: http://gerrit.openafs.org/5568
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
---

diff --git a/src/WINNT/client_exp/gui2fs.cpp b/src/WINNT/client_exp/gui2fs.cpp
index 0d8abd013..8c38a1cab 100644
--- a/src/WINNT/client_exp/gui2fs.cpp
+++ b/src/WINNT/client_exp/gui2fs.cpp
@@ -1229,11 +1229,7 @@ static void FixNetbiosPath(CString& path)
         CString nbroot;
         const char * nbname = NetbiosName();
 
-#ifdef UNICODE
-        nbroot.Format(_T("\\\\%S\\"), nbname);
-#else
         nbroot.Format(_T("\\\\%s\\"), nbname);
-#endif
 
         if (nbroot.CompareNoCase(path) == 0) {
             path.Append(_T("all\\"));