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.8.0_pre1^2~3192
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=4e02cb72be034ddad019d2ee70e8009ee762d9ed;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*.

Change-Id: Iba4f1f30f1de4a9c3ded2f1e440ca9e4bc014379
Reviewed-on: http://gerrit.openafs.org/5549
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 37f68f71c..4cb93b752 100644
--- a/src/WINNT/client_exp/gui2fs.cpp
+++ b/src/WINNT/client_exp/gui2fs.cpp
@@ -1027,11 +1027,7 @@ 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\\"));