From owner-svn-src-head@FreeBSD.ORG Thu Jan 12 14:40:26 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 05FFD106566B; Thu, 12 Jan 2012 14:40:26 +0000 (UTC) (envelope-from ghelmer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CB9E08FC12; Thu, 12 Jan 2012 14:40:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0CEePIw013614; Thu, 12 Jan 2012 14:40:25 GMT (envelope-from ghelmer@svn.freebsd.org) Received: (from ghelmer@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0CEePAo013612; Thu, 12 Jan 2012 14:40:25 GMT (envelope-from ghelmer@svn.freebsd.org) Message-Id: <201201121440.q0CEePAo013612@svn.freebsd.org> From: Guy Helmer Date: Thu, 12 Jan 2012 14:40:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r230011 - head/lib/libutil X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jan 2012 14:40:26 -0000 Author: ghelmer Date: Thu Jan 12 14:40:25 2012 New Revision: 230011 URL: http://svn.freebsd.org/changeset/base/230011 Log: More prototype formatting fixes, struct member formatting fixes, and namespace fix for property_find() prototype. Provided by bde. Modified: head/lib/libutil/libutil.h Modified: head/lib/libutil/libutil.h ============================================================================== --- head/lib/libutil/libutil.h Thu Jan 12 14:13:49 2012 (r230010) +++ head/lib/libutil/libutil.h Thu Jan 12 14:40:25 2012 (r230011) @@ -69,8 +69,8 @@ typedef __uid_t uid_t; /* for properties.c */ typedef struct _property { struct _property *next; - char *name; - char *value; + char *name; + char *value; } *properties; #ifdef _SYS_PARAM_H_ @@ -121,7 +121,7 @@ int openpty(int *_amaster, int *_aslave, void properties_free(properties _list); char *property_find(properties _list, const char *_name); properties - properties_read(int fd); + 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); @@ -139,8 +139,10 @@ char *fparseln(FILE *_fp, size_t *_len, #endif #ifdef _PWD_H_ -int pw_copy(int _ffd, int _tfd, const struct passwd *_pw, struct passwd *_old_pw); -struct passwd *pw_dup(const struct passwd *_pw); +int pw_copy(int _ffd, int _tfd, const struct passwd *_pw, + struct passwd *_old_pw); +struct passwd + *pw_dup(const struct passwd *_pw); int pw_edit(int _notsetuid); int pw_equal(const struct passwd *_pw1, const struct passwd *_pw2); void pw_fini(void); @@ -149,21 +151,26 @@ char *pw_make(const struct passwd *_pw); char *pw_make_v7(const struct passwd *_pw); int pw_mkdb(const char *_user); int pw_lock(void); -struct passwd *pw_scan(const char *_line, int _flags); -const char *pw_tempname(void); +struct passwd + *pw_scan(const char *_line, int _flags); +const char + *pw_tempname(void); int pw_tmp(int _mfd); #endif #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_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); void gr_fini(void); int gr_init(const char *_dir, const char *_master); int gr_lock(void); char *gr_make(const struct group *_gr); int gr_mkdb(void); -struct group *gr_scan(const char *_line); +struct group + *gr_scan(const char *_line); int gr_tmp(int _mdf); #endif