From nobody Mon Jul 17 15:48:47 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 4R4RMM6c4Bz4nW8V; Mon, 17 Jul 2023 15:48:47 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R4RMM5kbNz3tcw; Mon, 17 Jul 2023 15:48:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689608927; 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=aSV8fHoRFZNdanEMPKVDWsSclM+szZLIcrI7o6oAHj4=; b=JE7iecSGtsQ48Zq5Z16OZ1M50H6934ZY4vnV19yi0eJEM1D/07q87gAqQjhl03xA86pcV5 JdWeaeqitLKpbL+JvQo/PhcQE84/nBYlgeEQYijwqdUg94lOmpFTAp0WsLayGxV//hxkIQ TEx5hSV9V6S/ONRZY1XDUEkYIUMyvw3YVe307U5eLkjHA+nWlGYWhm9Yjb7TWCThctbEmT qzcErsG7/bOyhnOQaxCtFxKOL5C2H0ji40EegQCJrfFnxO8nA7w5GHUZgklx8AedKM2/MY J0iQYncQ0TFglBBtUGOJPw4/BVQ5f8btI1eu/NALQoqaSL6xo8pemKmWUHpfNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689608927; 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=aSV8fHoRFZNdanEMPKVDWsSclM+szZLIcrI7o6oAHj4=; b=E/Shcjb8Md890PkW0k+kOiG6sa7R7oEOZTS+sxW/zL23AriqMgpsPSugoyHjoQ34/oh4bw TAknDFckwiOO5C2Uy2LGv2IW6xNEHbw4qvaeL46mfaToQ7c6LoBjdlnEwqCuailpaNa/nC FzfKGer0IYfamWiRfyZzS7zclXKogXe2J6VyRWhYMrxkEzcZeCarsyx7Lf3uxr5/nxSBvq vtxPEln3Mpg63TPK9qdBOBLHKP6MaqES0zEgURYi/YSUzg2BRvMQtvoLcCvgt5KJEIYLPS h44njsr587ey08DbMRIgPEM9EaBQc0ekj3kOVzrupvpC6+yo1aJKB3vDpNEmDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689608927; a=rsa-sha256; cv=none; b=KVEj9pcxZXrLMVlqi55IxGLZGL4X5fUowmb21yNjRHtn4TTM083iHMxnuJor+oPfHMvaQH h5dk/VxdhcHu6OLkYJlYoJTbzQar/8NVOhyHoX+jXQ1ppM/2SEU2dQeAT08sV0XqbNq+wU IYmtuH0K5yYBGiN4q6VAGomyo+XA3hO1tvL2eE6zGy/dz7p0DFh41gJsIZR2CcKVkj2hKN n/O3ESkBx7uzN6wgxmHuwjUOOYA1MeXFKqdHgtUKqVFYqcbpP9DL7IsX8wNWk7GPDmyG9u kyK5bHmQAc8bGfLZzsYxL9Gf0EZup8Itk15j2ryCYB2Ja61KVG4tMNqgzMOy1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R4RMM4pC7zVGr; Mon, 17 Jul 2023 15:48:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36HFmlpV080018; Mon, 17 Jul 2023 15:48:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36HFml3V080017; Mon, 17 Jul 2023 15:48:47 GMT (envelope-from git) Date: Mon, 17 Jul 2023 15:48:47 GMT Message-Id: <202307171548.36HFml3V080017@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: ed942d5a1738 - stable/13 - seq: combine asprintf return value checks 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ed942d5a173870e786fd422c9edfbe5037626b4b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ed942d5a173870e786fd422c9edfbe5037626b4b commit ed942d5a173870e786fd422c9edfbe5037626b4b Author: Ed Maste AuthorDate: 2023-06-19 02:10:32 +0000 Commit: Ed Maste CommitDate: 2023-07-17 15:48:28 +0000 seq: combine asprintf return value checks Error handling is identical for all of these failure cases. Sponsored by: The FreeBSD Foundation (cherry picked from commit 5dae8905a5141e0cba1f4f3f94116440a5ce2abb) --- usr.bin/seq/seq.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/usr.bin/seq/seq.c b/usr.bin/seq/seq.c index 50c6b6022967..e5350690c703 100644 --- a/usr.bin/seq/seq.c +++ b/usr.bin/seq/seq.c @@ -198,13 +198,9 @@ main(int argc, char *argv[]) * equal, it means the exit condition of the loop held true due to a * rounding error and we still need to print 'last'. */ - if (asprintf(&cur_print, fmt, cur) < 0) { - err(1, "asprintf"); - } - if (asprintf(&last_print, fmt, last) < 0) { - err(1, "asprintf"); - } - if (asprintf(&prev_print, fmt, prev) < 0) { + if (asprintf(&cur_print, fmt, cur) < 0 || + asprintf(&last_print, fmt, last) < 0 || + asprintf(&prev_print, fmt, prev) < 0) { err(1, "asprintf"); } if (strcmp(cur_print, last_print) == 0 &&