patches to style(9) and sys/sys/*.h to address parameter names in prototypes

Chris Pressey cpressey at catseye.mine.nu
Sun Feb 22 13:08:57 PST 2004


And another patch to do the same thing, except to the files in
/usr/src/include/*.h and /usr/src/include/*/*.h .

make buildworld currently in progress, will report back if it causes any
errors.

-Chris

Index: include/db.h
===================================================================
RCS file: /home/dcvs/src/include/db.h,v
retrieving revision 1.2
diff -u -r1.2 db.h
--- include/db.h	14 Nov 2003 01:01:43 -0000	1.2
+++ include/db.h	21 Feb 2004 15:29:44 -0000
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)db.h	8.7 (Berkeley) 6/16/94
- * $DragonFly: src/include/db.h,v 1.2 2003/11/14 01:01:43 dillon Exp $
+ * $DragonFly$
  */
 
 #ifndef _DB_H_
@@ -213,7 +213,7 @@
 DB	*__bt_open (const char *, int, int, const BTREEINFO *, int);
 DB	*__hash_open (const char *, int, int, const HASHINFO *, int);
 DB	*__rec_open (const char *, int, int, const RECNOINFO *, int);
-void	 __dbpanic (DB *dbp);
+void	 __dbpanic (DB *);
 #endif
 __END_DECLS
 #endif /* !_DB_H_ */
Index: include/dlfcn.h
===================================================================
RCS file: /home/dcvs/src/include/dlfcn.h,v
retrieving revision 1.4
diff -u -r1.4 dlfcn.h
--- include/dlfcn.h	14 Nov 2003 01:01:43 -0000	1.4
+++ include/dlfcn.h	21 Feb 2004 15:31:24 -0000
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/include/dlfcn.h,v 1.10.2.3 2003/02/20 20:42:45 kan Exp $
- * $DragonFly: src/include/dlfcn.h,v 1.4 2003/11/14 01:01:43 dillon Exp $
+ * $DragonFly$
  */
 
 #ifndef _DLFCN_H_
@@ -98,13 +98,13 @@
 int dlclose (void *);
 const char *dlerror (void);
 int dlinfo (void *, int, void *);
-void dllockinit (void *_context,
-		     void *(*_lock_create)(void *_context),
-		     void (*_rlock_acquire)(void *_lock),
-		     void (*_wlock_acquire)(void *_lock),
-		     void (*_lock_release)(void *_lock),
-		     void (*_lock_destroy)(void *_lock),
-		     void (*_context_destroy)(void *_context));
+void dllockinit (void *,
+		 void *(*)(void *),
+		 void (*)(void *),
+		 void (*)(void *),
+		 void (*)(void *),
+		 void (*)(void *),
+		 void (*)(void *));
 void *dlopen (const char *, int);
 void *dlsym (void *, const char *);
 __END_DECLS
Index: include/pthread.h
===================================================================
RCS file: /home/dcvs/src/include/pthread.h,v
retrieving revision 1.3
diff -u -r1.3 pthread.h
--- include/pthread.h	14 Nov 2003 01:01:43 -0000	1.3
+++ include/pthread.h	21 Feb 2004 15:33:33 -0000
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/include/pthread.h,v 1.20.2.4 2003/05/27 18:18:01 jdp Exp $
- * $DragonFly: src/include/pthread.h,v 1.3 2003/11/14 01:01:43 dillon Exp $
+ * $DragonFly$
  */
 #ifndef _PTHREAD_H_
 #define _PTHREAD_H_
