From 3bc9a699ca7106204ffa97272374313bf04f6cc0 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Tue, 8 Aug 2023 01:25:50 +0200 Subject: Homogeneize [gs]et_translator and get_dire[nc]ts into mach_msg_type_number_t This makes netfs_[gs]et_translator use mach_msg_type_number_t like the RPC and diskfs. This also makes the fshelp_fetch_root_callback1_t for fshelp_fetch_root use mach_msg_type_number_t. This also makes procfs_get_translator and the get_translator proc method use mach_msg_type_number_t. This makes diskfs_get_directs use mach_msg_type_number_t like the dir_readdir RPC Also get rid of u_int. This notably fixes _diskfs_translator_callback1_fn's bogus cast of size_t *argz_len into (u_int *). --- libdiskfs/dir-readdir.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'libdiskfs/dir-readdir.c') diff --git a/libdiskfs/dir-readdir.c b/libdiskfs/dir-readdir.c index 82a9720f..a314e9d1 100644 --- a/libdiskfs/dir-readdir.c +++ b/libdiskfs/dir-readdir.c @@ -26,7 +26,7 @@ kern_return_t diskfs_S_dir_readdir (struct protid *cred, data_t *data, - mach_msg_type_number_t *datacnt, + mach_msg_type_number_t *datacnt, boolean_t *data_dealloc, int entry, int nentries, @@ -35,7 +35,6 @@ diskfs_S_dir_readdir (struct protid *cred, { error_t err; struct node *np; - size_t data_len = *datacnt; if (!cred) return EOPNOTSUPP; @@ -55,15 +54,8 @@ diskfs_S_dir_readdir (struct protid *cred, return ENOTDIR; } - err = diskfs_get_directs (np, entry, nentries, - data, &data_len, - bufsiz, amt); + err = diskfs_get_directs (np, entry, nentries, data, datacnt, bufsiz, amt); *data_dealloc = 1; /* XXX */ pthread_mutex_unlock (&np->lock); - - if (err) - return err; - - *datacnt = data_len; - return 0; + return err; } -- cgit v1.2.3