From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from eggs.gnu.org (eggs.gnu.org [IPv6:2001:470:142:3::10]) by sourceware.org (Postfix) with ESMTPS id 0783D3814F99 for ; Mon, 20 Feb 2023 10:53:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0783D3814F99 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gnu.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gnu.org Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pTtBx-0001Nn-1F; Sun, 19 Feb 2023 18:34:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=In-Reply-To:MIME-Version:References:Subject:To:From: Date; bh=cVZ53ShAA3XURb2GyYuq7x0NLSNk/P/OK2oINJI890c=; b=gP7JJP7ZStC6uRt6WgP7 98V+Y6H47vuAInyRy5thiYZJX4ikg/Ojck786Yvk3J5eSarMHqrgS+hcSz0RQIDJKgLu+UIQkxrou RWLg0apvk59QaRsy7nERvu5uH3Cz8FTqBgSnPRpB4GUHtQZ8SBeTwxDvohUUTR6btDXVxz6ERcfO5 Ov7TmxnWsRQxxXjKZtMpQqDUPY/xMrUcii5p3Dmcl+Bge8PSHOEvm2IKpD9RwlmTaetrJZU4w0AAq fyuSiO4DnAmuYzHrfAA+Lna2zb+VTMoQGQfHODOKUe0iSatsqjWvQpYNujGQjgR6XXuqZALgx57E/ 2IfzJYfLGhr9vg==; Received: from lfbn-bor-1-1163-184.w92-158.abo.wanadoo.fr ([92.158.138.184] helo=begin) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pTtBw-0000u0-ET; Sun, 19 Feb 2023 18:34:00 -0500 Received: from samy by begin with local (Exim 4.96) (envelope-from ) id 1pTtBv-0015IS-0x; Mon, 20 Feb 2023 00:33:59 +0100 Date: Mon, 20 Feb 2023 00:33:59 +0100 From: Samuel Thibault To: Sergey Bugaev Cc: bug-hurd@gnu.org, libc-alpha@sourceware.org, =?utf-8?Q?Fl=C3=A1vio?= Cruz Subject: Re: [RFC PATCH 2/9] hurd: Use proper integer types Message-ID: <20230219233359.py6kxvhncg7xeo6b@begin> Mail-Followup-To: Sergey Bugaev , bug-hurd@gnu.org, libc-alpha@sourceware.org, =?utf-8?Q?Fl=C3=A1vio?= Cruz References: <20230218203717.373211-1-bugaevc@gmail.com> <20230218203717.373211-3-bugaevc@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20230218203717.373211-3-bugaevc@gmail.com> Organization: I am not organized User-Agent: NeoMutt/20170609 (1.8.3) X-Spam-Status: No, score=-13.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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 > --- > 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.