summaryrefslogtreecommitdiffstats
path: root/libutil/gr_util.c
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2012-12-27 16:51:29 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2012-12-27 16:51:29 +0000
commitdca2732b7d9f3eb818b44fe0038b3d3cf3c07fc2 (patch)
tree4121d13cdf313ca4aab954ee74717c9d22962873 /libutil/gr_util.c
parentdcb35c061edb54776541bad319d4da3448dcb09b (diff)
downloadpw-darwin-dca2732b7d9f3eb818b44fe0038b3d3cf3c07fc2.tar.gz
pw-darwin-dca2732b7d9f3eb818b44fe0038b3d3cf3c07fc2.zip
- Clean up previous gr_add use malloc instead of calloc
- Fix tinderbox error Submitted by: db
Diffstat (limited to 'libutil/gr_util.c')
-rw-r--r--libutil/gr_util.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/libutil/gr_util.c b/libutil/gr_util.c
index 90062eb..0cd8055 100644
--- a/libutil/gr_util.c
+++ b/libutil/gr_util.c
@@ -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 *newmember)
}
/* 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);
}