From nobody Sat Aug 1 03:35:27 2026 X-Original-To: dev-commits-src-main@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 4hBpVR4lRWz6mlhd for ; Sat, 01 Aug 2026 03:35:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hBpVR46Gmz3FHg for ; Sat, 01 Aug 2026 03:35:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785555327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Tf8GXx6Nv6Cfuxrus2rUbKSZ34fZ5NqvHM5VtMGvgE=; b=mN57T1VCg8AmbBW1jPS38vF9P2GQ7GBNVRy08TrADWSh1xwSzU8GOi0a8G6QBl685hcplK eILLpbUxBCushxuu1qlGx4i2VxNU2kXT69yUoY7pfHAcDDGUbXiyL3DTr20euVLt7QIQe3 5cq/SF7VDrzXcGnG4KOfhTgZUJu7//cRTlwAGTXoeQRSN/oIvf/uXDV/RAGAxSQinR6RvI KN5bvGiqwdTWLowiG2aseFgf1nsMYKdVD2fN0yuQKxBMr2EQRvCOLrVHvmWAG/zR++QO/f +G9ZuTibXtMGSkaJLRm+RiyH3NlBIW/45dyhi+crE2P/bajwfqd71nrQ3ApeYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785555327; a=rsa-sha256; cv=none; b=gKdRvDCgdCQSt9TQlAEzfbSsGaLoGCj5GOPHnfO5gMjhaOyf/vGmuHcNWmN8WbOMd8vlal VpBKsjkoJmjsaGjiWGg5FMvasmuEEWzG1lQXYTXb7qPaLaXqh1u9PyGdiqauiKrhST33mY NT/LW5Ybp01VgNaQ0diDe0keWcT4UUHcvokSXYxfyLTslmwV8iKtnYgM1KquWH8BLFP39W eT34KjsrnmQ7nB008eQ1GRD8RNZpMFC4/8N1PKFxVh9eeaZmzyJ6Znzr2XqtH0N9pNJlE9 tha4MxNWTCZiaU5lRN3CMWLHBd8Zs2g8CtdQzGPWMNOXndu+PPWD5d9mdekIpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785555327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Tf8GXx6Nv6Cfuxrus2rUbKSZ34fZ5NqvHM5VtMGvgE=; b=uOihRer1OBivSw1b04KKspStR7HBGJOxEo++7N2eJPA+SPdsOtZ7S7fWksrpKGD/gyR8Sv CkKVN6pUhrV5GS82r7DlQzYl00g8JZCBun9TBelddowombRCF1Lb376w+tGIyUTOcqmo5o 4vLTGalR6MZmRob8bFw5NeNCefuLfPCeiAk0KyItwTeb9K5kBmvVTEX/Qf8Mfte+k40jlw I4KJS0lsHEbz5RD6jorKOBAfWhqZ9qZF4U8lVPaHdh8opsPUrH4zONUoZnHC9/BJZwWPPi Sc3hxyzD4kY/8ocpAsY0c/6XJtsS+7KEomSg559eFde5NdNHoOmnrC16JCJNCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hBpVR322czD3Y for ; Sat, 01 Aug 2026 03:35:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35da7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 01 Aug 2026 03:35:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 28327c58ee6d - main - stdio: *memstream: slightly streamline growth function List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28327c58ee6de7ddbdcf0e56352b257d37f2103d Auto-Submitted: auto-generated Date: Sat, 01 Aug 2026 03:35:27 +0000 Message-Id: <6a6d697f.35da7.6651c5db@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=28327c58ee6de7ddbdcf0e56352b257d37f2103d commit 28327c58ee6de7ddbdcf0e56352b257d37f2103d Author: Kyle Evans AuthorDate: 2026-08-01 03:34:37 +0000 Commit: Kyle Evans CommitDate: 2026-08-01 03:34:37 +0000 stdio: *memstream: slightly streamline growth function Inverting the condition after realloc*() is a minor cleanup, but makes the success path a little cleaner to ease a future change. Reviewed by: des, jhb Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D57353 --- lib/libc/stdio/open_memstream.c | 17 ++++++++--------- lib/libc/stdio/open_wmemstream.c | 16 +++++++--------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/lib/libc/stdio/open_memstream.c b/lib/libc/stdio/open_memstream.c index 371022adf6b3..29de688376bf 100644 --- a/lib/libc/stdio/open_memstream.c +++ b/lib/libc/stdio/open_memstream.c @@ -62,17 +62,16 @@ memstream_grow(struct memstream *ms, fpos_t newoff) newsize = newoff; if (newsize > ms->len) { buf = realloc(*ms->bufp, newsize + 1); - if (buf != NULL) { + if (buf == NULL) + return (0); + #ifdef DEBUG - fprintf(stderr, "MS: %p growing from %zd to %zd\n", - ms, ms->len, newsize); + fprintf(stderr, "MS: %p growing from %zd to %zd\n", + ms, ms->len, newsize); #endif - memset(buf + ms->len + 1, 0, newsize - ms->len); - *ms->bufp = buf; - ms->len = newsize; - return (1); - } - return (0); + memset(buf + ms->len + 1, 0, newsize - ms->len); + *ms->bufp = buf; + ms->len = newsize; } return (1); } diff --git a/lib/libc/stdio/open_wmemstream.c b/lib/libc/stdio/open_wmemstream.c index 213d61fcd4dd..0bed4cff5d11 100644 --- a/lib/libc/stdio/open_wmemstream.c +++ b/lib/libc/stdio/open_wmemstream.c @@ -63,17 +63,15 @@ wmemstream_grow(struct wmemstream *ms, fpos_t newoff) newsize = newoff; if (newsize > ms->len) { buf = reallocarray(*ms->bufp, newsize + 1, sizeof(wchar_t)); - if (buf != NULL) { + if (buf == NULL) + return (0); #ifdef DEBUG - fprintf(stderr, "WMS: %p growing from %zd to %zd\n", - ms, ms->len, newsize); + fprintf(stderr, "WMS: %p growing from %zd to %zd\n", + ms, ms->len, newsize); #endif - wmemset(buf + ms->len + 1, 0, newsize - ms->len); - *ms->bufp = buf; - ms->len = newsize; - return (1); - } - return (0); + wmemset(buf + ms->len + 1, 0, newsize - ms->len); + *ms->bufp = buf; + ms->len = newsize; } return (1); }