Skip to content

atop: move const calc expression out of loop #385

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

atop: move const calc expression out of loop #385

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
13 changes: 8 additions & 5 deletions atop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,8 @@ main(int argc, char *argv[])
int c;
char *p;
struct rlimit rlim;
const size_t orawname_size = sizeof orawname;
const size_t irawname_size = sizeof irawname;

/*
** since privileged actions will be done later on, at this stage
Expand Down Expand Up @@ -380,7 +382,7 @@ main(int argc, char *argv[])
if (optind >= argc)
prusage(argv[0]);

safe_strcpy(orawname, argv[optind++], sizeof orawname);
safe_strcpy(orawname, argv[optind++], orawname_size);

if (!rawwriteflag)
{
Expand All @@ -397,13 +399,13 @@ main(int argc, char *argv[])
{
if (strlen(argv[optind]) == 1)
{
safe_strcpy(irawname, "/dev/stdin", sizeof irawname);
safe_strcpy(irawname, "/dev/stdin", irawname_size);
optind++;
}
}
else
{
safe_strcpy(irawname, argv[optind], sizeof irawname);
safe_strcpy(irawname, argv[optind], irawname_size);
optind++;
}
}
Expand Down Expand Up @@ -1177,6 +1179,7 @@ static void
readrc(char *path, int syslevel)
{
int i, nr, line=0, errorcnt = 0;
const int manrc_size = sizeof manrc / sizeof manrc[0];

/*
** check if this file is readable with the user's
Expand Down Expand Up @@ -1237,7 +1240,7 @@ readrc(char *path, int syslevel)
** tag name and tag value found
** try to recognize tag name
*/
for (i=0; i < sizeof manrc/sizeof manrc[0]; i++)
for (i=0; i < manrc_size; i++)
{
if ( strcmp(tagname, manrc[i].tag) == 0)
{
Expand All @@ -1261,7 +1264,7 @@ readrc(char *path, int syslevel)
/*
** tag name not recognized
*/
if (i == sizeof manrc/sizeof manrc[0])
if (i == manrc_size)
{
fprintf(stderr,
"%s: warning at line %2d "
Expand Down