* sec_auth.cc (str2buf2uni): Remove.

	* security.h (str2buf2uni): Remove declaration.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index a9fa904a44091b1617bf22e3c36bbab9da43735f..79076ce1b73dbff30b80196d16cc6a921c3c5faf 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-23  Corinna Vinschen  <corinna@vinschen.de>
+
+       * sec_auth.cc (str2buf2uni): Remove.
+       * security.h (str2buf2uni): Remove declaration.
+
 2009-03-24  Yaakov Selkowitz  <yselkowitz@cygwin.com>
 
        * include/mntent.h: Remove declarations of nonexistant addmntent

diff --git a/winsup/cygwin/sec_auth.cc b/winsup/cygwin/sec_auth.cc
index 5f3183ec50064a1f4807727e6ed1051c189163e3..a456eac264b817dd074b980a6110000bc6c1fc1b 100644 (file)
--- a/winsup/cygwin/sec_auth.cc
+++ b/winsup/cygwin/sec_auth.cc
@@ -126,19 +126,6 @@ str2buf2lsa (LSA_STRING &tgt, char *buf, const char *srcstr)
   memcpy (buf, srcstr, tgt.MaximumLength);
 }
 
-/* The dimension of buf is assumed to be at least strlen(srcstr) + 1,
-   The result will be shorter if the input has multibyte chars */
-void
-str2buf2uni (UNICODE_STRING &tgt, WCHAR *buf, const char *srcstr)
-{
-  tgt.Buffer = (PWCHAR) buf;
-  tgt.MaximumLength = (strlen (srcstr) + 1) * sizeof (WCHAR);
-  tgt.Length = sys_mbstowcs (buf, tgt.MaximumLength / sizeof (WCHAR), srcstr)
-              * sizeof (WCHAR);
-  if (tgt.Length)
-    tgt.Length -= sizeof (WCHAR);
-}
-
 void
 str2uni_cat (UNICODE_STRING &tgt, const char *srcstr)
 {

diff --git a/winsup/cygwin/security.h b/winsup/cygwin/security.h
index 5799beb7c36534eaa1ab134372980cc166bd0588..f186597c905cc8bde6d8f6b78c2ffb917bbdc8cd 100644 (file)
--- a/winsup/cygwin/security.h
+++ b/winsup/cygwin/security.h
@@ -365,7 +365,6 @@ int getacl (HANDLE, path_conv &, int, __acl32 *);
 int setacl (HANDLE, path_conv &, int, __acl32 *, bool &);
 
 struct _UNICODE_STRING;
-void __stdcall str2buf2uni (_UNICODE_STRING &, WCHAR *, const char *) __attribute__ ((regparm (3)));
 void __stdcall str2uni_cat (_UNICODE_STRING &, const char *) __attribute__ ((regparm (2)));
 
 /* Function creating a token by calling NtCreateToken. */