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

Recent s_char purge changed element types to s_char *, but missed

Browse source 
patterns malloc(N * sizeof(s_char *)), fix.
This commit is contained in:
Markus Armbruster 2006-04-29 16:14:48 +00:00
parent 4cf7389ecd
commit 0a3a73cf3d
7 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lib/commands/path.c
View file

@ -84,7 +84,7 @@ path(void)
if (!mapbuf)
mapbuf = malloc(WORLD_Y * MAPWIDTH(3));
if (!map) {
map = malloc(WORLD_Y * sizeof(s_char *));
map = malloc(WORLD_Y * sizeof(char *));
if (map && mapbuf) {
for (i = 0; i < WORLD_Y; i++)
map[i] = &mapbuf[MAPWIDTH(3) * i];

2
src/lib/commands/rout.c
View file

@ -77,7 +77,7 @@ rout(void)
if (!mapbuf)
mapbuf = malloc(WORLD_Y * MAPWIDTH(3));
if (!map) {
map = malloc(WORLD_Y * sizeof(s_char *));
map = malloc(WORLD_Y * sizeof(char *));
if (map && mapbuf) {
for (i = 0; i < WORLD_Y; i++)
map[i] = &mapbuf[MAPWIDTH(3) * i];

2
src/lib/commands/sect.c
View file

@ -68,7 +68,7 @@ sct(void)
if (!mapbuf)
mapbuf = malloc(WORLD_Y * MAPWIDTH(1));
if (!map) {
map = malloc(WORLD_Y * sizeof(s_char *));
map = malloc(WORLD_Y * sizeof(char *));
if (map && mapbuf) {
for (i = 0; i < WORLD_Y; i++)
map[i] = &mapbuf[MAPWIDTH(1) * i];

2
src/lib/commands/surv.c
View file

@ -90,7 +90,7 @@ surv(void)
if (!mapbuf)
mapbuf = malloc(WORLD_Y * MAPWIDTH(1));
if (!map) {
map = malloc(WORLD_Y * sizeof(s_char *));
map = malloc(WORLD_Y * sizeof(char *));
if (map && mapbuf) {
for (i = 0; i < WORLD_Y; i++)
map[i] = &mapbuf[MAPWIDTH(1) * i];

2
src/lib/common/maps.c
View file

@ -73,7 +73,7 @@ draw_map(int bmap, s_char origin, int map_flags, struct nstr_sect *nsp)
if (!wmapbuf)
wmapbuf = malloc(WORLD_Y * MAPWIDTH(1));
if (!wmap) {
wmap = malloc(WORLD_Y * sizeof(s_char *));
wmap = malloc(WORLD_Y * sizeof(char *));
if (wmap && wmapbuf) {
for (i = 0; i < WORLD_Y; i++)
wmap[i] = &wmapbuf[MAPWIDTH(1) * i];

2
src/lib/subs/radmap.c
View file

@ -93,7 +93,7 @@ radmap2(int owner,
if (!visbuf)
visbuf = malloc(WORLD_Y * (WORLD_X + 1));
if (!rad) {
rad = malloc(WORLD_Y * sizeof(s_char *));
rad = malloc(WORLD_Y * sizeof(char *));
if (rad && radbuf) {
for (x = 0; x < WORLD_Y; x++)
rad[x] = &radbuf[(WORLD_X + 1) * x];

2
src/lib/subs/satmap.c
View file

@ -73,7 +73,7 @@ satmap(int x, int y, int eff, int range, int flags, int type)
if (!radbuf)
radbuf = malloc(WORLD_Y * (WORLD_X + 1));
if (!rad) {
rad = malloc(WORLD_Y * sizeof(s_char *));
rad = malloc(WORLD_Y * sizeof(char *));
if (rad && radbuf) {
for (rx = 0; rx < WORLD_Y; rx++)
rad[rx] = &radbuf[(WORLD_X + 1) * rx];