From owner-svn-src-head@FreeBSD.ORG  Mon Jun  1 10:50:18 2009
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 5DC5E1065675;
	Mon,  1 Jun 2009 10:50:18 +0000 (UTC) (envelope-from rse@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 312488FC1C;
	Mon,  1 Jun 2009 10:50:18 +0000 (UTC) (envelope-from rse@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n51AoIfl076681;
	Mon, 1 Jun 2009 10:50:18 GMT (envelope-from rse@svn.freebsd.org)
Received: (from rse@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n51AoH4n076677;
	Mon, 1 Jun 2009 10:50:17 GMT (envelope-from rse@svn.freebsd.org)
Message-Id: <200906011050.n51AoH4n076677@svn.freebsd.org>
From: "Ralf S. Engelschall" <rse@FreeBSD.org>
Date: Mon, 1 Jun 2009 10:50:17 +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: r193221 - head/bin/sh
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: Mon, 01 Jun 2009 10:50:18 -0000

Author: rse
Date: Mon Jun  1 10:50:17 2009
New Revision: 193221
URL: http://svn.freebsd.org/changeset/base/193221

Log:
  be more type correct and align local ckmalloc() with its underlying malloc(3) by using a "size_t" instead of an "int" argument

Modified:
  head/bin/sh/alias.c
  head/bin/sh/memalloc.c
  head/bin/sh/memalloc.h
  head/bin/sh/mkinit.c

Modified: head/bin/sh/alias.c
==============================================================================
--- head/bin/sh/alias.c	Mon Jun  1 10:49:08 2009	(r193220)
+++ head/bin/sh/alias.c	Mon Jun  1 10:50:17 2009	(r193221)
@@ -97,7 +97,7 @@ setalias(char *name, char *val)
 	ap->val = savestr(val);
 #else /* hack */
 	{
-	int len = strlen(val);
+	size_t len = strlen(val);
 	ap->val = ckmalloc(len + 2);
 	memcpy(ap->val, val, len);
 	ap->val[len] = ' ';	/* fluff */

Modified: head/bin/sh/memalloc.c
==============================================================================
--- head/bin/sh/memalloc.c	Mon Jun  1 10:49:08 2009	(r193220)
+++ head/bin/sh/memalloc.c	Mon Jun  1 10:50:17 2009	(r193221)
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
  */
 
 pointer
-ckmalloc(int nbytes)
+ckmalloc(size_t nbytes)
 {
 	pointer p;
 

Modified: head/bin/sh/memalloc.h
==============================================================================
--- head/bin/sh/memalloc.h	Mon Jun  1 10:49:08 2009	(r193220)
+++ head/bin/sh/memalloc.h	Mon Jun  1 10:50:17 2009	(r193221)
@@ -33,6 +33,8 @@
  * $FreeBSD$
  */
 
+#include <string.h>
+
 struct stackmark {
 	struct stack_block *stackp;
 	char *stacknxt;
@@ -46,7 +48,7 @@ extern int stacknleft;
 extern int sstrnleft;
 extern int herefd;
 
-pointer ckmalloc(int);
+pointer ckmalloc(size_t);
 pointer ckrealloc(pointer, int);
 void ckfree(pointer);
 char *savestr(char *);

Modified: head/bin/sh/mkinit.c
==============================================================================
--- head/bin/sh/mkinit.c	Mon Jun  1 10:49:08 2009	(r193220)
+++ head/bin/sh/mkinit.c	Mon Jun  1 10:50:17 2009	(r193221)
@@ -159,7 +159,7 @@ void addstr(char *, struct text *);
 void addchar(int, struct text *);
 void writetext(struct text *, FILE *);
 FILE *ckfopen(char *, char *);
-void *ckmalloc(int);
+void *ckmalloc(size_t);
 char *savestr(char *);
 void error(char *);
 
@@ -464,7 +464,7 @@ ckfopen(char *file, char *mode)
 }
 
 void *
-ckmalloc(int nbytes)
+ckmalloc(size_t nbytes)
 {
 	char *p;