Author: ghelmer
Date: Wed Jan 11 22:12:45 2012
New Revision: 229985
URL: http://svn.freebsd.org/changeset/base/229985
Log:
Fix forward structure declaration and prototype disorder.
Requested by bde.
Modified:
head/lib/libutil/libutil.h
Modified: head/lib/libutil/libutil.h
==============================================================================
--- head/lib/libutil/libutil.h Wed Jan 11 21:38:05 2012 (r229984)
+++ head/lib/libutil/libutil.h Wed Jan 11 22:12:45 2012 (r229985)
@@ -84,45 +84,27 @@ struct pidfh {
#endif
/* Avoid pulling in all the include files for no need */
-struct termios;
-struct winsize;
struct in_addr;
struct kinfo_file;
struct kinfo_proc;
struct kinfo_vmentry;
+struct sockaddr;
+struct termios;
+struct winsize;
__BEGIN_DECLS
+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);
int extattr_namespace_to_string(int _attrnamespace, char **_string);
int extattr_string_to_namespace(const char *_string, int *_attrnamespace);
int flopen(const char *_path, int _flags, ...);
-void hexdump(const void *ptr, int length, const char *hdr, int flags);
-int login_tty(int _fd);
-void trimdomain(char *_fullhost, int _hostsize);
-int openpty(int *_amaster, int *_aslave, char *_name,
- struct termios *_termp, struct winsize *_winp);
int forkpty(int *_amaster, char *_name,
struct termios *_termp, struct winsize *_winp);
+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);
-int expand_number(const char *_buf, uint64_t *_num);
-const char *uu_lockerr(int _uu_lockresult);
-int uu_lock(const char *_ttyname);
-int uu_unlock(const char *_ttyname);
-int uu_lock_txfr(const char *_ttyname, pid_t _pid);
-int _secure_path(const char *_path, uid_t _uid, gid_t _gid);
-properties properties_read(int fd);
-void properties_free(properties list);
-char *property_find(properties list, const char *name);
-char *auth_getval(const char *name);
-int realhostname(char *host, size_t hsize, const struct in_addr *ip);
-struct sockaddr;
-int realhostname_sa(char *host, size_t hsize, struct sockaddr *addr,
- int addrlen);
-
-int kld_isloaded(const char *name);
-int kld_load(const char *name);
struct kinfo_file *
kinfo_getfile(pid_t _pid, int *_cntp);
struct kinfo_vmentry *
@@ -131,6 +113,23 @@ 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 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);
+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);
+int uu_lock(const char *_ttyname);
+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);
@@ -166,28 +165,28 @@ struct group *gr_scan(const char *line);
#endif
#ifdef _SYS_PARAM_H_
-struct pidfh *pidfile_open(const char *path, mode_t mode, pid_t *pidptr);
-int pidfile_write(struct pidfh *pfh);
int pidfile_close(struct pidfh *pfh);
-int pidfile_remove(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 quotafile;
struct fstab;
-struct quotafile *quota_open(struct fstab *, int, int);
+struct quotafile;
+int quota_check_path(const struct quotafile *, const char *path);
void quota_close(struct quotafile *);
-int quota_on(struct quotafile *);
-int quota_off(struct quotafile *);
+int quota_convert(struct quotafile *, int);
const char *quota_fsname(const struct quotafile *);
-const char *quota_qfname(const struct quotafile *);
int quota_maxid(struct quotafile *);
-int quota_check_path(const struct quotafile *, const char *path);
+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_convert(struct quotafile *, int);
#endif
__END_DECLS
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
