svn commit: r229986 - head/lib/libutil

[Guy Helmer]

Author: ghelmer
Date: Wed Jan 11 22:33:41 2012
New Revision: 229986
URL: http://svn.freebsd.org/changeset/base/229986

Log:
  Fix namespace issues with prototype parameter names.
  Add missing prototype parameter names.
  
  Requested by bde.

Modified:
  head/lib/libutil/libutil.h

Modified: head/lib/libutil/libutil.h
==============================================================================
--- head/lib/libutil/libutil.h	Wed Jan 11 22:12:45 2012	(r229985)
+++ head/lib/libutil/libutil.h	Wed Jan 11 22:33:41 2012	(r229986)
@@ -93,7 +93,7 @@ struct termios;
 struct winsize;
 
 __BEGIN_DECLS
-char	*auth_getval(const char *name);
+char	*auth_getval(const char *_name);
 void	clean_environment(const char * const *_white,
 	    const char * const *_more_white);
 int	expand_number(const char *_buf, uint64_t *_num);
@@ -102,7 +102,7 @@ int	extattr_string_to_namespace(const ch
 int	flopen(const char *_path, int _flags, ...);
 int	forkpty(int *_amaster, char *_name,
 		     struct termios *_termp, struct winsize *_winp);
-void	hexdump(const void *ptr, int length, const char *hdr, int flags);
+void	hexdump(const void *_ptr, int _length, const char *_hdr, int _flags);
 int	humanize_number(char *_buf, size_t _len, int64_t _number,
 	    const char *_suffix, int _scale, int _flags);
 struct kinfo_file *
@@ -113,17 +113,17 @@ struct kinfo_proc *
 	kinfo_getallproc(int *_cntp);
 struct kinfo_proc *
 	kinfo_getproc(pid_t _pid);
-int	kld_isloaded(const char *name);
-int	kld_load(const char *name);
+int	kld_isloaded(const char *_name);
+int	kld_load(const char *_name);
 int	login_tty(int _fd);
 int	openpty(int *_amaster, int *_aslave, char *_name,
 		     struct termios *_termp, struct winsize *_winp);
-void	properties_free(properties list);
-char	*property_find(properties list, const char *name);
-properties properties_read(int fd);
-int	realhostname(char *host, size_t hsize, const struct in_addr *ip);
-int	realhostname_sa(char *host, size_t hsize, struct sockaddr *addr,
-			     int addrlen);
+void	properties_free(properties _list);
+char	*property_find(properties _list, const char *_name);
+properties properties_read(int _fd);
+int	realhostname(char *_host, size_t _hsize, const struct in_addr *_ip);
+int	realhostname_sa(char *_host, size_t _hsize, struct sockaddr *_addr,
+			     int _addrlen);
 int	_secure_path(const char *_path, uid_t _uid, gid_t _gid);
 void	trimdomain(char *_fullhost, int _hostsize);
 const char *uu_lockerr(int _uu_lockresult);
@@ -132,7 +132,7 @@ int	uu_unlock(const char *_ttyname);
 int	uu_lock_txfr(const char *_ttyname, pid_t _pid);
 
 #ifdef _STDIO_H_	/* avoid adding new includes */
-char   *fparseln(FILE *, size_t *, size_t *, const char[3], int);
+char   *fparseln(FILE *_fp, size_t *_len, size_t *_lineno, const char _delim[3], int _flags);
 #endif
 
 #ifdef _PWD_H_
@@ -153,40 +153,40 @@ int	pw_tmp(int _mfd);
 
 #ifdef _GRP_H_
 int 	gr_copy(int __ffd, int _tfd, const struct group *_gr, struct group *_old_gr);
-struct group *gr_dup(const struct group *gr);
-int	gr_equal(const struct group *gr1, const struct group *gr2);
+struct group *gr_dup(const struct group *_gr);
+int	gr_equal(const struct group *_gr1, const struct group *_gr2);
 void	gr_fini(void);
 int	gr_init(const char *_dir, const char *_master);
 int	gr_lock(void);
-char	*gr_make(const struct group *gr);
+char	*gr_make(const struct group *_gr);
 int	gr_mkdb(void);
+struct group *gr_scan(const char *_line);
 int	gr_tmp(int _mdf);
-struct group *gr_scan(const char *line);
 #endif
 
 #ifdef _SYS_PARAM_H_
-int pidfile_close(struct pidfh *pfh);
-int pidfile_fileno(const struct pidfh *pfh);
-struct pidfh *pidfile_open(const char *path, mode_t mode, pid_t *pidptr);
-int pidfile_remove(struct pidfh *pfh);
-int pidfile_write(struct pidfh *pfh);
+int pidfile_close(struct pidfh *_pfh);
+int pidfile_fileno(const struct pidfh *_pfh);
+struct pidfh *pidfile_open(const char *_path, mode_t _mode, pid_t *_pidptr);
+int pidfile_remove(struct pidfh *_pfh);
+int pidfile_write(struct pidfh *_pfh);
 #endif
 
 #ifdef _UFS_UFS_QUOTA_H_
 struct fstab;
 struct quotafile;
-int quota_check_path(const struct quotafile *, const char *path);
-void quota_close(struct quotafile *);
-int quota_convert(struct quotafile *, int);
-const char *quota_fsname(const struct quotafile *);
-int quota_maxid(struct quotafile *);
-int quota_off(struct quotafile *);
-int quota_on(struct quotafile *);
-struct quotafile *quota_open(struct fstab *, int, int);
-const char *quota_qfname(const struct quotafile *);
-int quota_read(struct quotafile *, struct dqblk *, int);
-int quota_write_limits(struct quotafile *, struct dqblk *, int);
-int quota_write_usage(struct quotafile *, struct dqblk *, int);
+int quota_check_path(const struct quotafile *_qf, const char *_path);
+void quota_close(struct quotafile *_qf);
+int quota_convert(struct quotafile *_qf, int _wordsize);
+const char *quota_fsname(const struct quotafile *_qf);
+int quota_maxid(struct quotafile *_qf);
+int quota_off(struct quotafile *_qf);
+int quota_on(struct quotafile *_qf);
+struct quotafile *quota_open(struct fstab *_fs, int _quotatype, int _openflags);
+const char *quota_qfname(const struct quotafile *_qf);
+int quota_read(struct quotafile *_qf, struct dqblk *_dqb, int _id);
+int quota_write_limits(struct quotafile *_qf, struct dqblk *_dqb, int _id);
+int quota_write_usage(struct quotafile *_qf, struct dqblk *_dqb, int _id);
 #endif
 
 __END_DECLS