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

(bzero, bcopy): Obsolete BSDisms; remove. Remove some calls without

Browse source 
effect.  Replace calls by struct assignment where possible.  Replace
clear buffer, copy string to buffer by strncpy().  Use assignment to
clear when that's clearer.  Replace overlapping copy through bounce
buffer by memmove().  Replace rest by standard memset() and memcpy().
Also use sizeof() instead of literal array sizes for robustness, and
instead of symbolic array sizes for clarity.
This commit is contained in:
Markus Armbruster 2004-01-08 17:54:28 +00:00
parent 2910da23ea
commit 4ae9c417b3
79 changed files with 172 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/lib/update/finish.c
View file

@ -103,8 +103,7 @@ finish_sects(int etu)
}
/* Wipe it clean */
bzero((s_char *)g_distptrs, ((WORLD_X * WORLD_Y) *
sizeof(struct distinfo)));
memset(g_distptrs, 0, ((WORLD_X * WORLD_Y) * sizeof(struct distinfo)));
logerror("delivering...\n");
/* Do deliveries */
@ -233,7 +232,7 @@ assemble_dist_paths(struct distinfo *distptrs)
cost */
infptr->excost = pathcost(sp, p, MOB_ROAD);
#ifdef SAVE_FINISH_PATHS
bcopy(p, infptr->path, len);
memcpy(infptr->path, p, len);
#else
infptr->path = finish_path;
#endif /* SAVE_FINISH_PATHS */

4
src/lib/update/land.c
View file

