diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2019-08-15 02:21:57 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2019-08-15 02:21:57 +0000 |
| commit | 1199e9e38c8feba9f5e4311faab44f5e3c33f17d (patch) | |
| tree | 5928c20b9723d4658e0b3171aa9a88d08e285863 | |
| parent | Update to version 1.2.5 (diff) | |
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
Notes
Notes:
svn path=/head/; revision=508980
| -rw-r--r-- | sysutils/am-utils/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/am-utils/files/patch-amd_amd.h | 13 | ||||
| -rw-r--r-- | sysutils/am-utils/files/patch-amd_rpc__fwd.c | 13 |
3 files changed, 27 insertions, 1 deletions
diff --git a/sysutils/am-utils/Makefile b/sysutils/am-utils/Makefile index 08887e567721..1a43f34c2fa7 100644 --- a/sysutils/am-utils/Makefile +++ b/sysutils/am-utils/Makefile @@ -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/ \ diff --git a/sysutils/am-utils/files/patch-amd_amd.h b/sysutils/am-utils/files/patch-amd_amd.h new file mode 100644 index 000000000000..3537e8113cdb --- /dev/null +++ b/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); diff --git a/sysutils/am-utils/files/patch-amd_rpc__fwd.c b/sysutils/am-utils/files/patch-amd_rpc__fwd.c new file mode 100644 index 000000000000..22f13cb40384 --- /dev/null +++ b/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; |