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

Remove useless multiplications with sizeof(char) and sizeof(s_char).

Browse source 
Replace by literal 1 in other contexts.
This commit is contained in:
Markus Armbruster 2006-03-26 10:16:08 +00:00
parent 8ca2468706
commit 8cd3845b08
11 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -236,7 +236,7 @@ nav_map(int x, int y, int show_designations)
if (!snxtsct(&ns, what))
return RET_FAIL;
if (!wmapbuf)
wmapbuf = malloc((WORLD_Y * MAPWIDTH(1)) * sizeof(s_char));
wmapbuf = malloc(WORLD_Y * MAPWIDTH(1));
if (!wmap) {
wmap = malloc(WORLD_Y * sizeof(s_char *));
if (wmap && wmapbuf) {

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

@ -82,7 +82,7 @@ path(void)
return RET_FAIL;
}
if (!mapbuf)
mapbuf = malloc((WORLD_Y * MAPWIDTH(3)) * sizeof(s_char));
mapbuf = malloc(WORLD_Y * MAPWIDTH(3));
if (!map) {
map = malloc(WORLD_Y * sizeof(s_char *));
if (map && mapbuf) {

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

@ -168,7 +168,7 @@ rea(void)
nbytes = tgm.tel_length;
if (nbytes > sizeof(msgbuf) - 1)
nbytes = sizeof(msgbuf) - 1;
(void)fread(msgbuf, sizeof(s_char), nbytes, telfp);
fread(msgbuf, 1, nbytes, telfp);
msgbuf[nbytes] = 0;
if (readit)
uprnf(msgbuf);

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

@ -90,7 +90,7 @@ rout(void)
} else if (!snxtsct(&ns, str))
return RET_FAIL;
if (!mapbuf)
mapbuf = malloc((WORLD_Y * MAPWIDTH(3)) * sizeof(s_char));
mapbuf = malloc(WORLD_Y * MAPWIDTH(3));
if (!map) {
map = malloc(WORLD_Y * sizeof(s_char *));
if (map && mapbuf) {
@ -102,7 +102,7 @@ rout(void)
}
}
if (!buf)
buf = malloc((MAPWIDTH(3) + 12) * sizeof(s_char));
buf = malloc(MAPWIDTH(3) + 12);
if (!mapbuf || !map || !buf) {
pr("Memory error, tell the deity.\n");
logerror("malloc failed in rout\n");

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

@ -82,7 +82,7 @@ sct(void)
} else if (!snxtsct(&ns, str))
return RET_SYN;
if (!mapbuf)
mapbuf = malloc((WORLD_Y * MAPWIDTH(1)) * sizeof(s_char));
mapbuf = malloc(WORLD_Y * MAPWIDTH(1));
if (!map) {
map = malloc(WORLD_Y * sizeof(s_char *));
if (map && mapbuf) {

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

@ -101,7 +101,7 @@ surv(void)
} else if (!snxtsct(&nstr, str))
return RET_SYN;
if (!mapbuf)
mapbuf = malloc((WORLD_Y * MAPWIDTH(1)) * sizeof(s_char));
mapbuf = malloc(WORLD_Y * MAPWIDTH(1));
if (!map) {
map = malloc(WORLD_Y * sizeof(s_char *));
if (map && mapbuf) {