svn commit: r508981 - in branches/2019Q3/sysutils/am-utils: . files

[Cy Schubert]

Author: cy
Date: Thu Aug 15 05:05:10 2019
New Revision: 508981
URL: https://svnweb.freebsd.org/changeset/ports/508981

Log:
  MFH: r508980
  
  Fix two mismatches between function declaration and definition.
  
  In both cases, function pointer arguments were inconsistently declared
  and the result worked because of C's odd rules around function pointer
  (de)references.  With a stricter compiler these fail to compile.
  
  Reported by:	pfg@
  Obtained from:	base r350049 by brooks@ from CheriBSD
  Differential Revision:	https://reviews.freebsd.org/D20964
  Approved by:	portmgr (miwi@)

Added:
  branches/2019Q3/sysutils/am-utils/files/patch-amd_amd.h
     - copied unchanged from r508980, head/sysutils/am-utils/files/patch-amd_amd.h
  branches/2019Q3/sysutils/am-utils/files/patch-amd_rpc__fwd.c
     - copied unchanged from r508980, head/sysutils/am-utils/files/patch-amd_rpc__fwd.c
Modified:
  branches/2019Q3/sysutils/am-utils/Makefile
Directory Properties:
  branches/2019Q3/   (props changed)

Modified: branches/2019Q3/sysutils/am-utils/Makefile
==============================================================================
--- branches/2019Q3/sysutils/am-utils/Makefile	Thu Aug 15 02:21:57 2019	(r508980)
+++ branches/2019Q3/sysutils/am-utils/Makefile	Thu Aug 15 05:05:10 2019	(r508981)
@@ -3,7 +3,7 @@
 
 PORTNAME=	am-utils
 PORTVERSION=	6.2
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	sysutils net
 MASTER_SITES=	ftp://ftp.am-utils.org/pub/am-utils/ \

Copied: branches/2019Q3/sysutils/am-utils/files/patch-amd_amd.h (from r508980, head/sysutils/am-utils/files/patch-amd_amd.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2019Q3/sysutils/am-utils/files/patch-amd_amd.h	Thu Aug 15 05:05:10 2019	(r508981, copy of r508980, head/sysutils/am-utils/files/patch-amd_amd.h)
@@ -0,0 +1,13 @@
+Index: amd/amd.h
+===================================================================
+--- amd/amd.h	(revision 350048)
++++ amd/amd.h	(revision 350049)
+@@ -625,7 +625,7 @@
+ extern void mapc_add_kv(mnt_map *, char *, char *);
+ extern mnt_map *mapc_find(char *, char *, const char *, const char *);
+ extern void mapc_free(opaque_t);
+-extern int  mapc_keyiter(mnt_map *, key_fun, opaque_t);
++extern int  mapc_keyiter(mnt_map *, key_fun *, opaque_t);
+ extern void mapc_reload(void);
+ extern int  mapc_search(mnt_map *, char *, char **);
+ extern void mapc_showtypes(char *buf, size_t l);

Copied: branches/2019Q3/sysutils/am-utils/files/patch-amd_rpc__fwd.c (from r508980, head/sysutils/am-utils/files/patch-amd_rpc__fwd.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2019Q3/sysutils/am-utils/files/patch-amd_rpc__fwd.c	Thu Aug 15 05:05:10 2019	(r508981, copy of r508980, head/sysutils/am-utils/files/patch-amd_rpc__fwd.c)
@@ -0,0 +1,13 @@
+Index: amd/rpc_fwd.c
+===================================================================
+--- amd/rpc_fwd.c	(revision 350048)
++++ amd/rpc_fwd.c	(revision 350049)
+@@ -221,7 +221,7 @@
+  * different address.
+  */
+ int
+-fwd_packet(int type_id, char *pkt, int len, struct sockaddr_in *fwdto, struct sockaddr_in *replyto, opaque_t cb_arg, fwd_fun cb)
++fwd_packet(int type_id, char *pkt, int len, struct sockaddr_in *fwdto, struct sockaddr_in *replyto, opaque_t cb_arg, fwd_fun *cb)
+ {
+   rpc_forward *p;
+   u_int *pkt_int;