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

empfile's init callback is now unused, remove

Browse source
This commit is contained in:
Markus Armbruster 2008-02-24 11:19:51 +01:00
parent 6b89127d5b
commit a71f01585f
4 changed files with 15 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/file.h
View file

@ -60,7 +60,6 @@ struct empfile {
/* flags bits EFF_PRIVATE, EFF_CUSTOM also vary */
/* User callbacks */
void (*init)(int, void *); /* called after entry creation, unless null */
int (*postread)(int, void *); /* called after read, unless null */
int (*prewrite)(int, void *); /* called before write, unless null */
};

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

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

14
src/lib/global/file.c
View file

@ -61,28 +61,28 @@
/* Initializers for members flags... */
/* Unmapped cache */
#define UNMAPPED_CACHE(type, flags) \
sizeof(type), (flags), NULL, 0, 0, 0, 0, -1, NULL, NULL, NULL
sizeof(type), (flags), NULL, 0, 0, 0, 0, -1, NULL, NULL
/*
* Mapped cache, array with known size.
* Members cids, fids are not set.
*/
#define ARRAY_CACHE(array, flags) \
sizeof(*(array)), (flags), (char *)(array), \
SZ((array)), 0, 0, 0, -1, NULL, NULL, NULL
SZ((array)), 0, 0, 0, -1, NULL, NULL
/*
* Mapped cache, array with unknown size.
* Members csize, cids, fids are not set.
*/
#define PTR_CACHE(ptr, flags) \
sizeof(*(ptr)), (flags), (char *)(ptr), \
0, 0, 0, 0, -1, NULL, NULL, NULL
0, 0, 0, 0, -1, NULL, NULL
/*
* Array-backed table.
* The array's last element is the sentinel.
*/
#define ARRAY_TABLE(array, flags) \
sizeof(*(array)), (flags), (char *)(array), \
SZ((array)), 0, SZ((array)) - 1, SZ((array)) - 1, -1, NULL, NULL, NULL
SZ((array)), 0, SZ((array)) - 1, SZ((array)) - 1, -1, NULL, NULL
/* Common configuration table flags */
#define EFF_CFG (EFF_PRIVATE | EFF_MEM | EFF_STATIC)
@ -142,9 +142,9 @@ struct empfile empfile[] = {
{EF_LOAN, "loan", "loan", loan_ca,
UNMAPPED_CACHE(struct lonstr, EFF_TYPED)},
{EF_MAP, "map", "map", NULL,
0, 0, NULL, 0, 0, 0, 0, -1, NULL, NULL, NULL},
0, 0, NULL, 0, 0, 0, 0, -1, NULL, NULL},
{EF_BMAP, "bmap", "bmap", NULL,
0, 0, NULL, 0, 0, 0, 0, -1, NULL, NULL, NULL},
0, 0, NULL, 0, 0, 0, 0, -1, NULL, NULL},
{EF_COMM, "commodity", "commodity", commodity_ca,
UNMAPPED_CACHE(struct comstr, EFF_TYPED | EFF_OWNER)},
{EF_LOST, "lost", "lostitems", lost_ca,
@ -221,7 +221,7 @@ struct empfile empfile[] = {
UNMAPPED_CACHE(struct natstr, EFF_TYPED | EFF_OWNER)},
/* Sentinel */
{EF_BAD, NULL, NULL, NULL, 0, 0, NULL, 0, 0, 0, 0, -1, NULL, NULL, NULL},
{EF_BAD, NULL, NULL, NULL, 0, 0, NULL, 0, 0, 0, 0, -1, NULL, NULL},
};
static void

12
src/lib/subs/fileinit.c
View file

@ -38,17 +38,16 @@
struct fileinit {
int ef_type;
void (*init) (int, void *);
int (*postread) (int, void *);
int (*prewrite) (int, void *);
};
static struct fileinit fileinit[] = {
{EF_SECTOR, NULL, sct_postread, sct_prewrite},
{EF_SHIP, NULL, shp_postread, shp_prewrite},
{EF_PLANE, NULL, pln_postread, pln_prewrite},
{EF_LAND, NULL, lnd_postread, lnd_prewrite},
{EF_NUKE, NULL, nuk_postread, nuk_prewrite}
{EF_SECTOR, sct_postread, sct_prewrite},
{EF_SHIP, shp_postread, shp_prewrite},
{EF_PLANE, pln_postread, pln_prewrite},
{EF_LAND, lnd_postread, lnd_prewrite},
{EF_NUKE, nuk_postread, nuk_prewrite}
};
static void ef_open_srv(void);
@ -65,7 +64,6 @@ ef_init_srv(void)
unsigned i;
for (i = 0; i < sizeof(fileinit) / sizeof(fileinit[0]); i++) {
empfile[fileinit[i].ef_type].init = fileinit[i].init;
empfile[fileinit[i].ef_type].postread = fileinit[i].postread;
empfile[fileinit[i].ef_type].prewrite = fileinit[i].prewrite;
}