diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2009-03-24 13:53:57 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2009-03-24 13:53:57 +0300 |
| commit | 6a32d500a9d601b4f25cee0e1ec6b2ac5195a7e9 (patch) | |
| tree | 45c154ef60d0fd4ed89b16835e468d92400150e7 /winsup | |
| parent | 28186e81d947a830d9895cecc2d8e836a3cbccd0 (diff) | |
* sec_auth.cc (str2buf2uni): Remove.
* security.h (str2buf2uni): Remove declaration.
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/sec_auth.cc | 13 | ||||
| -rw-r--r-- | winsup/cygwin/security.h | 1 |
3 files changed, 5 insertions, 14 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index a9fa904a4..79076ce1b 100644 --- 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 5f3183ec5..a456eac26 100644 --- 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 5799beb7c..f186597c9 100644 --- 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. */ |