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 *). --- procfs/netfs.c | 2 +- procfs/procfs.c | 2 +- procfs/procfs.h | 4 ++-- procfs/rootdir.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'procfs') diff --git a/procfs/netfs.c b/procfs/netfs.c index 8940dfb4..4ed5eab6 100644 --- a/procfs/netfs.c +++ b/procfs/netfs.c @@ -239,7 +239,7 @@ void netfs_node_norefs (struct node *np) name into newly malloced storage, and return it in *ARGZ; set *ARGZ_LEN to the total length. */ error_t netfs_get_translator (struct node *np, char **argz, - size_t *argz_len) + mach_msg_type_number_t *argz_len) { return procfs_get_translator (np, argz, argz_len); } diff --git a/procfs/procfs.c b/procfs/procfs.c index 6d6d9649..da44b4a9 100644 --- a/procfs/procfs.c +++ b/procfs/procfs.c @@ -208,7 +208,7 @@ void procfs_cleanup (struct node *np) error_t procfs_get_translator (struct node *np, char **argz, - size_t *argz_len) + mach_msg_type_number_t *argz_len) { if (np->nn->ops->get_translator) return np->nn->ops->get_translator (np->nn->hook, argz, argz_len); diff --git a/procfs/procfs.h b/procfs/procfs.h index f2fb30eb..aef17e07 100644 --- a/procfs/procfs.h +++ b/procfs/procfs.h @@ -53,7 +53,7 @@ struct procfs_node_ops void (*cleanup) (void *hook); /* Get the passive translator record. */ - error_t (*get_translator) (void *hook, char **argz, size_t *argz_len); + error_t (*get_translator) (void *hook, char **argz, mach_msg_type_number_t *argz_len); }; /* These helper functions can be used as procfs_node_ops.cleanup_contents. */ @@ -95,5 +95,5 @@ error_t procfs_lookup (struct node *np, const char *name, struct node **npp); void procfs_cleanup (struct node *np); /* Get the passive translator record if any. */ -error_t procfs_get_translator (struct node *np, char **argz, size_t *argz_len); +error_t procfs_get_translator (struct node *np, char **argz, mach_msg_type_number_t *argz_len); diff --git a/procfs/rootdir.c b/procfs/rootdir.c index 908cfe6c..7742eddc 100644 --- a/procfs/rootdir.c +++ b/procfs/rootdir.c @@ -769,7 +769,7 @@ rootdir_make_translated_node (void *dir_hook, const void *entry_hook) static error_t rootdir_translated_node_get_translator (void *hook, char **argz, - size_t *argz_len) + mach_msg_type_number_t *argz_len) { const struct procfs_translated_node_ops *ops = hook; -- cgit v1.2.3