summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2023-02-14 21:26:53 -0800
committerCy Schubert <cy@FreeBSD.org>2023-02-15 08:55:02 -0800
commitf40f8b877c3a162dbcc72acf2290732129fcbe93 (patch)
tree05def56a0a8a9a33ffc5476a19cbbf31414aefc8
parentnet/tcpview: Permanently fix LLVM15 errors (diff)
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' ^~~~~~~~~~~
Diffstat (limited to '')
-rw-r--r--net/44bsd-rdist/Makefile3
-rw-r--r--net/44bsd-rdist/files/patch-expand.c13
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;