From: corinna <corinna>
Date: Thu, 28 Apr 2011 08:15:54 +0000 (+0000)
Subject: 	* advapi32.cc (AllocateLocallyUniqueId): Remove.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bb631d380c766514f0a5634f0702132080d16609;p=pf3gnuchains%2Fpf3gnuchains4x.git

	* 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.
---

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index fcb6895a90..f8543eaf50 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 a53f1ff018..52b9a7788d 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 1889a5d079..a91837ee19 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 678c628944..c7b2bc0fed 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)