svn commit: r350300 - stable/12/contrib/amd/amd

[Brooks Davis]

Author: brooks
Date: Wed Jul 24 20:17:39 2019
New Revision: 350300
URL: https://svnweb.freebsd.org/changeset/base/350300

Log:
  MFC r350049:
  
  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.
  
  Reviewed by:	cem
  Obtained from:	CheriBSD
  Sponsored by:	DARPA, AFRL
  Differential Revision:	https://reviews.freebsd.org/D20964

Modified:
  stable/12/contrib/amd/amd/amd.h
  stable/12/contrib/amd/amd/rpc_fwd.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/contrib/amd/amd/amd.h
==============================================================================
--- stable/12/contrib/amd/amd/amd.h	Wed Jul 24 19:57:11 2019	(r350299)
+++ stable/12/contrib/amd/amd/amd.h	Wed Jul 24 20:17:39 2019	(r350300)
@@ -625,7 +625,7 @@ extern void map_flush_srvr(fserver *);
 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);

Modified: stable/12/contrib/amd/amd/rpc_fwd.c
==============================================================================
--- stable/12/contrib/amd/amd/rpc_fwd.c	Wed Jul 24 19:57:11 2019	(r350299)
+++ stable/12/contrib/amd/amd/rpc_fwd.c	Wed Jul 24 20:17:39 2019	(r350300)
@@ -221,7 +221,7 @@ fwd_locate(u_int id)
  * 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;