From nobody Sun Feb 12 23:19:17 2023 X-Original-To: dev-commits-ports-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 4PFNhj5Lnzz3pdn7; Sun, 12 Feb 2023 23:19:17 +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 4PFNhj4mz3z3Gd0; Sun, 12 Feb 2023 23:19:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676243957; 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=dh8ftvrXs4c/yO58Tn8ZDZKq2/zBndvUWise9mLLrLI=; b=O/ejm3ShHCSOlx1SPQvPAy7BeRtPr9zRwXYL9ayyZf8SQwKdJzEhwFWN+l7fVDkv9/53vk HzcYIIEDqyrkml7+eig/3klpnNKtVWYckcnNvlZQlU3S31fWwhptuMBiGql88rWeDa2hcQ kJxMIVyYXxKgSP0tjlJZIDPHI+zerOUc5/dCyOIHRatPYp+ISOD0RUDrX/dmgjM8/Bsj/z BP+BUSVBGTbRQBb3Bjx/jMIgD7EIiiRd0ZqoboIuB1TT3b2ZPwMm2GomB7vlSQ3o6D5drJ BUPuOjrbgp8YsbamLXwprWxvRI8V3KAOTDXFoACWykYCa9eIsHxmGAsnHEgJdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676243957; 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=dh8ftvrXs4c/yO58Tn8ZDZKq2/zBndvUWise9mLLrLI=; b=g3ygskdFor8JEDBYVPVQ0Lj+51Sl9XU7BJ8HH+J9CCssUNChiapIbASEveNQotQi3mFRMT KmQbSIYPvqy7UvUsecQWtPaofQqK5fFxvEd2B4jNuX8dp9zTCvZBWNrfvqEdQfuyJUb9PF A/PLd0juAh0dRFQCVU80ZpVyWt1LxiD+n4GiT3ihuBB3b/lCVePshJWHaRbp2RMfZMxZFz rkgEXVVnwoifOYL84MMbnopj6Aj8M7hWyM9h0Tt5ZBMvBoj1NivKRzenwd+UQNWGQ9inmn TFLjc0sc/MMalpQztU8EXJaSPuAqIJffwkAVMx6vqxNw7RcLGOfZ1leqJ85kjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676243957; a=rsa-sha256; cv=none; b=yl73VY/xaLlNnkRchnSO/3Psg4i481/U++qvilq1LVB4gh6DeLjCisBMX7lSShT1EGPEHN UI8FekilfQMbTSMjNzipS89i0qHn7iAdeghfroi5dWrQPbS8qRxnd/BRoEuPsoZdF7j87m 478Wk/Yi/R24PRxRqpK6QME+xycwo7hAqadgqnwgLAx1UPq8r2ZO3PSEmwYy00+gh3qedc PhJYbJGMnGS5EViNEzU0sDWtQC6gIy2Slb9wOrtrou8rl33CSrBZjafreqZQvpeLPkGWrq Yqyj/qo5j8bddhax4zRarYMjhSL96Ys0vUEiU8l8y3vz7ewEM/5XyMYAB07ybw== 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 4PFNhj3TSHzwFG; Sun, 12 Feb 2023 23:19:17 +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 31CNJH2g084045; Sun, 12 Feb 2023 23:19:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31CNJH5V084044; Sun, 12 Feb 2023 23:19:17 GMT (envelope-from git) Date: Sun, 12 Feb 2023 23:19:17 GMT Message-Id: <202302122319.31CNJH5V084044@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikhail Teterin Subject: git: cbf3e00cd3c4 - main - www/websh: newer compiler-versions find new warnings List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cbf3e00cd3c48e3a1a74018e80113e7f1b56fd56 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mi: URL: https://cgit.FreeBSD.org/ports/commit/?id=cbf3e00cd3c48e3a1a74018e80113e7f1b56fd56 commit cbf3e00cd3c48e3a1a74018e80113e7f1b56fd56 Author: Mikhail Teterin AuthorDate: 2023-02-12 23:17:12 +0000 Commit: Mikhail Teterin CommitDate: 2023-02-12 23:19:12 +0000 www/websh: newer compiler-versions find new warnings Remove the variables, where lack of actual use was too hidden for the earlier compilers. Also change one remaining K&R style function to comply with clang-15+ requirement, however bogus it seems to be. --- www/websh/files/patch-warnings | 89 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/www/websh/files/patch-warnings b/www/websh/files/patch-warnings index 1e1b335a6f00..8691f5d3c14a 100644 --- a/www/websh/files/patch-warnings +++ b/www/websh/files/patch-warnings @@ -121,3 +121,92 @@ Submitted to vendor: + registerLogPlugIn(interp, "syslog", logtosyslog); #endif /* -------------------------------------------------------------------------- +Versions 15+ of clang reject K&R-style function-definitions... +--- ../generic/tclAppInit.c 2009-07-14 15:11:04.000000000 -0400 ++++ ../generic/tclAppInit.c 2023-02-12 18:07:45.705753000 -0500 +@@ -54,7 +54,5 @@ + */ + +-int main(argc, argv) +- int argc; /* Number of command-line arguments. */ +- char **argv; /* Values of command-line arguments. */ ++int main(int argc, char **argv) + { + /* +--- ../generic/htmlify.c 2009-09-14 11:11:40.000000000 -0400 ++++ ../generic/htmlify.c 2023-02-12 18:14:07.883307000 -0500 +@@ -128,5 +128,5 @@ + /* */ + /* <-- */ +-#define HANDLE_TAG(unic,length,out,pos,err) { \ ++#define HANDLE_TAG(unic,length,out,pos) { \ + int open = 1; /* number of open '<' */ \ + int begin = pos; \ +@@ -162,5 +162,5 @@ + } + +-#define HANDLE_ENTITY(convData, unic, length, out, pos, err) { \ ++#define HANDLE_ENTITY(convData, unic, length, out, pos) { \ + int begin = pos; \ + int end = ++pos; \ +@@ -202,12 +202,12 @@ + if (unic[first] == '#') { \ + /* a number */ \ +- HANDLE_UNICODE_ENTITY(unic, length, out, begin, first, end, err); \ ++ HANDLE_UNICODE_ENTITY(unic, length, out, begin, first, end); \ + } else { \ +- HANDLE_KEY_ENTITY(convData, unic, length, out, begin, first, end, err); \ ++ HANDLE_KEY_ENTITY(convData, unic, length, out, begin, first, end); \ + } \ + } \ + } + +-#define HANDLE_UNICODE_ENTITY(unic, length, out, begin, first, end, err) { \ ++#define HANDLE_UNICODE_ENTITY(unic, length, out, begin, first, end) { \ + int tInt = 0; \ + Tcl_UniChar tmp = 0; \ +@@ -220,5 +220,4 @@ + /* no valid number, we write the string instead */ \ + Tcl_AppendUnicodeToObj(out,&(unic[begin]),end-begin); \ +- err++; \ + } else { \ + /* check if within range of Tcl_UniChar */ \ +@@ -228,5 +227,4 @@ + if (end < length && unic[end] == ';') /* don't forget this one! */ \ + Tcl_AppendUnicodeToObj(out,&(unic[end]),1); \ +- err++; \ + } else { \ + tmp = (Tcl_UniChar)tInt; \ +@@ -237,5 +235,5 @@ + } + +-#define HANDLE_KEY_ENTITY(convData, unic, length, out, begin, first, end, err) { \ ++#define HANDLE_KEY_ENTITY(convData, unic, length, out, begin, first, end) { \ + /* use lookup table */ \ + Tcl_Obj* iObj = NULL; \ +@@ -261,5 +259,4 @@ + if (end < length && unic[end] == ';') /* don't forget this one! */ \ + Tcl_AppendUnicodeToObj(out,&(unic[end]),1); \ +- err++; \ + } \ + } +@@ -276,5 +273,4 @@ + int plainfirst = 0; + int plainend = 0; +- int err = 0; /* temporary use, may be removed */ + + if (in == NULL || out == NULL) { +@@ -308,5 +304,5 @@ + * we're in a tag, thus we skip everything + * --------------------------------------------------------------------*/ +- HANDLE_TAG(unic, length, out, pos, err); ++ HANDLE_TAG(unic, length, out, pos); + plainfirst = pos + 1; + +@@ -331,5 +327,5 @@ + * it's an entity + */ +- HANDLE_ENTITY(convData, unic, length, out, pos, err); ++ HANDLE_ENTITY(convData, unic, length, out, pos); + plainfirst = pos + 1; + }