aboutsummaryrefslogtreecommitdiffstats
path: root/ipc/util.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-04-18 05:39:23 -0400
committerJeff Garzik <jeff@garzik.org>2006-04-18 05:39:23 -0400
commit9e73972cef1c0961c78b0e0b61c4ecc275b29f04 (patch)
tree27907bbd653504d71ff47cb00bdf8cd61e82f126 /ipc/util.c
parenta890b15c0990cc8d686edcc85f5fccde71ad5ce9 (diff)
parent4741c336d27dec3ea68a35659abb8dc82b142388 (diff)
Merge branch 'upstream'
Diffstat (limited to 'ipc/util.c')
-rw-r--r--ipc/util.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ipc/util.c b/ipc/util.c
index 5e785a29e1e6..b3dcfad3b4f7 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -183,8 +183,7 @@ static int grow_ary(struct ipc_ids* ids, int newsize)
183 if(new == NULL) 183 if(new == NULL)
184 return size; 184 return size;
185 new->size = newsize; 185 new->size = newsize;
186 memcpy(new->p, ids->entries->p, sizeof(struct kern_ipc_perm *)*size + 186 memcpy(new->p, ids->entries->p, sizeof(struct kern_ipc_perm *)*size);
187 sizeof(struct ipc_id_ary));
188 for(i=size;i<newsize;i++) { 187 for(i=size;i<newsize;i++) {
189 new->p[i] = NULL; 188 new->p[i] = NULL;
190 } 189 }