Applied, thanks!
Flavio Cruz, le ven. 29 déc. 2023 16:20:57 -0500, a ecrit:
> ---
> libfshelp-tests/race.c | 9 +++++----
> libnetfs/file-get-translator.c | 2 +-
> pfinet/ethernet.c | 2 +-
> pfinet/io-ops.c | 10 ++++++----
> utils/mount.c | 2 +-
> utils/msgport.c | 2 +-
> 6 files changed, 15 insertions(+), 12 deletions(-)
>
> diff --git a/libfshelp-tests/race.c b/libfshelp-tests/race.c
> index 376ada2..e1df296 100644
> --- a/libfshelp-tests/race.c
> +++ b/libfshelp-tests/race.c
> @@ -33,7 +33,8 @@ int main (int argc, char **argv)
> mach_port_t rendezvous = MACH_PORT_NULL;
> int fd;
> int i;
> - mach_msg_type_number_t v;
> + mach_msg_type_number_t n_read;
> + vm_size_t v;
> int blocked = 0;
> char buf[10] = "";
> char *bufp;
> @@ -61,12 +62,12 @@ int main (int argc, char **argv)
> if (err)
> error (1, err, "file_record_lock");
>
> - v = sizeof (buf);
> + v = n_read = sizeof (buf);
> bufp = buf;
> - io_read (fd, &bufp, &v, 0, v);
> + io_read (fd, &bufp, &n_read, 0, v);
>
> v = atoi (bufp);
> - sprintf (buf, "%d\n", v + 1);
> + sprintf (buf, "%d\n", (int) (v + 1));
>
> v = 10;
> io_write (fd, buf, sizeof (buf), 0, &v);
> diff --git a/libnetfs/file-get-translator.c b/libnetfs/file-get-translator.c
> index b3998b0..f402250 100644
> --- a/libnetfs/file-get-translator.c
> +++ b/libnetfs/file-get-translator.c
> @@ -116,7 +116,7 @@ netfs_S_file_get_translator (struct protid *user,
> else if (np->nn_translated & S_IPTRANS)
> {
> char *string = NULL;
> - size_t len = 0;
> + mach_msg_type_number_t len = 0;
> err = netfs_get_translator (np, &string, &len);
> if (!err)
> {
> diff --git a/pfinet/ethernet.c b/pfinet/ethernet.c
> index ad21917..65ec1e2 100644
> --- a/pfinet/ethernet.c
> +++ b/pfinet/ethernet.c
> @@ -324,7 +324,7 @@ void
> setup_ethernet_device (char *name, struct device **device)
> {
> struct net_status netstat;
> - size_t count;
> + mach_msg_type_number_t count;
> int net_address[2];
> error_t err;
> struct ether_device *edev;
> diff --git a/pfinet/io-ops.c b/pfinet/io-ops.c
> index 818f113..5f83a02 100644
> --- a/pfinet/io-ops.c
> +++ b/pfinet/io-ops.c
> @@ -135,10 +135,11 @@ S_io_seek (struct sock_user *user,
>
> kern_return_t
> S_io_readable (struct sock_user *user,
> - vm_size_t *amount)
> + vm_size_t *out_amount)
> {
> struct sock *sk;
> error_t err;
> + mach_msg_type_number_t amount = 0;
>
> if (!user)
> return EOPNOTSUPP;
> @@ -160,7 +161,8 @@ S_io_readable (struct sock_user *user,
> {
> case SOCK_STREAM:
> case SOCK_SEQPACKET:
> - err = tcp_tiocinq (sk, amount);
> + err = tcp_tiocinq (sk, &amount);
> + *out_amount = amount;
> break;
>
> case SOCK_DGRAM:
> @@ -169,7 +171,7 @@ S_io_readable (struct sock_user *user,
> err = EINVAL;
> else
> /* Boy, I really love the C language. */
> - *amount = (skb_peek (&sk->receive_queue)
> + *out_amount = (skb_peek (&sk->receive_queue)
> ? : &((struct sk_buff){}))->len;
> break;
>
> @@ -358,7 +360,7 @@ S_io_reauthenticate (struct sock_user *user,
> struct sock_user *newuser;
> uid_t gubuf[20], ggbuf[20], aubuf[20], agbuf[20];
> uid_t *gen_uids, *gen_gids, *aux_uids, *aux_gids;
> - size_t genuidlen, gengidlen, auxuidlen, auxgidlen;
> + mach_msg_type_number_t genuidlen, gengidlen, auxuidlen, auxgidlen;
> error_t err;
> size_t i, j;
> auth_t auth;
> diff --git a/utils/mount.c b/utils/mount.c
> index 75211d7..898e056 100644
> --- a/utils/mount.c
> +++ b/utils/mount.c
> @@ -493,7 +493,7 @@ do_query (struct fs *fs)
> error_t err;
> fsys_t fsys;
> char _opts[200], *opts = _opts;
> - size_t opts_len = sizeof opts;
> + mach_msg_type_number_t opts_len = sizeof opts;
> size_t nopts;
>
> err = fs_fsys (fs, &fsys);
> diff --git a/utils/msgport.c b/utils/msgport.c
> index a07cc0e..e3ea430 100644
> --- a/utils/msgport.c
> +++ b/utils/msgport.c
> @@ -676,7 +676,7 @@ main(int argc, char *argv[])
> size_t num_cmds = 0;
> struct cmds_argp_params cmds_argp_params = { &cmds, &num_cmds };
> pid_t *pids = 0; /* User-specified pids. */
> - size_t num_pids = 0;
> + mach_msg_type_number_t num_pids = 0;
> struct pids_argp_params pids_argp_params = { &pids, &num_pids, 0 };
>
> error_t parse_opt (int key, char *arg, struct argp_state *state)
> --
> 2.39.2
>
>
--
Samuel
---
Pour une évaluation indépendante, transparente et rigoureuse !
Je soutiens la Commission d'Évaluation de l'Inria.
