diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2011-04-28 08:15:56 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2011-04-28 08:15:56 +0000 |
| commit | 41e9c14558ea32ce550e285d2b2b8d195b288b3d (patch) | |
| tree | d1cf50d8bd2f155fc18998f5f65d726267b8271a | |
| parent | f97612978a32fd1015242f3e10072f40e6a510e5 (diff) | |
| download | cygnal-41e9c14558ea32ce550e285d2b2b8d195b288b3d.tar.gz cygnal-41e9c14558ea32ce550e285d2b2b8d195b288b3d.tar.bz2 cygnal-41e9c14558ea32ce550e285d2b2b8d195b288b3d.zip | |
* advapi32.cc (AllocateLocallyUniqueId): Remove.
* fhandler_disk_file.cc (fhandler_base::open_fs): Replace call to
AllocateLocallyUniqueId with call to NtAllocateLocallyUniqueId;
* posix_ipc.cc (mq_open): Ditto. Drop error handling for that call.
(sem_open): Ditto.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/cygwin/advapi32.cc | 7 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_disk_file.cc | 2 | ||||
| -rw-r--r-- | winsup/cygwin/posix_ipc.cc | 12 |
4 files changed, 11 insertions, 18 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index fcb6895a9..f8543eaf5 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,13 @@ 2011-04-28 Corinna Vinschen <corinna@vinschen.de> + * advapi32.cc (AllocateLocallyUniqueId): Remove. + * fhandler_disk_file.cc (fhandler_base::open_fs): Replace call to + AllocateLocallyUniqueId with call to NtAllocateLocallyUniqueId; + * posix_ipc.cc (mq_open): Ditto. Drop error handling for that call. + (sem_open): Ditto. + +2011-04-28 Corinna Vinschen <corinna@vinschen.de> + * autoload.cc (GetSecurityInfo): Remove. * ntdll.h (RtlConvertToAutoInheritSecurityObject): Declare. (RtlDeleteSecurityObject): Declare. diff --git a/winsup/cygwin/advapi32.cc b/winsup/cygwin/advapi32.cc index a53f1ff01..52b9a7788 100644 --- a/winsup/cygwin/advapi32.cc +++ b/winsup/cygwin/advapi32.cc @@ -20,13 +20,6 @@ details. */ return NT_SUCCESS (status); BOOL WINAPI -AllocateLocallyUniqueId (PLUID luid) -{ - NTSTATUS status = NtAllocateLocallyUniqueId (luid); - DEFAULT_NTSTATUS_TO_BOOL_RETURN -} - -BOOL WINAPI AccessCheck (PSECURITY_DESCRIPTOR sd, HANDLE tok, DWORD access, PGENERIC_MAPPING mapping, PPRIVILEGE_SET pset, LPDWORD psetlen, LPDWORD granted, LPBOOL allowed) diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc index 1889a5d07..a91837ee1 100644 --- a/winsup/cygwin/fhandler_disk_file.cc +++ b/winsup/cygwin/fhandler_disk_file.cc @@ -1403,7 +1403,7 @@ fhandler_base::open_fs (int flags, mode_t mode) ino = pc.get_ino_by_handle (get_handle ()); /* A unique ID is necessary to recognize fhandler entries which are duplicated by dup(2) or fork(2). */ - AllocateLocallyUniqueId ((PLUID) &unique_id); + NtAllocateLocallyUniqueId ((PLUID) &unique_id); out: syscall_printf ("%d = fhandler_disk_file::open (%S, %p)", res, diff --git a/winsup/cygwin/posix_ipc.cc b/winsup/cygwin/posix_ipc.cc index 678c62894..c7b2bc0fe 100644 --- a/winsup/cygwin/posix_ipc.cc +++ b/winsup/cygwin/posix_ipc.cc @@ -419,11 +419,7 @@ again: mqhdr->mqh_attr.mq_curmsgs = 0; mqhdr->mqh_nwait = 0; mqhdr->mqh_pid = 0; - if (!AllocateLocallyUniqueId (&luid)) - { - __seterrno (); - goto err; - } + NtAllocateLocallyUniqueId (&luid); __small_sprintf (mqhdr->mqh_uname, "%016X%08x%08x", hash_path_name (0,mqname), luid.HighPart, luid.LowPart); @@ -1008,11 +1004,7 @@ again: } created = 1; /* First one to create the file initializes it. */ - if (!AllocateLocallyUniqueId (&sf.luid)) - { - __seterrno (); - goto err; - } + NtAllocateLocallyUniqueId (&sf.luid); sf.value = value; sf.hash = hash_path_name (0, semname); if (write (fd, &sf, sizeof sf) != sizeof sf) |