From nobody Sun Jun 25 20:53:40 2023 X-Original-To: dev-commits-ports-branches@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 4Qq39K0JW9z4j1wx; Sun, 25 Jun 2023 20:53:41 +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 4Qq39J6kP7z3vRy; Sun, 25 Jun 2023 20:53:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687726420; 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=xCAqT2lFwBhLFy/ozfmPXTXBXu1xhmiy3FPpjUiEQaA=; b=MVXmCIVo3JY3Fqk6QYTzpjrKVF/gje1aVrMKc4v5ZIWwOMk0zr4zo8BSZXvLmwK5fp0vLt x+iJ/Bd5RG9FphZhC1Vl86UkaXPT7PJExBiy8ynGSXTRJylT6a8DfXVzd233+92O/jDJaB m8D2U/nGYzzkO8UyrMMIPQA07P2rhd+D2rV9BxgDOWvixsM2addrf1qOb1RWeDMjV+KGbd 0IYhSFyZgVx+9dF/orV0AvttjYjhLKQDD09mcw8sWOwDqrYn/ewlxYiWWb83kr9UZ9PW71 tjd7UNyEDzPtO7xcGBfPSfhvPOMGtE8phDDArvc+FXhivvqX6pQsABMLu4dn3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687726420; 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=xCAqT2lFwBhLFy/ozfmPXTXBXu1xhmiy3FPpjUiEQaA=; b=qe2+p5W0fm3r4vO/nP2Tew5ixBu35FjPW9Q3TPCDCp4ZJljntUz5gJolLDnnGkftP2k6K6 s4V2P+/E+m87MGVwcd9XoaGlWXBPil+0skzSNszTFtaHI5mwLgd+lZeiYV7F9/3QJUsdHu SwNI0nDj3/S/lb0BrRVrS8TZ84iVRzUjePcNKV8bY1lC8oz4qg0QePEfpA6RiKzhKfLh2B W++IhzdHHXMXD1iHnnhro6pGfeo3Mz0B7viQ95DlxF2zSLbU/gW1Ifxfz9EvkxLsxOpoBn CuSp2WSY6g9Y8AeU/KCvdv8TIZd7j8BUkOKC9q0m1iDpxc33joVvoruYPxv5kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687726420; a=rsa-sha256; cv=none; b=VlHDChjXILQ4dAF7SwRj+y3FgrnUtxjhwdo3u2Ara2szFvsucMw1fICtiyNFNRFZhv9R06 3+LSf55C6pZR1VJKfzIuOjq/98BWpBA5WbGP/fNZb/8NHVni34eP5R7iYv0Sj/VZOzZ1/i VDf8itqXUdoCqfy5e+OL7CwkDiqqvDOpQuA2ofQPWEf/ha60mD4IdyrksbnSJuAfQqksyf la9qk5kZlA9BmE2RAFebN4oaCsvgE/tlP+ndVDJ8/FyI6jXxXvj+B2c6v6CTrVdfUY1+F0 9zZriAn3a2Sybw3ye78HIwEbifX6ud9BZWT7+L7eMo+6ryx5EqLC5YTkHdXg3g== 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 4Qq39J5n0Qzj51; Sun, 25 Jun 2023 20:53:40 +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 35PKreQ5074126; Sun, 25 Jun 2023 20:53:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35PKre6S074125; Sun, 25 Jun 2023 20:53:40 GMT (envelope-from git) Date: Sun, 25 Jun 2023 20:53:40 GMT Message-Id: <202306252053.35PKre6S074125@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: 98a8e60fca78 - 2023Q2 - sysutils/44bsd-more: Fix build with LLVM16 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2023Q2 X-Git-Reftype: branch X-Git-Commit: 98a8e60fca78cf8cd3c7e692aa41d4d807c6b52f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=98a8e60fca78cf8cd3c7e692aa41d4d807c6b52f commit 98a8e60fca78cf8cd3c7e692aa41d4d807c6b52f Author: Cy Schubert AuthorDate: 2023-06-25 20:50:25 +0000 Commit: Cy Schubert CommitDate: 2023-06-25 20:53:27 +0000 sysutils/44bsd-more: Fix build with LLVM16 main.c:440:22: error: incompatible function pointer types passing 'int (void *, char *, size_t)' (aka 'int (void *, char *, unsigned long)') to parameter of type 'int (* _Nullable)(void *, char *, int)' [-Wincompatible-function-pointer-types] fd = fropen(DEFRC, str_read); ^~~~~~~~ MFH: 2023Q3 (cherry picked from commit 6bef86a7ad93c1c38df8c3266340796746e0aa32) --- sysutils/44bsd-more/files/patch-main.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/sysutils/44bsd-more/files/patch-main.c b/sysutils/44bsd-more/files/patch-main.c index a2110df1be9c..2fe1808c7c79 100644 --- a/sysutils/44bsd-more/files/patch-main.c +++ b/sysutils/44bsd-more/files/patch-main.c @@ -1,5 +1,5 @@ ---- main.c.orig 2011-09-08 01:02:56.000000000 +0800 -+++ main.c 2011-09-08 01:17:47.000000000 +0800 +--- main.c.orig 2023-06-25 13:45:14.613216000 -0700 ++++ main.c 2023-06-25 13:49:15.978996000 -0700 @@ -33,9 +33,9 @@ */ @@ -12,18 +12,18 @@ Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -@@ -68,6 +68,10 @@ static const char rcsid[] = +@@ -68,6 +68,10 @@ #include "less.h" #include "pathnames.h" -+static int str_read(void *, char *, size_t); ++static int str_read(void *, char *, int); +void rcfiles(); +void readrc(FILE *); + int ispipe; char *current_file, *previous_file, *current_name, *next_name; int any_display; -@@ -214,6 +218,7 @@ edit(filename, force_open) +@@ -214,6 +218,7 @@ /* * Edit the next file in the command line list. */ @@ -31,7 +31,7 @@ next_file(n) int n; { -@@ -281,7 +286,7 @@ main(argc, argv) +@@ -281,7 +286,7 @@ * Process command line arguments and MORE environment arguments. * Command line arguments override environment arguments. */ @@ -40,7 +40,7 @@ envargc = 2; envargv[0] = "more"; envargv[2] = NULL; -@@ -403,14 +408,14 @@ quit() +@@ -403,14 +408,14 @@ * Read in from each of the three rc files - default, system, user. * Calls handle_error() directly to report errors. */ @@ -57,7 +57,7 @@ /* The default builtin rc file */ if ((c = getenv("HOME")) && -@@ -480,6 +485,7 @@ use_builtin_defrc: +@@ -480,6 +485,7 @@ * This really belongs in ncommand.c, but that file is already 33292 bytes * long. */ @@ -65,7 +65,7 @@ readrc(fd) FILE *fd; { -@@ -489,7 +495,7 @@ readrc(fd) +@@ -489,7 +495,7 @@ buf = NULL; strlenbuf = 0; @@ -74,3 +74,12 @@ if (!len) continue; /* ??? */ if (*bufptr == '#') +@@ -527,7 +533,7 @@ + str_read(cookie, buf, len) + void *cookie; + char *buf; +- size_t len; ++ int len; + { + static char *curpos; + static int cooklen;