From nobody Wed Feb 15 22:41:46 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 4PHCk25d6Mz3rRV1; Wed, 15 Feb 2023 22:41:46 +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 4PHCk251Y9z3pB6; Wed, 15 Feb 2023 22:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676500906; 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=sNK8WHQDqIoplVRVCvepeqLM3wLorsifJO5qK5TbrbE=; b=aWu9c0WIW+23RnglNbj9n0kQgYdum5YmK0HIh+6j7rSAbuaSPYFu1kaNlphqzOC9p/X1iq LsqpRJqNM3fWUw5CcVGXhIYoVeinKLZ/vAs7QuvJ9ptvObI8Oi1yFdrWpW3IFA84FADK1J HvkspRuWmL3yTxnvG10x5lh9gcHlHunSclFfYjjmI+0+5BnJ9oM5OXlaz0j26EYQJ7y1+S F56STreIoOADGukKmUX4HcVccZF5HVkCWHojMTbCEDk9FYalbYGrClwIHrmqFuvrqDNAO5 3+VN2sqLZJ42QsYtKa313r0HHcp2zh9I8QVZjQZrijm7mLYgPUoeDOUqUvIrXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676500906; 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=sNK8WHQDqIoplVRVCvepeqLM3wLorsifJO5qK5TbrbE=; b=d2hywppinDCc9B9+oQelB0Pu1cR6Y0RD14ocqhKb4o0gohhWnm1Fa+/Neic+PcME8zjUqZ 4rTsoHsMRKNfQf2fbknga3KYZjeHIzI5aOeTprIfhozjMx6S330cm6v21D9GsoXqSt9Xrg PRQpfu6k4jO/EWztcKTZIPiUSwP+8Eg3HMFpmiXtzKCgRSLIPM8a5xIR4q3RwE8MQ0shb1 9R/P/50PCYU+AVbEWFO8C0WnAoJQ6gTIfkBsfx/5wh39qsnV0ts2BHPP58GncJnBa2OoJZ bxdbq0p1vb5WZIaFc6Fywpz11FXM2CPkr0gldI66vv/BVB9SEjIFP9z6v1dtbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676500906; a=rsa-sha256; cv=none; b=jeeZeqmzaDjHGXgVncIXx+pX8u5wyQamiHiqsigpIuAKk4U7yTGQctecUmAUHUk/mmxfWC oWQm4DdrsWQpXk+uMVpnVQKm2n+qfJEm6+4exU6fsJKWLJc7fCju9LsUhvdl07yoWY6AtE ILLszVv+VtGPE7Ktt4H4f45U7u9QNdrtgvp7vfnylGcSzLOIV1GpeB+NtQ2bhRJwypQbc1 EOYBlEJcgkO6aWUT+zHIj1yJfUhwzQoHToLSLHj86m8jA6Y0nfPDfWnDB38CfTbjuypBvi C/Q56NcE+6ixow46VsiK7XLQ04LahMxR5JFFlmulvVZp+7JvVtMzdKNtC+x7MQ== 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 4PHCk22GsYzhQ1; Wed, 15 Feb 2023 22:41:46 +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 31FMfkn9019684; Wed, 15 Feb 2023 22:41:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31FMfkM1019683; Wed, 15 Feb 2023 22:41:46 GMT (envelope-from git) Date: Wed, 15 Feb 2023 22:41:46 GMT Message-Id: <202302152241.31FMfkM1019683@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joerg Wunsch Subject: git: 88a3eaf413c1 - main - misc/team: Fix compiler complaints 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: joerg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 88a3eaf413c1cad272d9e10693efce9e7b5a2c26 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by joerg: URL: https://cgit.FreeBSD.org/ports/commit/?id=88a3eaf413c1cad272d9e10693efce9e7b5a2c26 commit 88a3eaf413c1cad272d9e10693efce9e7b5a2c26 Author: Joerg Wunsch AuthorDate: 2023-02-15 22:38:09 +0000 Commit: Joerg Wunsch CommitDate: 2023-02-15 22:41:34 +0000 misc/team: Fix compiler complaints The code used a very old "all arguments are compatible with int" method for a varargs message function. Convert it to . While at it, replace a few private library function declarations by their appropriate header file includes. --- misc/team/Makefile | 2 +- misc/team/files/patch-c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) diff --git a/misc/team/Makefile b/misc/team/Makefile index 8ccb6a35422b..8e4049d149cd 100644 --- a/misc/team/Makefile +++ b/misc/team/Makefile @@ -1,6 +1,6 @@ PORTNAME= team PORTVERSION= 3.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc MASTER_SITES= LOCAL/joerg diff --git a/misc/team/files/patch-c b/misc/team/files/patch-c new file mode 100644 index 000000000000..03c89993ed64 --- /dev/null +++ b/misc/team/files/patch-c @@ -0,0 +1,62 @@ +--- team.c~ 2023-02-15 22:43:13.785130000 +0100 ++++ team.c 2023-02-15 23:21:27.257000000 +0100 +@@ -82,6 +82,11 @@ + #include + #include + #include ++#include ++#include ++#include ++#include ++#include + #include + #include + #include +@@ -151,10 +156,12 @@ + #endif + + /*VARARGS1*/ +-mesg(a,b,c,d,e,f,g,h,i) +- char *a; +- int b,c,d,e,f,g,h,i; ++int ++mesg(char *a, ...) + { ++ va_list ap; ++ va_start(ap, a); ++ int rv; + # if (defined F_SETLKW) + struct flock l; + l.l_whence = 0; l.l_start = 0L; l.l_len = 0L; +@@ -163,13 +170,16 @@ + # if (defined LOCK_EX) + flock(fileno(stderr),LOCK_EX); + # endif +- fprintf(stderr,a,b,c,d,e,f,g,h,i); ++ rv = vfprintf(stderr,a,ap); + # if (defined LOCK_EX) + flock(fileno(stderr),LOCK_UN); + # endif + # if (defined F_SETLKW) + l.l_type = F_UNLCK; fcntl(fileno(stderr),F_SETLKW,&l); + # endif ++ va_end(ap); ++ ++ return rv; + } + + local bool verbose = false; +@@ -181,13 +191,6 @@ + + extern time_t time of((time_t *)); + extern int atoi of((const char *)); +-extern char *malloc of((unsigned)); +-extern char *calloc of((address,unsigned)); +-extern char *strchr of((const char *,int)); +- +-extern int getopt of((int,char *[],const char *)); +-extern char *optarg; +-extern int optind; + + /* + The regular Unix read and write calls are not guaranteed to process