From nobody Sat Jan 14 17:20:08 2023 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 4NvQ5h6xgqz2sXyF; Sat, 14 Jan 2023 17:20:08 +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 4NvQ5h5BDLz3xNp; Sat, 14 Jan 2023 17:20:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673716808; 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=g8MqMEhd/Pi3rLMwx7fwK+nlyQdukvXOy2cGpVFNgh8=; b=wtWxmaXGCW5MumyV8uFH6RTEBBag3J7OAGQR4Og9PebKp0i25Z9+rEJVzHagcX3XGCG37G Ssi1alAC9kOnGuc3H1l+52oX30aMo+6cDlDudBDCkZk6EyPhSGR8GVEapt1Y30xZ9A26nP KP4pf52Bpc5q5TSc5pvc7GwiqLgV2QkpZSuxpo21b4FSXd6eTvO2KJJiiz0bRgJN1Fbn7Y tS045E4Dm40izPD0J3pHmggdWcLEKIOobqjONLUJUsaRMAC9zLuLNHCWJZI0j9HrJMfvmJ W1GaEXhvU1Z/7FNDwfdaQ50BBIyvwC99hdEiC6CVPNjoRuzvlnnRzRp/6GDfHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673716808; 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=g8MqMEhd/Pi3rLMwx7fwK+nlyQdukvXOy2cGpVFNgh8=; b=ExF6vI5+Z5LWTuukB1ZJRz+PJpfQkp9FoGvLqTSG8Uqt5wfOkljv2c7SPD7t53XOAEJudZ rQbc52c/W78apQvDNj2j7dXV54xBXPw2IcqDmAkWxrdy1eLf0zhsoDPY/y52hiK6th9sp1 ia2rd1LxvW46LZoLCNdrYYcATUDtCBue2Qudhg9oMRMOz+OMYHE/wgtpXQlAcb0t9tkIhy LU5EhV3p6bdQJgvr4LPEHgX4mJosafCEkzulNh/Nwahx+TcoApYK8Dj7RXAfubH87bx7dT l/TYWw57JPzh3nMhCQBWz+K+dRqMmWOXZtzQ5zYJVxin+OSZ1xl1Bd6lFJwn5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673716808; a=rsa-sha256; cv=none; b=ZuVYw6ZWujgEgfbEn69XMIXWyqNnzy38NuGoQ+oWpzxdZ/3p7qyL3sSsSuzXRCjQeBlbEL v0oXDuLzWpzqlipihKMEyN64gRTyrfuSQCbaIBMp359g8RmOjGHBFqxhaQgDU0BgMx7uN+ jI7fCxuW4b5nRcarK4E3E4qXx6FltFkB3J+9Bbsz3K7BtT+CZdwzLXvNiYlMiw0sj2ozwx yNkbDFxQsX3vpC8FDmn3Ms3MnuUPG2ZMqKFvFT+HPO1hDwhVHAVhj5Vv+xBkmXQwuSQHB6 J4B+shOiqsZI3DnaUHioNVGK6E6kbm/nm6U1Zc0l9nD4Mj/DfSCkz5qgDmLr8Q== 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 4NvQ5h3k7rzvtv; Sat, 14 Jan 2023 17:20:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30EHK8YU050448; Sat, 14 Jan 2023 17:20:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30EHK8GC050445; Sat, 14 Jan 2023 17:20:08 GMT (envelope-from git) Date: Sat, 14 Jan 2023 17:20:08 GMT Message-Id: <202301141720.30EHK8GC050445@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 2aad7570f4e1 - main - tzcode: Silence warnings. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2aad7570f4e11ac94bb06c44cdc83ad1962fb97e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2aad7570f4e11ac94bb06c44cdc83ad1962fb97e commit 2aad7570f4e11ac94bb06c44cdc83ad1962fb97e Author: Dag-Erling Smørgrav AuthorDate: 2023-01-13 15:05:36 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-01-14 17:17:06 +0000 tzcode: Silence warnings. * Ignore failure to remove our temp file. * Avoid a minor memory leak in the -D case. Reported by: Coverity (CID 1502534, 1502535, 1502538) MFC after: 1 week Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D38038 --- contrib/tzcode/zic.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/contrib/tzcode/zic.c b/contrib/tzcode/zic.c index 812814b70cfa..c65282d46d27 100644 --- a/contrib/tzcode/zic.c +++ b/contrib/tzcode/zic.c @@ -661,7 +661,7 @@ close_file(FILE *stream, char const *dir, char const *name, name ? name : "", name ? ": " : "", e); if (tempname) - remove(tempname); + (void)remove(tempname); exit(EXIT_FAILURE); } } @@ -1418,7 +1418,7 @@ rename_dest(char *tempname, char const *name) if (tempname) { if (rename(tempname, name) != 0) { int rename_errno = errno; - remove(tempname); + (void)remove(tempname); fprintf(stderr, _("%s: rename to %s/%s: %s\n"), progname, directory, name, strerror(rename_errno)); exit(EXIT_FAILURE); @@ -3933,6 +3933,14 @@ mp = _("time zone abbreviation differs from POSIX standard"); static void mkdirs(char const *argname, bool ancestors) { + /* + * If -D was specified, do not create directories. A subsequent + * file operation will fail and produce an appropriate error + * message. + */ + if (Dflag) + return; + char *name = estrdup(argname); char *cp = name; @@ -3943,13 +3951,6 @@ mkdirs(char const *argname, bool ancestors) it can use slashes to separate the already-existing ancestor prefix from the to-be-created subdirectories. */ - /* - * If -D was specified, do not create directories. A subsequent - * file operation will fail and produce an appropriate error - * message. - */ - if (Dflag) - return; /* Do not mkdir a root directory, as it must exist. */ while (*cp == '/') cp++;