empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Initialize ef_type and uid automatically in ef_extend()

Browse source 
New struct emptypedstr to avoid depending on empobj.h there.

Remove now superfluous manual initializations elsewhere.

This doesn't fix any missing initializations.
This commit is contained in:
Markus Armbruster 2008-02-24 11:07:18 +01:00
parent d628679a24
commit 6cd3d55c4e
9 changed files with 28 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/lib/common/file.c
View file

@ -475,11 +475,17 @@ static void
do_blank(struct empfile *ep, void *buf, int id, int count)
{
int i;
struct emptypedstr *elt;
memset(buf, 0, count * ep->size);
if (ep->init) {
for (i = 0; i < count; i++)
ep->init(id + i, (char *)buf + i * ep->size);
for (i = 0; i < count; i++) {
elt = (struct emptypedstr *)((char *)buf + i * ep->size);
if (ep->flags & EFF_TYPED) {
elt->ef_type = ep->uid;
elt->uid = id + i;
}
if (ep->init)
ep->init(id + i, (void *)elt);
}
}