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

(sona): Simplify the memory allocation for rad[] and vis[].

Browse source 
No functional changes.
This commit is contained in:
Ron Koenderink 2006-01-14 15:50:16 +00:00
parent 8a3dc2d846
commit d6f5688b75
1 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/lib/commands/sona.c
View file

@ -85,26 +85,20 @@ sona(void)
radbuf = malloc((WORLD_Y * (WORLD_X + 1))); radbuf = malloc((WORLD_Y * (WORLD_X + 1)));
if (!visbuf) if (!visbuf)
visbuf = malloc((WORLD_Y * (WORLD_X + 1))); visbuf = malloc((WORLD_Y * (WORLD_X + 1)));
if (!rad) { if (!rad && radbuf) {
rad = malloc(WORLD_Y * sizeof(char *)); rad = malloc(WORLD_Y * sizeof(char *));
if (rad && radbuf) { if (rad) {
for (x = 0; x < WORLD_Y; x++) { for (x = 0; x < WORLD_Y; x++) {
rad[x] = &radbuf[(WORLD_X + 1) * x]; rad[x] = &radbuf[(WORLD_X + 1) * x];
} }
} else if (rad) {
free(rad);
rad = NULL;
} }
} }
if (!vis) { if (!vis && visbuf) {
vis = malloc(WORLD_Y * sizeof(char *)); vis = malloc(WORLD_Y * sizeof(char *));
if (vis && visbuf) { if (vis) {
for (x = 0; x < WORLD_Y; x++) { for (x = 0; x < WORLD_Y; x++) {
vis[x] = &visbuf[(WORLD_X + 1) * x]; vis[x] = &visbuf[(WORLD_X + 1) * x];
} }
} else if (vis) {
free(vis);
vis = NULL;
} }
} }
if (!radbuf || !visbuf || !rad || !vis) { if (!radbuf || !visbuf || !rad || !vis) {