Alexandre Julliard : server: Remove some no longer used directory functions.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Feb 9 10:46:48 CST 2016
Module: wine
Branch: master
Commit: b548f8c4a7b5bb82d6e1206939f638153aedce36
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b548f8c4a7b5bb82d6e1206939f638153aedce36
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Feb 9 20:23:40 2016 +0900
server: Remove some no longer used directory functions.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
server/directory.c | 29 -----------------------------
server/object.h | 4 ----
2 files changed, 33 deletions(-)
diff --git a/server/directory.c b/server/directory.c
index 67d8089..6a5af9a 100644
--- a/server/directory.c
+++ b/server/directory.c
@@ -228,28 +228,6 @@ struct directory *get_directory_obj( struct process *process, obj_handle_t handl
return (struct directory *)get_handle_obj( process, handle, access, &directory_ops );
}
-/******************************************************************************
- * Find an object by its name in a given root object
- *
- * PARAMS
- * root [I] directory to start search from or NULL to start from \\
- * name [I] object name to search for
- * attr [I] OBJECT_ATTRIBUTES.Attributes
- * name_left [O] [optional] leftover name if object is not found
- *
- * RETURNS
- * NULL: If params are invalid
- * Found: If object with exact name is found returns that object
- * (name_left->len == 0). Object's refcount is incremented
- * Not found: The last matched parent. (name_left->len > 0)
- * Parent's refcount is incremented.
- */
-struct object *find_object_dir( struct directory *root, const struct unicode_str *name,
- unsigned int attr, struct unicode_str *name_left )
-{
- return lookup_named_object( &root->obj, name, attr, name_left );
-}
-
/* create a named (if name is present) or unnamed object. */
void *create_named_object_dir( struct directory *root, const struct unicode_str *name,
unsigned int attributes, const struct object_ops *ops )
@@ -257,13 +235,6 @@ void *create_named_object_dir( struct directory *root, const struct unicode_str
return create_named_object( &root->obj, ops, name, attributes );
}
-/* open a new handle to an existing object */
-void *open_object_dir( struct directory *root, const struct unicode_str *name,
- unsigned int attr, const struct object_ops *ops )
-{
- return open_named_object( &root->obj, ops, name, attr );
-}
-
/* retrieve an object type, creating it if needed */
struct object_type *get_object_type( const struct unicode_str *name )
{
diff --git a/server/object.h b/server/object.h
index f51fc71..566b6da 100644
--- a/server/object.h
+++ b/server/object.h
@@ -231,12 +231,8 @@ extern void release_global_atom( struct winstation *winstation, atom_t atom );
extern struct object *get_root_directory(void);
extern struct directory *get_directory_obj( struct process *process, obj_handle_t handle, unsigned int access );
-extern struct object *find_object_dir( struct directory *root, const struct unicode_str *name,
- unsigned int attr, struct unicode_str *name_left );
extern void *create_named_object_dir( struct directory *root, const struct unicode_str *name,
unsigned int attr, const struct object_ops *ops );
-extern void *open_object_dir( struct directory *root, const struct unicode_str *name,
- unsigned int attr, const struct object_ops *ops );
extern struct object_type *get_object_type( const struct unicode_str *name );
extern int directory_link_name( struct object *obj, struct object_name *name, struct object *parent );
extern void init_directories(void);
More information about the wine-cvs
mailing list