git: f40f8b877c3a - main - net/44bsd-rdist: Permanently fix LLVM15 errors
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 15 Feb 2023 16:55:58 UTC
The branch main has been updated by cy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f40f8b877c3a162dbcc72acf2290732129fcbe93
commit f40f8b877c3a162dbcc72acf2290732129fcbe93
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2023-02-15 05:26:53 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
CommitDate: 2023-02-15 16:55:02 +0000
net/44bsd-rdist: Permanently fix LLVM15 errors
Fix:
expand.c:182:19: error: incompatible pointer to integer conversion
passing 'void *' to parameter of type 'int' [-Wint-conversion]
tp = lookup(cp, NULL, 0);
^~~~
/usr/include/sys/_null.h:34:14: note: expanded from macro 'NULL'
^~~~~~~~~~~
---
net/44bsd-rdist/Makefile | 3 +--
net/44bsd-rdist/files/patch-expand.c | 13 +++++++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/net/44bsd-rdist/Makefile b/net/44bsd-rdist/Makefile
index 49f707f31751..8066661f65c7 100644
--- a/net/44bsd-rdist/Makefile
+++ b/net/44bsd-rdist/Makefile
@@ -16,8 +16,7 @@ PLIST_FILES= bin/44bsd-rdist \
man/man1/44bsd-rdist.1.gz
CFLAGS= -Wno-deprecated-non-prototype \
- -Wno-incompatible-library-redeclaration \
- -Wno-int-conversion
+ -Wno-incompatible-library-redeclaration
post-extract:
cd ${WRKSRC} ; co RCS/*,v
diff --git a/net/44bsd-rdist/files/patch-expand.c b/net/44bsd-rdist/files/patch-expand.c
index 4c052f4e4e89..dfa8ba4be4c7 100644
--- a/net/44bsd-rdist/files/patch-expand.c
+++ b/net/44bsd-rdist/files/patch-expand.c
@@ -1,5 +1,14 @@
---- expand.c.orig 2013-09-17 23:46:26.681322944 -0700
-+++ expand.c 2013-09-18 00:29:13.792410201 -0700
+--- expand.c.orig 2023-02-14 21:23:14.429816000 -0800
++++ expand.c 2023-02-14 21:25:25.393203000 -0800
+@@ -179,7 +179,7 @@
+ savec = *tail;
+ *tail = '\0';
+ }
+- tp = lookup(cp, NULL, 0);
++ tp = lookup(cp, 0, 0);
+ if (savec != '\0')
+ *tail = savec;
+ if (tp != NULL) {
@@ -309,7 +309,7 @@
return;
goto patherr2;