From owner-svn-src-head@FreeBSD.ORG  Thu Oct 21 10:36:36 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
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 A38CC106564A;
	Thu, 21 Oct 2010 10:36:36 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 91CEC8FC17;
	Thu, 21 Oct 2010 10:36:36 +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 o9LAaaic088140;
	Thu, 21 Oct 2010 10:36:36 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9LAaaLk088138;
	Thu, 21 Oct 2010 10:36:36 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201010211036.o9LAaaLk088138@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Thu, 21 Oct 2010 10:36:36 +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: r214128 - head/lib/libgeom
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
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Oct 2010 10:36:36 -0000

Author: pjd
Date: Thu Oct 21 10:36:36 2010
New Revision: 214128
URL: http://svn.freebsd.org/changeset/base/214128

Log:
  - Simplify gctl_get_handle() a bit.
  - Prefer 'unsigned int' over 'u_int' in userland code.

Modified:
  head/lib/libgeom/geom_ctl.c

Modified: head/lib/libgeom/geom_ctl.c
==============================================================================
--- head/lib/libgeom/geom_ctl.c	Thu Oct 21 10:13:52 2010	(r214127)
+++ head/lib/libgeom/geom_ctl.c	Thu Oct 21 10:36:36 2010	(r214128)
@@ -54,7 +54,7 @@ static char nomemmsg[] = "Could not allo
 void
 gctl_dump(struct gctl_req *req, FILE *f)
 {
-	u_int i;
+	unsigned int i;
 	int j;
 	struct gctl_req_arg *ap;
 
@@ -126,10 +126,8 @@ gctl_check_alloc(struct gctl_req *req, v
 struct gctl_req *
 gctl_get_handle(void)
 {
-	struct gctl_req *rp;
 
-	rp = calloc(1, sizeof *rp);
-	return (rp);
+	return (calloc(1, sizeof(struct gctl_req)));
 }
 
 /*
@@ -233,7 +231,7 @@ gctl_issue(struct gctl_req *req)
 void
 gctl_free(struct gctl_req *req)
 {
-	u_int i;
+	unsigned int i;
 
 	if (req == NULL)
 		return;