Applied, thanks!
Sergey Bugaev, le sam. 18 févr. 2023 23:37:10 +0300, a ecrit:
> Fix a few more cases of build errors caused by mismatched types. This is a
> continuation of f4315054b46d5e58b44a709a51943fb73f846afb.
>
> Signed-off-by: Sergey Bugaev <buga...@gmail.com>
> ---
> hurd/hurdsig.c | 6 +++---
> sysdeps/mach/hurd/getpriority.c | 6 +++---
> sysdeps/mach/hurd/if_index.c | 2 +-
> sysdeps/mach/hurd/ifreq.c | 2 +-
> sysdeps/mach/hurd/readdir64.c | 4 +++-
> sysdeps/mach/hurd/readdir64_r.c | 4 +++-
> 6 files changed, 14 insertions(+), 10 deletions(-)
>
> diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c
> index 56e8e614..ea79ffb5 100644
> --- a/hurd/hurdsig.c
> +++ b/hurd/hurdsig.c
> @@ -430,8 +430,8 @@ _hurdsig_abort_rpcs (struct hurd_sigstate *ss, int signo,
> int sigthread,
> receive completes immediately or aborts. */
> abort_thread (ss, state, reply);
>
> - if (state->basic.PC >= (natural_t) &_hurd_intr_rpc_msg_about_to
> - && state->basic.PC < (natural_t) &_hurd_intr_rpc_msg_in_trap)
> + if (state->basic.PC >= (uintptr_t) &_hurd_intr_rpc_msg_about_to
> + && state->basic.PC < (uintptr_t) &_hurd_intr_rpc_msg_in_trap)
> {
> /* The thread is about to do the RPC, but hasn't yet entered
> mach_msg. Mutate the thread's state so it knows not to try
> @@ -442,7 +442,7 @@ _hurdsig_abort_rpcs (struct hurd_sigstate *ss, int signo,
> int sigthread,
> state->basic.SYSRETURN = MACH_SEND_INTERRUPTED;
> *state_change = 1;
> }
> - else if (state->basic.PC == (natural_t) &_hurd_intr_rpc_msg_in_trap
> + else if (state->basic.PC == (uintptr_t) &_hurd_intr_rpc_msg_in_trap
> /* The thread was blocked in the system call. After thread_abort,
> the return value register indicates what state the RPC was in
> when interrupted. */
> diff --git a/sysdeps/mach/hurd/getpriority.c b/sysdeps/mach/hurd/getpriority.c
> index 9869c2f5..45b32215 100644
> --- a/sysdeps/mach/hurd/getpriority.c
> +++ b/sysdeps/mach/hurd/getpriority.c
> @@ -30,7 +30,7 @@ __getpriority (enum __priority_which which, id_t who)
> int maxpri = INT_MIN;
> struct procinfo *pip; /* Just for sizeof. */
> int pibuf[sizeof *pip + 2 * sizeof (pip->threadinfos[0])], *pi = pibuf;
> - size_t pisize = sizeof pibuf / sizeof pibuf[0];
> + mach_msg_type_number_t pisize = sizeof pibuf / sizeof pibuf[0];
>
> error_t getonepriority (pid_t pid, struct procinfo *pip)
> {
> @@ -39,9 +39,9 @@ __getpriority (enum __priority_which which, id_t who)
> else
> {
> int *oldpi = pi;
> - size_t oldpisize = pisize;
> + mach_msg_type_number_t oldpisize = pisize;
> char *tw = 0;
> - size_t twsz = 0;
> + mach_msg_type_number_t twsz = 0;
> int flags = PI_FETCH_TASKINFO;
> onerr = __USEPORT (PROC, __proc_getprocinfo (port, pid, &flags,
> &pi, &pisize,
> diff --git a/sysdeps/mach/hurd/if_index.c b/sysdeps/mach/hurd/if_index.c
> index a4472269..c8ad7e72 100644
> --- a/sysdeps/mach/hurd/if_index.c
> +++ b/sysdeps/mach/hurd/if_index.c
> @@ -99,7 +99,7 @@ __if_nameindex (void)
> nifs = 0;
> else
> {
> - size_t len = sizeof data;
> + mach_msg_type_number_t len = sizeof data;
> err = __pfinet_siocgifconf (server, -1, &ifc.ifc_buf, &len);
> if (err == MACH_SEND_INVALID_DEST || err == MIG_SERVER_DIED)
> {
> diff --git a/sysdeps/mach/hurd/ifreq.c b/sysdeps/mach/hurd/ifreq.c
> index ef210c32..394d020c 100644
> --- a/sysdeps/mach/hurd/ifreq.c
> +++ b/sysdeps/mach/hurd/ifreq.c
> @@ -37,7 +37,7 @@ __ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd)
> else
> {
> char *data = NULL;
> - size_t len = 0;
> + mach_msg_type_number_t len = 0;
> error_t err = __pfinet_siocgifconf (server, -1, &data, &len);
> if (err == MACH_SEND_INVALID_DEST || err == MIG_SERVER_DIED)
> {
> diff --git a/sysdeps/mach/hurd/readdir64.c b/sysdeps/mach/hurd/readdir64.c
> index 47829d9e..cf98bbb1 100644
> --- a/sysdeps/mach/hurd/readdir64.c
> +++ b/sysdeps/mach/hurd/readdir64.c
> @@ -43,12 +43,13 @@ __readdir64 (DIR *dirp)
> /* We've emptied out our buffer. Refill it. */
>
> char *data = dirp->__data;
> + mach_msg_type_number_t data_size = dirp->__size;
> int nentries;
> error_t err;
>
> if (err = HURD_FD_PORT_USE (dirp->__fd,
> __dir_readdir (port,
> - &data, &dirp->__size,
> + &data, &data_size,
> dirp->__entry_ptr,
> -1, 0, &nentries)))
> {
> @@ -57,6 +58,7 @@ __readdir64 (DIR *dirp)
> break;
> }
>
> + dirp->__size = data_size;
> /* DATA now corresponds to entry index DIRP->__entry_ptr. */
> dirp->__entry_data = dirp->__entry_ptr;
>
> diff --git a/sysdeps/mach/hurd/readdir64_r.c b/sysdeps/mach/hurd/readdir64_r.c
> index 7e438aaf..4f4252c2 100644
> --- a/sysdeps/mach/hurd/readdir64_r.c
> +++ b/sysdeps/mach/hurd/readdir64_r.c
> @@ -45,11 +45,12 @@ __readdir64_r (DIR *dirp, struct dirent64 *entry, struct
> dirent64 **result)
> /* We've emptied out our buffer. Refill it. */
>
> char *data = dirp->__data;
> + mach_msg_type_number_t data_size = dirp->__size;
> int nentries;
>
> if (err = HURD_FD_PORT_USE (dirp->__fd,
> __dir_readdir (port,
> - &data, &dirp->__size,
> + &data, &data_size,
> dirp->__entry_ptr,
> -1, 0, &nentries)))
> {
> @@ -58,6 +59,7 @@ __readdir64_r (DIR *dirp, struct dirent64 *entry, struct
> dirent64 **result)
> break;
> }
>
> + dirp->__size = data_size;
> /* DATA now corresponds to entry index DIRP->__entry_ptr. */
> dirp->__entry_data = dirp->__entry_ptr;
>
> --
> 2.39.2
>
>
--
Samuel
---
Pour une évaluation indépendante, transparente et rigoureuse !
Je soutiens la Commission d'Évaluation de l'Inria.
