i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: Rename DescriptorPutter to FileDescriptorPutter.

Browse Source 
For consistency. No functional change.
This commit is contained in:
Augustin Cavalier
2024-01-08 14:11:30 -05:00
parent 1322e37a03
commit fa766875af
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/shared/AutoDeleterDrivers.h
+2 -2
View File
@@ -26,7 +26,7 @@ typedef CObjectDeleter<void, status_t, unload_driver_settings>
#if defined(_KERNEL_MODE) && !defined(_BOOT_MODE) #if defined(_KERNEL_MODE) && !defined(_BOOT_MODE)
typedef CObjectDeleter<struct vnode, void, vfs_put_vnode> VnodePutter; typedef CObjectDeleter<struct vnode, void, vfs_put_vnode> VnodePutter;
typedef CObjectDeleter<file_descriptor, void, put_fd> DescriptorPutter; typedef CObjectDeleter<file_descriptor, void, put_fd> FileDescriptorPutter;
typedef MethodDeleter<VMAddressSpace, void, &VMAddressSpace::Put> typedef MethodDeleter<VMAddressSpace, void, &VMAddressSpace::Put>
VMAddressSpacePutter; VMAddressSpacePutter;
@@ -62,7 +62,7 @@ using ::BPrivate::DriverSettingsUnloader;
#if defined(_KERNEL_MODE) && !defined(_BOOT_MODE) #if defined(_KERNEL_MODE) && !defined(_BOOT_MODE)
using ::BPrivate::VnodePutter; using ::BPrivate::VnodePutter;
using ::BPrivate::DescriptorPutter; using ::BPrivate::FileDescriptorPutter;
using ::BPrivate::VMAddressSpacePutter; using ::BPrivate::VMAddressSpacePutter;
using ::BPrivate::DeviceNodePutter; using ::BPrivate::DeviceNodePutter;
src/system/kernel/events/event_queue.cpp
+2 -2
View File
@@ -658,7 +658,7 @@ _user_event_queue_select(int queue, event_wait_info* userInfos, int numInfos)
file_descriptor* descriptor; file_descriptor* descriptor;
GET_QUEUE_FD_OR_RETURN(queue, false, descriptor); GET_QUEUE_FD_OR_RETURN(queue, false, descriptor);
DescriptorPutter _(descriptor); FileDescriptorPutter _(descriptor);
EventQueue* eventQueue = (EventQueue*)descriptor->u.queue; EventQueue* eventQueue = (EventQueue*)descriptor->u.queue;
@@ -711,7 +711,7 @@ _user_event_queue_wait(int queue, event_wait_info* userInfos, int numInfos,
file_descriptor* descriptor; file_descriptor* descriptor;
GET_QUEUE_FD_OR_RETURN(queue, false, descriptor); GET_QUEUE_FD_OR_RETURN(queue, false, descriptor);
DescriptorPutter _(descriptor); FileDescriptorPutter _(descriptor);
EventQueue* eventQueue = (EventQueue*)descriptor->u.queue; EventQueue* eventQueue = (EventQueue*)descriptor->u.queue;
src/system/kernel/fs/fd.cpp
+1 -1
View File
@@ -499,7 +499,7 @@ dup_foreign_fd(team_id fromTeam, int fd, bool kernel)
file_descriptor* descriptor = get_fd(fromContext, fd); file_descriptor* descriptor = get_fd(fromContext, fd);
if (descriptor == NULL) if (descriptor == NULL)
return B_FILE_ERROR; return B_FILE_ERROR;
DescriptorPutter descriptorPutter(descriptor); FileDescriptorPutter descriptorPutter(descriptor);
// create a new FD in the target I/O context // create a new FD in the target I/O context
int result = new_fd(get_current_io_context(kernel), descriptor); int result = new_fd(get_current_io_context(kernel), descriptor);
src/system/kernel/fs/vfs_request_io.cpp
+2 -2
View File
@@ -479,7 +479,7 @@ do_fd_io(int fd, io_request* request)
return B_FILE_ERROR; return B_FILE_ERROR;
} }
DescriptorPutter descriptorPutter(descriptor); FileDescriptorPutter descriptorPutter(descriptor);
return vfs_vnode_io(vnode, descriptor->cookie, request); return vfs_vnode_io(vnode, descriptor->cookie, request);
} }
@@ -501,7 +501,7 @@ do_iterative_fd_io(int fd, io_request* request, iterative_io_get_vecs getVecs,
return B_FILE_ERROR; return B_FILE_ERROR;
} }
DescriptorPutter descriptorPutter(descriptor); FileDescriptorPutter descriptorPutter(descriptor);
if (!HAS_FS_CALL(vnode, io)) { if (!HAS_FS_CALL(vnode, io)) {
// no io() call -- fall back to synchronous I/O // no io() call -- fall back to synchronous I/O