From nobody Wed Feb 15 16:55:57 2023 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 4PH4314gyWz3qYGP; Wed, 15 Feb 2023 16:55:57 +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 4PH4312SR1z3sqF; Wed, 15 Feb 2023 16:55:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676480157; 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=KB6KpNV0jCi7kX5DZZVYX/QBJVNrb709ASl9H/vUA3g=; b=ZMjkfLVG+GQNgTPVy8T3Vqu+KwlQmJ0aPVtGS8Lm1BDX3wK2TP20/woMhNrFu40+vFTaE6 mGO+eW+Yt6eS+kGmha4ejXZVhvmhBafJAjtCOCEw6XgmjWvVB5M1/8/dtVlkEwh5X9ZSnp KeWmuk8RVD8v7mrST3oWdRhPHzv4eT8e1hnPQzjqs0AFel2vZuegi9pNShj0enTASNH/d1 Td9OLt/qmyuWUD79SnSE1Z0tW+YEyXJMBSrLY+LxAX+r/+WzTtSwsutUMHf+oIl5at8Uop rLuPKWgL0Ym6QWnmlP7lDx3SC60I6VM1StCDugHwQ+HFvq0F/MVlt1w54K8oyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676480157; 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=KB6KpNV0jCi7kX5DZZVYX/QBJVNrb709ASl9H/vUA3g=; b=LMn40jjRA2m+4sY3ITTQM7cPnbRHL+fTMjcc4XfEovtIfvFRJlC0D/0O6G8Xt1QwX9Rq9n iOcUAQhgQ8TauC43lisvoe0OKDN/ms8R+jviV6Rdjhtwd5s3vlwALhiHvpBvV6qr6b7bC3 isGy3MrYns5BzQA82YhLmBQ7tSBViAOqCUWhPdfgImTYkt3g1YzXp2MhDzHO2pZGPz/s1J OVekD7kswsPEgYRtQqgs/B1el3MLTfAZnolsdkfHbplCMSEgecZ6QbuS+8pRvz5oSI9vtI L/aoJ+mBJoy1IzZNj/3pUEsjROKt+Bxdg0yK5HxC1yl/+e+cV9a9E3neywcUhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676480157; a=rsa-sha256; cv=none; b=by62v6duB/RjHYK3g3oFHISmaTShX4ylbb8nsoZAuOC6501nArHwfv8MAdHcGSPeFxtoVi kwtn8PVh7cVxsOercXJkXHDp5VUpBUpSLl9g3dptbYBOQ1vID9hqAEqjfeDvBlFL52Z9ik Xk5nauObO1FPY+Kc3lBtwlPf5QDodLgC0sg90yLF4vReIsnchjh5J2Fk5Cp0EuLd45Liug B+2Y5TZZLgKtGS1pH3SvOdD8vQtPY7jAaE0h1u1JpZ5fTxurI7PamI6zm5UNIFSAfYMooE N9DXm6FDuQxCM7CKBTnFQHQxUcmGPO/M1wTait1Lobn0hdckGLSY3SsNdl9bZA== 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 4PH43119rkzX3n; Wed, 15 Feb 2023 16:55:57 +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 31FGtvNP017064; Wed, 15 Feb 2023 16:55:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31FGtvdi017063; Wed, 15 Feb 2023 16:55:57 GMT (envelope-from git) Date: Wed, 15 Feb 2023 16:55:57 GMT Message-Id: <202302151655.31FGtvdi017063@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 2d263ddfe1be - main - net/tcpview: Permanently fix LLVM15 errors 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d263ddfe1bede40316d9a1036b6558bdcb786a2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=2d263ddfe1bede40316d9a1036b6558bdcb786a2 commit 2d263ddfe1bede40316d9a1036b6558bdcb786a2 Author: Cy Schubert AuthorDate: 2023-02-15 05:20:04 +0000 Commit: Cy Schubert CommitDate: 2023-02-15 16:55:02 +0000 net/tcpview: Permanently fix LLVM15 errors Fix int-conversion errors flagged by LLVM15. detail-domain.c:573:13: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'int' [-Wint-conversion] return NULL; ^~~~ /usr/include/sys/_null.h:34:14: note: expanded from macro 'NULL' ^~~~~~~~~~~ --- net/tcpview/Makefile | 2 - net/tcpview/files/patch-detail-domain.c | 135 ++++++++++++++++++++++++++++++-- 2 files changed, 128 insertions(+), 9 deletions(-) diff --git a/net/tcpview/Makefile b/net/tcpview/Makefile index bc24506b27ee..dfda6c9ba2b6 100644 --- a/net/tcpview/Makefile +++ b/net/tcpview/Makefile @@ -13,8 +13,6 @@ USES= bison motif tar:Z MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX} MAKE_JOBS_UNSAFE= yes -CFLAGS= -Wno-int-conversion - post-patch: .for f in nametoaddr.c addrtoname.c print-nfs.c detail-tcp.c tv_addrtoname.c @${REINPLACE_CMD} -e 's/NTOHL/ntohl/ ; s/NTOHS/ntohs/' ${WRKSRC}/${f} diff --git a/net/tcpview/files/patch-detail-domain.c b/net/tcpview/files/patch-detail-domain.c index 24cf1399489c..25b1307ca951 100644 --- a/net/tcpview/files/patch-detail-domain.c +++ b/net/tcpview/files/patch-detail-domain.c @@ -1,6 +1,14 @@ ---- detail-domain.c.orig 1993-04-22 20:39:51 UTC -+++ detail-domain.c -@@ -199,6 +199,7 @@ p_type(type) +--- detail-domain.c.orig 1993-04-22 13:39:51.000000000 -0700 ++++ detail-domain.c 2023-02-14 21:16:01.401668000 -0800 +@@ -103,6 +103,7 @@ + + #define FAIL 1 + #define SUCCEED 0 ++#define IGNORE 0 + #define MIN(a,b) (((a)<(b))?(a):(b)) + + +@@ -199,6 +200,7 @@ case T_ANY: /* matches any type */ strcpy(type_buf, "ANY"); break; @@ -8,7 +16,7 @@ case T_UINFO: strcpy(type_buf, "UINFO"); break; -@@ -211,6 +212,7 @@ p_type(type) +@@ -211,6 +213,7 @@ case T_UNSPEC: strcpy(type_buf, "UNSPEC"); break; @@ -16,7 +24,120 @@ default: sprintf(type_buf, "%d", type); break; -@@ -633,6 +635,7 @@ p_ans(msg, eom) +@@ -444,7 +447,7 @@ + if (str == NULL) { + printf(" ** Data truncated **\n"); + MARK_WINDOW_NONE(); +- return NULL; ++ return IGNORE; + } + printf(" Canonical name = %s\n", str); + MARK_WINDOW(); +@@ -455,7 +458,7 @@ + if (str == NULL) { + printf(" ** Data truncated **\n"); + MARK_WINDOW_NONE(); +- return NULL; ++ return IGNORE; + } + printf(" MB domain name = %s\n", str); + MARK_WINDOW(); +@@ -466,7 +469,7 @@ + if (str == NULL) { + printf(" ** Data truncated **\n"); + MARK_WINDOW_NONE(); +- return NULL; ++ return IGNORE; + } + printf(" MD domain name = %s (obsolete)\n", str); + MARK_WINDOW(); +@@ -477,7 +480,7 @@ + if (str == NULL) { + printf(" ** Data truncated **\n"); + MARK_WINDOW_NONE(); +- return NULL; ++ return IGNORE; + } + printf(" MF domain name = %s (obsolete)\n", str); + MARK_WINDOW(); +@@ -488,7 +491,7 @@ + if (str == NULL) { + printf(" ** Data truncated **\n"); + MARK_WINDOW_NONE(); +- return NULL; ++ return IGNORE; + } + printf(" Mail group member = %s\n", str); + MARK_WINDOW(); +@@ -499,7 +502,7 @@ + if (str == NULL) { + printf(" ** Data truncated **\n"); + MARK_WINDOW_NONE(); +- return NULL; ++ return IGNORE; + } + printf(" Mail rename domain name = %s\n", str); + MARK_WINDOW(); +@@ -512,7 +515,7 @@ + if (str == NULL) { + printf(" ** Data truncated **\n"); + MARK_WINDOW_NONE(); +- return NULL; ++ return IGNORE; + } + printf(" Mail exchangeer = %s, preference %u\n", str, pref); + MARK_WINDOW(); +@@ -523,7 +526,7 @@ + if (str == NULL) { + printf(" ** Data truncated **\n"); + MARK_WINDOW_NONE(); +- return NULL; ++ return IGNORE; + } + printf(" Authoritative name server = %s\n", str); + MARK_WINDOW(); +@@ -534,7 +537,7 @@ + if (str == NULL) { + printf(" ** Data truncated **\n"); + MARK_WINDOW_NONE(); +- return NULL; ++ return IGNORE; + } + printf(" Domain name pointer = %s\n", str); + MARK_WINDOW(); +@@ -568,7 +571,7 @@ + printf(" ** Data truncated **\n"); + MARK_WINDOW_NONE(); + MARK_SAVED_WIN(saveind, -1, -1); +- return NULL; ++ return IGNORE; + } + printf(" Origin: %s\n", str); + MARK_WINDOW(); +@@ -578,7 +581,7 @@ + printf(" ** Data truncated **\n"); + MARK_WINDOW_NONE(); + MARK_SAVED_WIN(saveind, -1, -1); +- return NULL; ++ return IGNORE; + } + printf(" Mail Addr: %s\n", str); + MARK_WINDOW(); +@@ -621,18 +624,19 @@ + if (str == NULL) { + printf(" ** Data truncated **\n"); + MARK_WINDOW_NONE(); +- return NULL; ++ return IGNORE; + } + printf(" MINFO: requests = %s", str); + str = p_cdname(msg, eom); + if (str == NULL) { + printf(" ** Data truncated **\n"); + MARK_WINDOW_NONE(); +- return NULL; ++ return IGNORE; + } printf("; errors = %s\n", str); MARK_WINDOW(); @@ -24,7 +145,7 @@ case T_UINFO: printf(" UINFO: "); printf("%s\n", cp); -@@ -654,6 +657,12 @@ p_ans(msg, eom) +@@ -654,6 +658,12 @@ MARK_WINDOW(); break; @@ -37,7 +158,7 @@ case T_WKS: if (rdlength < (int)(sizeof(u_long) + 1)) break; -@@ -730,11 +739,6 @@ p_ans(msg, eom) +@@ -730,11 +740,6 @@ break;