@@ -192,8 +192,7 @@
 __BEGIN_DECLS
 int		pthread_attr_destroy (pthread_attr_t *);
 int		pthread_attr_getstack (const pthread_attr_t * __restrict,
-			void ** __restrict stackaddr,
-			size_t * __restrict stacksize);
+			void ** __restrict, size_t * __restrict);
 int		pthread_attr_getstacksize (const pthread_attr_t *,
 			size_t *);
 int		pthread_attr_getstackaddr (const pthread_attr_t *,
@@ -206,8 +205,7 @@
 int		pthread_attr_setstackaddr (pthread_attr_t *, void *);
 int		pthread_attr_setdetachstate (pthread_attr_t *, int);
 void		pthread_cleanup_pop (int);
-void		pthread_cleanup_push (void (*) (void *),
-			void *routine_arg);
+void		pthread_cleanup_push (void (*) (void *), void *);
 int		pthread_condattr_destroy (pthread_condattr_t *);
 int		pthread_condattr_init (pthread_condattr_t *);
 
@@ -278,9 +276,9 @@
 
 #if defined(_POSIX_THREAD_PROCESS_SHARED)
 int		pthread_mutexattr_getpshared (pthread_mutexattr_t *,
-			int *pshared);
+			int *);
 int		pthread_mutexattr_setpshared (pthread_mutexattr_t *,
-			int pshared);
+			int);
 #endif
 
 int		pthread_mutexattr_getprioceiling (pthread_mutexattr_t *,
Index: include/resolv.h
===================================================================
RCS file: /home/dcvs/src/include/resolv.h,v
retrieving revision 1.3
diff -u -r1.3 resolv.h
--- include/resolv.h	14 Nov 2003 01:01:43 -0000	1.3
+++ include/resolv.h	21 Feb 2004 15:35:39 -0000
@@ -52,7 +52,7 @@
  *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
  *	From Id: resolv.h,v 8.12 1998/04/28 19:36:46 halley Exp $
  * $FreeBSD: src/include/resolv.h,v 1.19.2.1 2001/06/15 22:08:26 ume Exp $
- * $DragonFly: src/include/resolv.h,v 1.3 2003/11/14 01:01:43 dillon Exp $
+ * $DragonFly$
  */
 
 #ifndef _RESOLV_H_
@@ -179,19 +179,19 @@
 typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error }
 	res_sendhookact;
 
