From owner-svn-src-all@FreeBSD.ORG Fri Jan 29 18:33:59 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CFAF21065672; Fri, 29 Jan 2010 18:33:59 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A54BB8FC0C; Fri, 29 Jan 2010 18:33:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0TIXxn5041508; Fri, 29 Jan 2010 18:33:59 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0TIXxmI041506; Fri, 29 Jan 2010 18:33:59 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201001291833.o0TIXxmI041506@svn.freebsd.org> From: Gabor Kovesdan Date: Fri, 29 Jan 2010 18:33:59 +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: r203174 - head/lib/libc/nls X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jan 2010 18:33:59 -0000 Author: gabor (doc,ports committer) Date: Fri Jan 29 18:33:59 2010 New Revision: 203174 URL: http://svn.freebsd.org/changeset/base/203174 Log: - Fix some style(9) bugs Pointed out by: bde Modified: head/lib/libc/nls/msgcat.c Modified: head/lib/libc/nls/msgcat.c ============================================================================== --- head/lib/libc/nls/msgcat.c Fri Jan 29 18:19:43 2010 (r203173) +++ head/lib/libc/nls/msgcat.c Fri Jan 29 18:33:59 2010 (r203174) @@ -107,12 +107,12 @@ SLIST_HEAD(listhead, catentry) cache = nl_catd catopen(const char *name, int type) { - int spcleft, saverr; - char path[PATH_MAX]; - char *nlspath, *lang, *base, *cptr, *pathP, *tmpptr; - char *cptr1, *plang, *pter, *pcode; - struct stat sbuf; - struct catentry *np; + struct stat sbuf; + struct catentry *np; + char *base, *cptr, *cptr1, *lang, *nlspath, *pathP, *pcode; + char *plang, *pter, *tmpptr; + int saverr, spcleft; + char path[PATH_MAX]; if (name == NULL || *name == '\0') NLRETERR(EINVAL); @@ -247,10 +247,10 @@ catopen(const char *name, int type) char * catgets(nl_catd catd, int set_id, int msg_id, const char *s) { - struct _nls_cat_hdr *cat_hdr; - struct _nls_set_hdr *set_hdr; - struct _nls_msg_hdr *msg_hdr; - int l, u, i, r; + struct _nls_cat_hdr *cat_hdr; + struct _nls_msg_hdr *msg_hdr; + struct _nls_set_hdr *set_hdr; + int i, l, r, u; if (catd == NULL || catd == NLERR) { errno = EBADF; @@ -315,7 +315,7 @@ notfound: int catclose(nl_catd catd) { - struct catentry *np; + struct catentry *np; if (catd == NULL || catd == NLERR) { errno = EBADF; @@ -348,11 +348,11 @@ catclose(nl_catd catd) static nl_catd load_msgcat(const char *path, const char *name, const char *lang) { - struct stat st; - nl_catd catd; - struct catentry *np; - void *data; - int fd; + struct stat st; + nl_catd catd; + struct catentry *np; + void *data; + int fd; /* path/name will never be NULL here */ @@ -418,4 +418,3 @@ load_msgcat(const char *path, const char UNLOCK; return (catd); } -