From nobody Wed Jan 04 01:22:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NmsKr20jjz2pPWr; Wed, 4 Jan 2023 01:22:56 +0000 (UTC) (envelope-from yuri@aetern.org) Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4NmsKq6pjZz3pTr; Wed, 4 Jan 2023 01:22:55 +0000 (UTC) (envelope-from yuri@aetern.org) Authentication-Results: mx1.freebsd.org; none Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 4BA76320090D; Tue, 3 Jan 2023 20:22:53 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Tue, 03 Jan 2023 20:22:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aetern.org; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1672795372; x= 1672881772; bh=xddbRY+TUtTQ8nrNAUxE+3WR+qeoJweDfuMMS/InnNA=; b=p RyXNt9yOmSidWPsPLEj7SZogUHfUkux0WnbVRt6gqJkJjH9Lts5c1FLoMPU6HfmS Rq+mi4e0oIj83O/F3kc1avP4s5zpGw8/8mUEXSWn7wtpWNCij8VgpDXcB70K0Di0 sz20nLBGEV+gpDsvS0k3DQNC3zlGzU2vzBZZY+PqhT86hT8ybCmhxlzSUkUBuTB7 qfrWpCm02wyxy09Dv7ds2r5IS4/6897HI6ZUfnYAhtDZ96/HGTo5wJdYOsA0gcHi OEfdwiR7VZsNaC+4W5aWrMN9ReH8FceYCxNKPf+y7Ulj6gPzgq0fu4kBhbsQGVJl kQeLUIl4Ea1LECddMIiEw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; t=1672795372; x=1672881772; bh=x ddbRY+TUtTQ8nrNAUxE+3WR+qeoJweDfuMMS/InnNA=; b=L/OIEs+ALfBHVbkCm 5LC1QauTZr5bCHRlK/ihrEWCv0WALXf3OPFd9vxU+XXM7uULmpAGpJS7c+M8EZA9 C60PLnnvMn33j94fy8p8pW4aP0FLitFg7w0VwYH/hP+7Zk0L0nlY7UA//xDu8nO7 NOQyfVE+h1/wre1ISY17PvY958f0etCuo5PkquaoBKtm7jUOdvW+H8kwASUfP69k eLCM2km8g6whJoOaOp/BpDOC3fvyXewn+wR06teMCaTZO2zlpLuF6w3tO04kXB6X G9RlgF1m6XVtcx/g8M/yTojn+UpGFPFIL/UWxwTY4U6oIgItFPfTRGDu9Er4YFiu BG0YA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrjeehgdefhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefkffggfgfuvfhfhfgjtgfgsehtjeertddtfeejnecuhfhrohhmpegjuhhrihcu oeihuhhrihesrggvthgvrhhnrdhorhhgqeenucggtffrrghtthgvrhhnpeegheelveeuhe fhgffgteetffeifffhudetudetuedvhedvhfffvdethfffjeejvdenucffohhmrghinhep fhhrvggvsghsugdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpeihuhhrihesrggvthgvrhhnrdhorhhg X-ME-Proxy: Feedback-ID: i0d79475b:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 3 Jan 2023 20:22:51 -0500 (EST) Message-ID: <3b94661a-5839-b630-fadc-2b646d4e46cb@aetern.org> Date: Wed, 4 Jan 2023 02:22:49 +0100 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Subject: Re: git: eb03c1f81cbc - main - wdatwd: fix i386 build breakage. Content-Language: en-US To: Takanori Watanabe , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202301040104.30414Dkj033669@gitrepo.freebsd.org> From: Yuri In-Reply-To: <202301040104.30414Dkj033669@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4NmsKq6pjZz3pTr X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:29838, ipnet:64.147.123.0/24, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N Takanori Watanabe wrote: > The branch main has been updated by takawata: > > URL: https://cgit.FreeBSD.org/src/commit/?id=eb03c1f81cbce1d248ebf872bcb035cc6fd7c5de > > commit eb03c1f81cbce1d248ebf872bcb035cc6fd7c5de > Author: Takanori Watanabe > AuthorDate: 2023-01-03 23:30:32 +0000 > Commit: Takanori Watanabe > CommitDate: 2023-01-04 01:04:44 +0000 > > wdatwd: fix i386 build breakage. > > Formatting string for uint64_t has portablity issue and > lead bulid breakage, so fix it. > > Reviewed by hrs > Differential Revision: https://reviews.freebsd.org/D37937 > --- > sys/dev/wdatwd/wdatwd.c | 21 ++++++++++++++------- > 1 file changed, 14 insertions(+), 7 deletions(-) > > diff --git a/sys/dev/wdatwd/wdatwd.c b/sys/dev/wdatwd/wdatwd.c > index 4f00e69ad863..a4e2acac5eca 100644 > --- a/sys/dev/wdatwd/wdatwd.c > +++ b/sys/dev/wdatwd/wdatwd.c > @@ -363,8 +363,12 @@ wdatwd_event(void *private, u_int cmd, int *error) > if (wdatwd_get_current_countdown(sc, &cur[1]) != 0) > cur[1] = 0; > WDATWD_VERBOSE_PRINTF(sc->dev, "cmd: %u, sc->running: " > - "%d -> %d, cnt: %lu -> %lu, cur: %lu -> %lu\n", cmd, > - run[0], run[1], cnt[0], cnt[1], cur[0], cur[1]); > + "%d -> %d, cnt: %llu -> %llu, cur: %llu -> %llu\n", cmd, > + run[0], run[1], > + (unsigned long long) cnt[0], > + (unsigned long long) cnt[1], > + (unsigned long long)cur[0], > + (unsigned long long)cur[1]); "Second level indents are four spaces.". "Casts and sizeof's are not followed by a space." > } > > return; > @@ -674,7 +678,7 @@ wdatwd_attach(device_t dev) > for (i = 0; i < nitems(sc->action); ++i) > STAILQ_FOREACH(wdat, &sc->action[i], next) { > WDATWD_VERBOSE_PRINTF(dev, "action: 0x%02x, " > - "%s %s at 0x%lx (%d bit(s), offset %d bit(s))\n", > + "%s %s at 0x%llx (%d bit(s), offset %d bit(s))\n", > i, > wdat->entry.RegisterRegion.SpaceId > == ACPI_ADR_SPACE_SYSTEM_MEMORY > @@ -692,6 +696,7 @@ wdatwd_attach(device_t dev) > : wdat->entry.RegisterRegion.AccessWidth == 4 > ? "qword" > : "undef", > + (unsigned long long ) "No spaces after `(' or `[' or preceding `]' or `)' characters." > wdat->entry.RegisterRegion.Address, > wdat->entry.RegisterRegion.BitWidth, > wdat->entry.RegisterRegion.BitOffset); > @@ -729,16 +734,18 @@ wdatwd_attach(device_t dev) > dev, res->type, &res->rid, RF_ACTIVE); > if (res->res == NULL) { > bus_delete_resource(dev, res->type, res->rid); > - device_printf(dev, "%s at 0x%lx (%ld byte(s)): " > + device_printf(dev, "%s at 0x%llx (%lld byte(s)): " > "alloc' failed\n", > res->type == SYS_RES_MEMORY ? "mem" : "io ", > - res->start, res->end - res->start); > + (unsigned long long )res->start, > + (unsigned long long )(res->end - res->start)); "No spaces after `(' or `[' or preceding `]' or `)' characters." > goto fail; > } > - WDATWD_VERBOSE_PRINTF(dev, "%s at 0x%lx (%ld byte(s)): " > + WDATWD_VERBOSE_PRINTF(dev, "%s at 0x%llx (%lld byte(s)): " > "alloc'ed\n", > res->type == SYS_RES_MEMORY ? "mem" : "io ", > - res->start, res->end - res->start); > + (unsigned long long )res->start, > + (unsigned long long) (res->end - res->start)); "No spaces after `(' or `[' or preceding `]' or `)' characters." "Casts and sizeof's are not followed by a space." > } > > /* Initialize the watchdog hardware. */ > Some style(9) quotes.