svn commit: r193221 - head/bin/sh

[Ralf S. Engelschall]

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;