From nobody Thu Dec 12 08:46:25 2024 X-Original-To: dev-commits-ports-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 4Y85fp0qMLz5hCj2; Thu, 12 Dec 2024 08:46:26 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y85fp0DxPz41Fl; Thu, 12 Dec 2024 08:46:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733993186; 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=9ul2u6R0JOwwwuV7bJfhwLsvRTB54/3aulNBDU3Xy1k=; b=kgqEz57893QTqeZstoXh1ck0DrlhMNsVVLXrFBLRIUEU9HzLtdmnYTbGjjrU34Sw7BDR1P obCTqN5yXC68aQjrMLafrK63zNyUeo3GlcKEHzDf5WrYYYLlZJwjLYFsCH4eLUQVXFyBG9 UO6GZOh/Avm60hlqDWbvSSIix2LuJxMD+kDxEOFYv35MPFZ/qlvJd1dSRAqsrvQzHvaGqS 7Y4oXNpujfQ5NvQfjEOVqWKMlrob8nbPHD3nIrZ6Sd7inLI39/5Mo+t1LWJUBtUY4aQph+ evTAZP6AMMOLUK6wt3Zj18bjF2jn9Azt6kHrpw4yhjMItXUqC8nWRZnfUBtLSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733993186; 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=9ul2u6R0JOwwwuV7bJfhwLsvRTB54/3aulNBDU3Xy1k=; b=aBY2OquJ+02p0/PZUaX9/vevZJZQyOY04Fm9ycB1i1M3lkqe6bRTOGRFDDyq/TIBeus2Gn d7o5BmeRIYUyzvQrp3p3hKfksfS374dC+63eDCigww0v1cHRBZWjrnHkFNQ6Railm1Lz7C t9/q69XLmlZakeKOflhyqafyR1YP58ZfDuecM4EJVeLee2r+zt5d34UnCpUrDKwJ3GToWS y5XRIv7DIp4hraNGsqBEENB5LGD5WNbYYlFFtUHwr3/eilV1GstgLvwE2wK79ROF67JIAx /ZjF+v+c/2Yx9aWoqXickT46ahBpadg1uBtsLlsPc8TZK/N6/mpmGRgxxBvyMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733993186; a=rsa-sha256; cv=none; b=VEZg4td4K3MDnh52MerbcIQ7x4S8ZXC7Px1XEaK/SqRBSMuMkdLoyJIgmoJOvRR25fhD3P g+tb83KqF8dDIkMrWa0gR62wEdSuZeD5npykzt+FYl5fvRa6SzusrSMcBYmjQzQ3AlzIfU g5BKvmgRRsYpQEA7OLy1kZ1hk9q/MazVN+9Fc95lrgn7ZuBZ3pcN7NKAF2Wd0gOBEh76ZT wonRojaUAMMYsqootDDdrDkRSbBwtnqi/prvpnNGwvWFq69s7MLUi9po6mFKYitSh4l8d1 AlUqW61/olb6WyoUMv87L7oQMDrZMyEvAXTjmAUGz0az6pxf0PLBudz+wZk4AA== 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 4Y85fn6x2nzlpK; Thu, 12 Dec 2024 08:46:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BC8kPS4029039; Thu, 12 Dec 2024 08:46:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BC8kPaG029036; Thu, 12 Dec 2024 08:46:25 GMT (envelope-from git) Date: Thu, 12 Dec 2024 08:46:25 GMT Message-Id: <202412120846.4BC8kPaG029036@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Juraj Lutter Subject: git: d1169c6e586f - main - sysutils/lockfile-progs: Fix build on releng/13 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1169c6e586f88386af33928d552dc9160fded61 Auto-Submitted: auto-generated The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=d1169c6e586f88386af33928d552dc9160fded61 commit d1169c6e586f88386af33928d552dc9160fded61 Author: Juraj Lutter AuthorDate: 2024-12-11 19:03:17 +0000 Commit: Juraj Lutter CommitDate: 2024-12-12 08:44:52 +0000 sysutils/lockfile-progs: Fix build on releng/13 While building in on releng/13, the following error occurs: lockfile-progs.c:312:7: error: expected expression 312 | char *err = 0L; | ^ lockfile-progs.c:313:26: error: use of undeclared identifier 'err' 313 | int rc = asprintf(&err, "unrecognized error status (%d)", status); | ^ lockfile-progs.c:319:14: error: use of undeclared identifier 'err' 319 | return err; | ^ This small patch addresses this problem. Approved by: yasu (maintainer) Differential Revision: https://reviews.freebsd.org/D48037 --- .../lockfile-progs/files/patch-lockfile-progs.c | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/sysutils/lockfile-progs/files/patch-lockfile-progs.c b/sysutils/lockfile-progs/files/patch-lockfile-progs.c new file mode 100644 index 000000000000..e5b625f23590 --- /dev/null +++ b/sysutils/lockfile-progs/files/patch-lockfile-progs.c @@ -0,0 +1,28 @@ +--- lockfile-progs.c.orig 2024-12-11 18:54:17 UTC ++++ lockfile-progs.c +@@ -278,6 +278,8 @@ get_status_code_string(int status) + static char* + get_status_code_string(int status) + { ++ char *err = NULL; ++ + switch (status) + { + case L_SUCCESS: +@@ -309,15 +311,12 @@ get_status_code_string(int status) + break; + + default: +- char *err = 0L; +- int rc = asprintf(&err, "unrecognized error status (%d)", status); +- if (rc < 0) ++ if (asprintf(&err, "unrecognized error status (%d)", status) < 0) + { + msg(stderr, "unable to generate error message"); + exit(2); + } + return err; +- break; + } + } +