Alexandre Julliard : server: Use the generic named object functions for mailslots.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4e380b9e2b6d74cfb19586276426ca914d253499
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4e380b9e2b6d74cfb195862764...

Author: Alexandre Julliard 
Date:   Mon Feb  8 14:28:54 2016 +0900

server: Use the generic named object functions for mailslots.

Signed-off-by: Alexandre Julliard

---

server/mailslot.c | 33 +--------------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/server/mailslot.c b/server/mailslot.c
index a0fa6e2..eb3c0a6 100644
--- a/server/mailslot.c
+++ b/server/mailslot.c
@@ -418,41 +418,10 @@ static struct mailslot *create_mailslot( struct directory *root,
                                          int max_msgsize, timeout_t read_timeout,
                                          const struct security_descriptor *sd )
 {
-    struct object *obj;
-    struct unicode_str new_name;
     struct mailslot *mailslot;
     int fds[2];

-    if (!name || !name->len)
-    {
-        mailslot = alloc_object( &mailslot_ops );
-        goto init;
-    }
-
-    if (!(obj = find_object_dir( root, name, attr, &new_name )))
-    {
-        set_error( STATUS_OBJECT_NAME_INVALID );
-        return NULL;
-    }
-
-    if (!new_name.len)
-    {
-        if (attr & OBJ_OPENIF && obj->ops == &mailslot_ops)
-            /* it already exists - there can only be one mailslot to read from */
-            set_error( STATUS_OBJECT_NAME_EXISTS );
-        else if (attr & OBJ_OPENIF)
-            set_error( STATUS_OBJECT_TYPE_MISMATCH );
-        else
-            set_error( STATUS_OBJECT_NAME_COLLISION );
-        release_object( obj );
-        return NULL;
-    }
-
-    mailslot = create_object( obj, &mailslot_ops, &new_name );
-    release_object( obj );
-
-init:
-    if (!mailslot) return NULL;
+    if (!(mailslot = create_named_object_dir( root, name, attr, &mailslot_ops ))) return NULL;

mailslot->fd = NULL;
     mailslot->write_fd = -1;