@ -295,7 +295,7 @@ landrepair(register struct lndstr *land, int *vec, struct natstr *np,
leftp = ((float)left / 100.0);
bzero((s_char *)mvec, sizeof(mvec));
memset(mvec, 0, sizeof(mvec));
mvec[I_LCM] = lcm_needed = ldround((double)(lp->l_lcm * leftp), 1);
mvec[I_HCM] = hcm_needed = ldround((double)(lp->l_hcm * leftp), 1);
/*
@ -324,7 +324,7 @@ landrepair(register struct lndstr *land, int *vec, struct natstr *np,
build = ldround((double)(buildp * 100.0), 1);
bzero((s_char *)mvec, sizeof(mvec));
memset(mvec, 0, sizeof(mvec));
mvec[I_LCM] = lcm_needed = roundavg((double)(lp->l_lcm * buildp));
mvec[I_HCM] = hcm_needed = roundavg((double)(lp->l_hcm * buildp));
/*

10
src/lib/update/main.c
View file

@ -95,10 +95,10 @@ update_main(void *argv)
* happiness, and printing out the state of the nation)
*/
logerror("production update (%d etus)", etu);
bzero((s_char *)pops, sizeof(pops));
bzero((s_char *)air_money, sizeof(air_money));
bzero((s_char *)sea_money, sizeof(sea_money));
bzero((s_char *)lnd_money, sizeof(lnd_money));
memset(pops, 0, sizeof(pops));
memset(air_money, 0, sizeof(air_money));
memset(sea_money, 0, sizeof(sea_money));
memset(lnd_money, 0, sizeof(lnd_money));
bp = (int *)calloc(WORLD_X * WORLD_Y * 7, sizeof(int));
for (n = 0; n < MAXNOC; n++) {
money[n] = 0;
@ -116,7 +116,7 @@ update_main(void *argv)
int y, z, sb = 0, sm = 0, pb = 0, pm = 0, lm = 0, lb = 0;
long p_sect[SCT_MAXDEF + 1][2];
bzero((s_char *)p_sect, sizeof(p_sect));
memset(p_sect, 0, sizeof(p_sect));
mil_dbl_pay = 0;
if ((np = getnatp(x)) == (struct natstr *)0)
continue;

4
src/lib/update/nat.c
View file

@ -196,8 +196,8 @@ prod_nat(int etu)
if (ally_factor > 0.0)
share_incr(res, tech);
else {
bzero((s_char *)res, sizeof(res));
bzero((s_char *)tech, sizeof(tech));
memset(res, 0, sizeof(res));
memset(tech, 0, sizeof(tech));
}
for (n = 0; NULL != (np = getnatp(n)); n++) {
if ((np->nat_stat & STAT_NORM) == 0)

2
src/lib/update/nav_ship.c
View file

@ -269,7 +269,7 @@ nav_ship(register struct shpstr *sp)
emp_initque(&ship_list);
mlp = (struct mlist *)malloc(sizeof(struct mlist));
mlp->mcp = mchr + sp->shp_type;
bcopy((s_char *)sp, (s_char *)&mlp->ship, sizeof(struct shpstr));
mlp->ship = *sp;
mlp->mobil = (double)sp->shp_mobil;
emp_insque(&mlp->queue, &ship_list);

2
src/lib/update/plague.c
View file

@ -63,7 +63,7 @@ do_plague(struct sctstr *sp, struct natstr *np, int etu)
if (getvec(VT_ITEM, vec, (s_char *)sp, EF_SECTOR) <= 0)
return;
if (getvec(VT_COND, cvec, (s_char *)sp, EF_SECTOR) <= 0)
bzero((s_char *)cvec, sizeof(cvec));
memset(cvec, 0, sizeof(cvec));
if (cvec[C_PSTAGE] == 0) {
cvec[C_PSTAGE] = infect_people(np, vec, sp->sct_effic,

4
src/lib/update/plane.c
View file

@ -203,7 +203,7 @@ prod_plane(int etus, int natnum, int *bp, int buildem)
left = delta;
leftp = ((float)left / 100.0);
bzero((s_char *)mvec, sizeof(mvec));
memset(mvec, 0, sizeof(mvec));
mvec[I_MILIT] = mil_needed =
ldround((double)(plp->pl_crew * leftp), 1);
mvec[I_LCM] = lcm_needed =
@ -227,7 +227,7 @@ prod_plane(int etus, int natnum, int *bp, int buildem)
(float)plp->pl_hcm));
build = ldround((double)(buildp * 100.0), 1);
bzero((s_char *)mvec, sizeof(mvec));
memset(mvec, 0, sizeof(mvec));
mvec[I_MILIT] = mil_needed =
roundavg((double)(plp->pl_crew * buildp));
mvec[I_LCM] = lcm_needed =

2
src/lib/update/prepare.c
View file

@ -62,7 +62,7 @@ prepare_sects(int etu, int *bp)
struct natstr *np;
int n, civ_tax, uw_tax, mil_pay;
bzero((s_char *)levels, sizeof(levels));
memset(levels, 0, sizeof(levels));
/* Process all the fallout. */
if (opt_FALLOUT) {

6
src/lib/update/sail.c
View file

@ -170,7 +170,7 @@ sail_find_fleet(struct fltheadstr **head, struct shpstr *sp)
if (!fltp) {
fltp = (struct fltheadstr *)malloc(sizeof(*fltp));
bzero((s_char *)fltp, sizeof(*fltp));
memset(fltp, 0, sizeof(*fltp));
/* Fix the links. */
fltp->next = (*head);
@ -195,7 +195,7 @@ sail_find_fleet(struct fltheadstr **head, struct shpstr *sp)
}
this = (struct fltelemstr *)malloc(sizeof(*this));
bzero((s_char *)this, sizeof(*this));
memset(this, 0, sizeof(*this));
this->num = sp->shp_uid;
this->own = sp->shp_own;
this->next = fltp->head;
@ -345,7 +345,7 @@ fltp_to_list(struct fltheadstr *fltp, struct emp_qelem *list)
mlp = (struct mlist *)malloc(sizeof(struct mlist));
sp = getshipp(fe->num);
mlp->mcp = mchr + sp->shp_type;
bcopy((s_char *)sp, (s_char *)&mlp->ship, sizeof(struct shpstr));
mlp->ship = *sp;
mlp->mobil = fe->mobil;
emp_insque(&mlp->queue, list);
}

4
src/lib/update/ship.c
View file

@ -376,7 +376,7 @@ shiprepair(register struct shpstr *ship, int *vec, struct natstr *np,
left = delta;
leftp = ((float)left / 100.0);
bzero((s_char *)mvec, sizeof(mvec));
memset(mvec, 0, sizeof(mvec));
mvec[I_LCM] = lcm_needed = ldround((double)(mp->m_lcm * leftp), 1);
mvec[I_HCM] = hcm_needed = ldround((double)(mp->m_hcm * leftp), 1);
@ -390,7 +390,7 @@ shiprepair(register struct shpstr *ship, int *vec, struct natstr *np,
buildp = MIN(buildp, ((float)mvec[I_HCM] / (float)mp->m_hcm));
build = ldround((double)(buildp * 100.0), 1);
bzero((s_char *)mvec, sizeof(mvec));
memset(mvec, 0, sizeof(mvec));
mvec[I_LCM] = lcm_needed = roundavg((double)(mp->m_lcm * buildp));
mvec[I_HCM] = hcm_needed = roundavg((double)(mp->m_hcm * buildp));