Skip to content

acctproc: move const calc expression out of loop #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GermanAizek wants to merge 1 commit into
base: master
Choose a base branch
from
Open

acctproc: move const calc expression out of loop #384

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions acctproc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ acctswon(void)
struct stat statbuf;
char *ep;
int ret;
const int pacctadm_size = sizeof pacctadm / sizeof pacctadm[0];

/*
** when a particular environment variable is present, atop should
Expand Down Expand Up @@ -181,7 +182,7 @@ acctswon(void)
** for one of the standard accounting-files; in that case we
** open this file and get our info from here ....
*/
for (i=0, j=0; i < sizeof pacctadm/sizeof pacctadm[0]; i++)
for (i=0, j=0; i < pacctadm_size; i++)
{
if ( stat(pacctadm[i].name, &pacctadm[i].stat) == 0)
j++;
Expand All @@ -199,7 +200,7 @@ acctswon(void)

(void) wait((int *) 0); /* let the parent wait */

for (i=0; i < sizeof pacctadm/sizeof pacctadm[0]; i++)
for (i=0; i < pacctadm_size; i++)
{
if ( stat(pacctadm[i].name, &statbuf) == 0)
{
Expand Down Expand Up @@ -877,6 +878,7 @@ acctphotoproc(struct tstat *accproc, int nrprocs)
struct acct_v3 acctrec_v3;
struct stat statacc;
int filled;
const int gen_name_size = sizeof(api->gen.name);

/*
** if accounting not supported, skip call
Expand Down Expand Up @@ -973,7 +975,7 @@ acctphotoproc(struct tstat *accproc, int nrprocs)
api->mem.majflt = acctexp(acctrec.ac_majflt);
api->dsk.rio = acctexp(acctrec.ac_rw);

safe_strcpy(api->gen.name, acctrec.ac_comm, sizeof api->gen.name);
safe_strcpy(api->gen.name, acctrec.ac_comm, gen_name_size);
filled = 1;
break;

Expand Down Expand Up @@ -1001,7 +1003,7 @@ acctphotoproc(struct tstat *accproc, int nrprocs)
api->mem.majflt = acctexp(acctrec_v3.ac_majflt);
api->dsk.rio = acctexp(acctrec_v3.ac_rw);

safe_strcpy(api->gen.name, acctrec_v3.ac_comm, sizeof api->gen.name);
safe_strcpy(api->gen.name, acctrec_v3.ac_comm, gen_name_size);
filled = 1;
break;
}
Expand Down