Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 27 Dec 2012 16:51:30 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r244739 - head/lib/libutil
Message-ID:  <201212271651.qBRGpUJx016604@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: bapt
Date: Thu Dec 27 16:51:29 2012
New Revision: 244739
URL: http://svnweb.freebsd.org/changeset/base/244739

Log:
  - Clean up previous gr_add use malloc instead of calloc
  - Fix tinderbox error
  
  Submitted by:	db

Modified:
  head/lib/libutil/gr_util.c
  head/lib/libutil/libutil.h

Modified: head/lib/libutil/gr_util.c
==============================================================================
--- head/lib/libutil/gr_util.c	Thu Dec 27 14:44:13 2012	(r244738)
+++ head/lib/libutil/gr_util.c	Thu Dec 27 16:51:29 2012	(r244739)
@@ -482,7 +482,7 @@ gr_dup(const struct group *gr)
  * Add a new member name to a struct group.
  */
 struct group *
-gr_add(struct group *gr, const char *newmember)
+gr_add(struct group *gr, char *newmember)
 {
 	size_t mlen;
 	int num_mem=0;
@@ -502,18 +502,17 @@ gr_add(struct group *gr, const char *new
 	}
 	/* Allocate enough for current pointers + 1 more and NULL marker */
 	mlen = (num_mem + 2) * sizeof(*gr->gr_mem);
-	if ((members = calloc(1, mlen )) == NULL) {
+	if ((members = malloc(mlen)) == NULL) {
 		errno = ENOMEM;
 		return (NULL);
 	}
 	memcpy(members, gr->gr_mem, num_mem * sizeof(*gr->gr_mem));
-	members[num_mem++] = (char *)newmember;
+	members[num_mem++] = newmember;
 	members[num_mem] = NULL;
 	gr->gr_mem = members;
 	newgr = gr_dup(gr);
 	if (newgr == NULL)
 		errno = ENOMEM;
-
 	free(members);
 	return (newgr);
 }

Modified: head/lib/libutil/libutil.h
==============================================================================
--- head/lib/libutil/libutil.h	Thu Dec 27 14:44:13 2012	(r244738)
+++ head/lib/libutil/libutil.h	Thu Dec 27 16:51:29 2012	(r244739)
@@ -167,7 +167,7 @@ int 	gr_copy(int __ffd, int _tfd, const 
 struct group *
 	gr_dup(const struct group *_gr);
 struct group *
-	gr_add(struct group *_gr, const char *_newmember);
+	gr_add(struct group *_gr, char *_newmember);
 int	gr_equal(const struct group *_gr1, const struct group *_gr2);
 void	gr_fini(void);
 int	gr_init(const char *_dir, const char *_master);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212271651.qBRGpUJx016604>