Date: Thu, 15 Aug 2019 02:21:57 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r508980 - in head/sysutils/am-utils: . files Message-ID: <201908150221.x7F2LvQc087722@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Thu Aug 15 02:21:57 2019 New Revision: 508980 URL: https://svnweb.freebsd.org/changeset/ports/508980 Log: 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 MFH: 2019Q3 Differential Revision: https://reviews.freebsd.org/D20964 Added: head/sysutils/am-utils/files/patch-amd_amd.h (contents, props changed) head/sysutils/am-utils/files/patch-amd_rpc__fwd.c (contents, props changed) Modified: head/sysutils/am-utils/Makefile (contents, props changed) Modified: head/sysutils/am-utils/Makefile ============================================================================== --- head/sysutils/am-utils/Makefile Thu Aug 15 01:48:09 2019 (r508979) +++ head/sysutils/am-utils/Makefile Thu Aug 15 02:21:57 2019 (r508980) @@ -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/ \ Added: head/sysutils/am-utils/files/patch-amd_amd.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/am-utils/files/patch-amd_amd.h Thu Aug 15 02:21:57 2019 (r508980) @@ -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); Added: head/sysutils/am-utils/files/patch-amd_rpc__fwd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/am-utils/files/patch-amd_rpc__fwd.c Thu Aug 15 02:21:57 2019 (r508980) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908150221.x7F2LvQc087722>