Module: wine Branch: master Commit: 25692223f1cf1f451e4283a2d07a89d1dd7cd3eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=25692223f1cf1f451e4283a2d...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Sep 23 15:26:10 2020 +0200
server: Rename make_object_static() to make_object_permanent().
This makes it clear that it's the same as the OBJ_PERMANENT flag.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
server/atom.c | 2 +- server/handle.c | 2 +- server/object.c | 8 ++++---- server/object.h | 2 +- server/registry.c | 4 ++-- server/request.c | 2 +- server/signal.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/server/atom.c b/server/atom.c index e14650bde2..b61fa27666 100644 --- a/server/atom.c +++ b/server/atom.c @@ -304,7 +304,7 @@ static struct atom_table *get_global_table( struct winstation *winstation, int c else { global_table = table; - make_object_static( &global_table->obj ); + make_object_permanent( &global_table->obj ); } } else set_error( STATUS_OBJECT_NAME_NOT_FOUND ); diff --git a/server/handle.c b/server/handle.c index b2c7371e69..90f9ea63d6 100644 --- a/server/handle.c +++ b/server/handle.c @@ -298,7 +298,7 @@ static obj_handle_t alloc_global_handle_no_access_check( void *obj, unsigned int { if (!(global_table = alloc_handle_table( NULL, 0 ))) return 0; - make_object_static( &global_table->obj ); + make_object_permanent( &global_table->obj ); } return handle_local_to_global( alloc_entry( global_table, obj, access )); } diff --git a/server/object.c b/server/object.c index 51a9017e30..27c1aa58ad 100644 --- a/server/object.c +++ b/server/object.c @@ -347,7 +347,7 @@ void *create_named_object( struct object *parent, const struct object_ops *ops, done: if (attributes & OBJ_PERMANENT) { - make_object_static( new_obj ); + make_object_permanent( new_obj ); grab_object( new_obj ); } return new_obj; @@ -406,8 +406,8 @@ void unlink_named_object( struct object *obj ) free( name_ptr ); }
-/* mark an object as being stored statically, i.e. only released at shutdown */ -void make_object_static( struct object *obj ) +/* mark an object as being permanent, i.e. only released at shutdown */ +void make_object_permanent( struct object *obj ) { obj->is_permanent = 1; #ifdef DEBUG_OBJECTS @@ -416,7 +416,7 @@ void make_object_static( struct object *obj ) #endif }
-/* mark an object as no longer static */ +/* mark an object as no longer permanent */ void make_object_temporary( struct object *obj ) { obj->is_permanent = 0; diff --git a/server/object.h b/server/object.h index 53e37b61a2..f8a3a971d6 100644 --- a/server/object.h +++ b/server/object.h @@ -145,7 +145,7 @@ extern void *create_named_object( struct object *parent, const struct object_ops extern void *open_named_object( struct object *parent, const struct object_ops *ops, const struct unicode_str *name, unsigned int attributes ); extern void unlink_named_object( struct object *obj ); -extern void make_object_static( struct object *obj ); +extern void make_object_permanent( struct object *obj ); extern void make_object_temporary( struct object *obj ); extern struct namespace *create_namespace( unsigned int hash_size ); extern void free_kernel_objects( struct object *obj ); diff --git a/server/registry.c b/server/registry.c index 438ec6c6fc..3b2d59fc72 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1742,7 +1742,7 @@ static int load_init_registry_from_file( const char *filename, struct key *key )
save_branch_info[save_branch_count].path = filename; save_branch_info[save_branch_count++].key = (struct key *)grab_object( key ); - make_object_static( &key->obj ); + make_object_permanent( &key->obj ); return (f != NULL); }
@@ -1813,7 +1813,7 @@ void init_registry(void) /* create the root key */ root_key = alloc_key( &root_name, current_time ); assert( root_key ); - make_object_static( &root_key->obj ); + make_object_permanent( &root_key->obj );
/* load system.reg into Registry\Machine */
diff --git a/server/request.c b/server/request.c index 45076d90e2..3ef4a244b8 100644 --- a/server/request.c +++ b/server/request.c @@ -871,7 +871,7 @@ static void acquire_lock(void) !(master_socket->fd = create_anonymous_fd( &master_socket_fd_ops, fd, &master_socket->obj, 0 ))) fatal_error( "out of memory\n" ); set_fd_events( master_socket->fd, POLLIN ); - make_object_static( &master_socket->obj ); + make_object_permanent( &master_socket->obj ); }
/* open the master server socket and start waiting for new clients */ diff --git a/server/signal.c b/server/signal.c index 8a9cbdd0ed..7c2bf2cc15 100644 --- a/server/signal.c +++ b/server/signal.c @@ -127,7 +127,7 @@ static struct handler *create_handler( signal_callback callback ) return NULL; } set_fd_events( handler->fd, POLLIN ); - make_object_static( &handler->obj ); + make_object_permanent( &handler->obj ); return handler; }