-typedef res_sendhookact (*res_send_qhook)(struct sockaddr_in * const *ns,
-					      const u_char **query,
-					      int *querylen,
-					      u_char *ans,
-					      int anssiz,
-					      int *resplen);
-
-typedef res_sendhookact (*res_send_rhook)(const struct sockaddr_in *ns,
-					      const u_char *query,
-					      int querylen,
-					      u_char *ans,
-					      int anssiz,
-					      int *resplen);
+typedef res_sendhookact (*res_send_qhook)(struct sockaddr_in * const *,
+					      const u_char **,
+					      int *,
+					      u_char *,
+					      int,
+					      int *);
+
+typedef res_sendhookact (*res_send_rhook)(const struct sockaddr_in *,
+					      const u_char *,
+					      int,
+					      u_char *,
+					      int,
+					      int *);
 
 struct res_sym {
 	int	number;		/* Identifying number, like T_MX */
Index: include/stdlib.h
===================================================================
RCS file: /home/dcvs/src/include/stdlib.h,v
retrieving revision 1.6
diff -u -r1.6 stdlib.h
--- include/stdlib.h	6 Jan 2004 15:38:09 -0000	1.6
+++ include/stdlib.h	21 Feb 2004 15:36:36 -0000
@@ -32,7 +32,7 @@
  *
  *	@(#)stdlib.h	8.5 (Berkeley) 5/19/95
  * $FreeBSD: src/include/stdlib.h,v 1.16.2.5 2002/12/13 01:34:00 tjr Exp $
- * $DragonFly: src/include/stdlib.h,v 1.6 2004/01/06 15:38:09 eirikn Exp $
+ * $DragonFly$
  */
 
 #ifndef _STDLIB_H_
@@ -146,7 +146,7 @@
 					/* getcap(3) functions */
 __uint32_t
 	 arc4random (void);
-void	 arc4random_addrandom (unsigned char *dat, int datlen);
+void	 arc4random_addrandom (unsigned char *, int);
 void	 arc4random_stir (void);
 char	*getbsize (int *, long *);
 char	*cgetcap (char *, char *, int);
@@ -180,7 +180,7 @@
 int	 rand_r (unsigned *);
 long	 random (void);
 void    *reallocf (void *, size_t);
-char	*realpath (const char *, char resolved_path[]);
+char	*realpath (const char *, char []);
 void	 setprogname (const char *);
 char	*setstate (char *);
 void	 srandom (unsigned long);
Index: include/strhash.h
===================================================================
RCS file: /home/dcvs/src/include/strhash.h,v
retrieving revision 1.2
diff -u -r1.2 strhash.h
--- include/strhash.h	17 Jun 2003 04:25:56 -0000	1.2
+++ include/strhash.h	21 Feb 2004 15:38:46 -0000
@@ -2,7 +2,7 @@
 #define _STRHASH_H_INCLUDE
 
 /* $FreeBSD: src/include/strhash.h,v 1.3 1999/08/28 04:59:30 peter Exp $ */
-/* $DragonFly: src/include/strhash.h,v 1.2 2003/06/17 04:25:56 dillon Exp $ */
+/* $DragonFly: src/include/strhash.h,v 1.1 2003/06/16 04:15:09 dillon Exp $ */
 
 /*
  *
@@ -49,14 +49,14 @@
     hash_node **buckets;
 } hash_table;
 
-hash_table *hash_create(int size);
-void	hash_destroy(hash_table *table, char *key,
-		     void (*nukefunc)(char *k, void *d));
-void	*hash_search(hash_table *table, char *key, void *datum,
-		     void (*replace_func)(void *d));
-void	hash_traverse(hash_table *table,
-		      int (*func)(char *k, void *d, void *arg), void *arg);
-void	hash_purge(hash_table *table, void (*purge_func)(char *k, void *d));
+hash_table *hash_create(int);
+void	hash_destroy(hash_table *, char *,
+		     void (*)(char *, void *));
+void	*hash_search(hash_table *, char *, void *,
+		     void (*)(void *));
+void	hash_traverse(hash_table *,
+		      int (*)(char *, void *, void *), void *);
+void	hash_purge(hash_table *, void (*)(char *, void *));
 
 #ifdef HASH_STATS
 extern void hash_stats();
Index: include/unistd.h
===================================================================
RCS file: /home/dcvs/src/include/unistd.h,v
retrieving revision 1.6
diff -u -r1.6 unistd.h
--- include/unistd.h	14 Nov 2003 01:01:43 -0000	1.6
+++ include/unistd.h	21 Feb 2004 15:39:51 -0000
@@ -32,7 +32,7 @@
  *
  *	@(#)unistd.h	8.12 (Berkeley) 4/27/95
  * $FreeBSD: src/include/unistd.h,v 1.35.2.10 2002/04/15 12:52:28 nectar Exp $
- * $DragonFly: src/include/unistd.h,v 1.6 2003/11/14 01:01:43 dillon Exp $
+ * $DragonFly$
  */
 
 #ifndef _UNISTD_H_
@@ -97,7 +97,7 @@
 int	 rmdir (const char *);
 int	 setgid (gid_t);
 int	 setpgid (pid_t, pid_t);
-void	 setproctitle (const char *_fmt, ...) __printf0like(1, 2);
+void	 setproctitle (const char *, ...) __printf0like(1, 2);
 pid_t	 setsid (void);
 int	 setuid (uid_t);
 unsigned int	 sleep (unsigned int);
@@ -126,7 +126,7 @@
 	 crypt_get_format (void);
 int	 crypt_set_format (const char *);
 int	 des_cipher (const char *, char *, long, int);
-int	 des_setkey (const char *key);
+int	 des_setkey (const char *);
 int	 encrypt (char *, int);
 void	 endusershell (void);
 int	 exect (const char *, char * const *, char * const *);
Index: include/rpc/auth.h
===================================================================
RCS file: /home/dcvs/src/include/rpc/auth.h,v
retrieving revision 1.3
diff -u -r1.3 auth.h
--- include/rpc/auth.h	14 Nov 2003 01:01:50 -0000	1.3
+++ include/rpc/auth.h	22 Feb 2004 12:30:03 -0000
@@ -29,7 +29,7 @@
  *	from: @(#)auth.h 1.17 88/02/08 SMI
  *	from: @(#)auth.h	2.3 88/08/07 4.0 RPCSRC
  * $FreeBSD: src/include/rpc/auth.h,v 1.15 1999/08/27 23:45:02 peter Exp $
- * $DragonFly: src/include/rpc/auth.h,v 1.3 2003/11/14 01:01:50 dillon Exp $
+ * $DragonFly$
  */
 
 /*
@@ -91,7 +91,7 @@
 	u_int	oa_length;		/* not to exceed MAX_AUTH_BYTES */
 };
 __BEGIN_DECLS
-bool_t xdr_opaque_auth (XDR *xdrs, struct opaque_auth *ap);
+bool_t xdr_opaque_auth (XDR *, struct opaque_auth *);
 __END_DECLS
 
 
Index: include/rpc/pmap_clnt.h
===================================================================
RCS file: /home/dcvs/src/include/rpc/pmap_clnt.h,v
retrieving revision 1.5
diff -u -r1.5 pmap_clnt.h
--- include/rpc/pmap_clnt.h	14 Nov 2003 01:01:50 -0000	1.5
+++ include/rpc/pmap_clnt.h	22 Feb 2004 12:34:25 -0000
@@ -29,7 +29,7 @@
  *	from: @(#)pmap_clnt.h 1.11 88/02/08 SMI
  *	from: @(#)pmap_clnt.h	2.1 88/07/29 4.0 RPCSRC
  * $FreeBSD: src/include/rpc/pmap_clnt.h,v 1.11 1999/08/27 23:45:04 peter Exp $
- * $DragonFly: src/include/rpc/pmap_clnt.h,v 1.5 2003/11/14 01:01:50 dillon Exp $
+ * $DragonFly$
  */
 
 /*
@@ -82,8 +82,8 @@
 						 struct sockaddr_in *));
 extern u_short		pmap_getport	(struct sockaddr_in *,
 					     u_long, u_long, u_int);
-extern void		pmap_getport_timeout (struct timeval *otv,
-					     struct timeval *ntv);
+extern void		pmap_getport_timeout (struct timeval *,
+					     struct timeval *);
 __END_DECLS
 
 #endif /* !_RPC_PMAPCLNT_H */
Index: include/rpc/rpc.h
===================================================================
RCS file: /home/dcvs/src/include/rpc/rpc.h,v
retrieving revision 1.3
diff -u -r1.3 rpc.h
--- include/rpc/rpc.h	14 Nov 2003 01:01:50 -0000	1.3
+++ include/rpc/rpc.h	22 Feb 2004 12:35:34 -0000
@@ -29,7 +29,7 @@
  *	from: @(#)rpc.h 1.9 88/02/08 SMI
  *	from: @(#)rpc.h	2.4 89/07/11 4.0 RPCSRC
  * $FreeBSD: src/include/rpc/rpc.h,v 1.12 2000/01/26 09:02:40 shin Exp $
- * $DragonFly: src/include/rpc/rpc.h,v 1.3 2003/11/14 01:01:50 dillon Exp $
+ * $DragonFly$
  */
 
 /*
@@ -83,7 +83,7 @@
 extern struct rpcent *getrpcbyname	(char *);
 extern struct rpcent *getrpcbynumber	(int);
 extern struct rpcent *getrpcent		(void);
-extern int getrpcport (char *host, int prognum, int versnum, int proto);
+extern int getrpcport (char *, int, int, int);
 extern void setrpcent (int);
 extern void endrpcent (void);
 
Index: include/rpcsvc/ypclnt.h
===================================================================
RCS file: /home/dcvs/src/include/rpcsvc/ypclnt.h,v
retrieving revision 1.3
diff -u -r1.3 ypclnt.h
--- include/rpcsvc/ypclnt.h	14 Nov 2003 01:01:51 -0000	1.3
+++ include/rpcsvc/ypclnt.h	22 Feb 2004 12:59:52 -0000
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/include/rpcsvc/ypclnt.h,v 1.11.2.1 2002/02/15 00:46:53 des Exp $
- * $DragonFly: src/include/rpcsvc/ypclnt.h,v 1.3 2003/11/14 01:01:51 dillon Exp $
+ * $DragonFly$
  */
 
 #ifndef _RPCSVC_YPCLNT_H_
@@ -69,26 +69,26 @@
 struct dom_binding;
 
 __BEGIN_DECLS
-int	yp_bind(char *dom);
-int	_yp_dobind(char *dom, struct dom_binding **ypdb);
-void	yp_unbind(char *dom);
-int	yp_get_default_domain(char **domp);
-int	yp_match 	(char *indomain, char *inmap,
-			    const char *inkey, int inkeylen, char **outval,
-			    int *outvallen);
-int	yp_first 	(char *indomain, char *inmap,
-			    char **outkey, int *outkeylen, char **outval,
-			    int *outvallen);
-int	yp_next		(char *indomain, char *inmap,
-			    char *inkey, int inkeylen, char **outkey,
-			    int *outkeylen, char **outval, int *outvallen);
-int	yp_master(char *indomain, char *inmap, char **outname);
-int	yp_order(char *indomain, char *inmap, int *outorder);
-int	yp_all		(char *indomain, char *inmap,
-			    struct ypall_callback *incallback);
-char *	yperr_string(int incode);
-char *	ypbinderr_string(int incode);
-int	ypprot_err(unsigned int incode);
+int	yp_bind(char *);
+int	_yp_dobind(char *, struct dom_binding **);
+void	yp_unbind(char *);
+int	yp_get_default_domain(char **);
+int	yp_match 	(char *, char *,
+			    const char *, int, char **,
+			    int *);
+int	yp_first 	(char *, char *,
+			    char **, int *, char **,
+			    int *);
+int	yp_next		(char *, char *,
+			    char *, int, char **,
+			    int *, char **, int *);
+int	yp_master(char *, char *, char **);
+int	yp_order(char *, char *, int *);
+int	yp_all		(char *, char *,
+			    struct ypall_callback *);
+char *	yperr_string(int);
+char *	ypbinderr_string(int);
+int	ypprot_err(unsigned int);
 __END_DECLS
 
 #endif /* _RPCSVC_YPCLNT_H_ */




More information about the Submit mailing list