From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) by sourceware.org (Postfix) with ESMTPS id 218753858D3C for ; Sat, 18 Feb 2023 20:37:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 218753858D3C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-lj1-x22e.google.com with SMTP id by19so1258070ljb.10 for ; Sat, 18 Feb 2023 12:37:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=s4UMt8rlCiCLWxn3gD+S6Da5U6kuYj2AgpmO+IqxvoQ=; b=CTKbOaA/CwCC+z+GhmimNocMWr+KyohhLpp5guhlOmlCYY4KBlKX0C5RDEtrYYcud0 YVzpttkbwx9pQxHtzG1qMVzCDW/scQQH8pckFJ/9OefWfeRKTZOpsVMRVAqTO5Y4F0Bu 04TWKIiZepZKaxBaNOPrxfW0/kSFnaF0i7/Y2gqMtIlpA6Wl86uevG/DbTgQKzFm5+3I qjaxpxDT0QN2AbGQWPkYUfASMMvowySnBIsPD6WhKL01/pzAkPpW9hNZxY4Y5lt85vo3 IzmAI1t+b+Rkv6ykpvAyXS0YtrzJOaWlFFMb1uCEt5zuel96pVxW7y9q9+Z0bV6uKcMW FPjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s4UMt8rlCiCLWxn3gD+S6Da5U6kuYj2AgpmO+IqxvoQ=; b=rGRXdKnmRWcM76ypiDn9oNI94vhoiRy2GdWHk0IBfZZv/rOzcAkuJNoz/UWm6V8e1Q ODApTzOT50z6qYjm6g2QlKiwrbDBxOlw2xRZTXjyWySJNuSSZRRPsc7NQWPdqUNa777/ Q04QtvYfJKm45gUB7sh9diJqPx2wa8QnhooREJEbGvU89WYR8UC4XFKu2HmIPpd0pW0W OEPC6v85/kXSCTe51KHBa8V3ZdRT/+iYDpuL3Ttm6euEiT76WIz3Jd6N9+iQ8a1vSEta XY7bdNtib/iHW+4wc4MqH2iwnAOitE3owO8VOZG3lAysO3Ec1PBD6DN6qPyNi3Dzeg8p 045g== X-Gm-Message-State: AO0yUKVW9rkeWjY+z7celJ13UzsYjTDst/V4WHESpElhHTiAI8hU8yZF H7Yetm5noGEl/B4Bsa3+SsYgWSawb2U8lQ== X-Google-Smtp-Source: AK7set+FeSYIVjZJmZH4dLRGWJBKPdhRvgyVdgv73gwLLftU8xKiRWPgqVpe81zD856tC+iCZ50CIQ== X-Received: by 2002:a2e:8e89:0:b0:293:153b:1c74 with SMTP id z9-20020a2e8e89000000b00293153b1c74mr1545297ljk.29.1676752654537; Sat, 18 Feb 2023 12:37:34 -0800 (PST) Received: from surface-pro-6.. ([2a00:1370:818c:4a57:e4a7:ca9:e8d7:4ead]) by smtp.gmail.com with ESMTPSA id u15-20020a05651c130f00b002934febffe4sm1004049lja.128.2023.02.18.12.37.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Feb 2023 12:37:34 -0800 (PST) From: Sergey Bugaev To: bug-hurd@gnu.org, libc-alpha@sourceware.org Cc: =?UTF-8?q?Fl=C3=A1vio=20Cruz?= , Sergey Bugaev Subject: [RFC PATCH 2/9] hurd: Use proper integer types Date: Sat, 18 Feb 2023 23:37:10 +0300 Message-Id: <20230218203717.373211-3-bugaevc@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230218203717.373211-1-bugaevc@gmail.com> References: <20230218203717.373211-1-bugaevc@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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