zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

avoid strtok and reduce scope of variables.

This commit is contained in:
Hisham Muhammad 2014-04-21 19:16:16 -03:00
parent 57b393f783
commit 30bafafb24
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htop.c
View File

@ -396,7 +396,7 @@ int main(int argc, char** argv) {
} }
break; break;
case 'd': case 'd':
if (sscanf(optarg, "%d", &delay) == 1) { if (sscanf(optarg, "%16d", &delay) == 1) {
if (delay < 1) delay = 1; if (delay < 1) delay = 1;
if (delay > 100) delay = 100; if (delay > 100) delay = 100;
} else { } else {
@ -413,9 +413,10 @@ int main(int argc, char** argv) {
case 'C': case 'C':
usecolors=0; usecolors=0;
break; break;
case 'p': case 'p': {
argCopy = strdup(optarg); argCopy = strdup(optarg);
pid = strtok(argCopy, ","); char* saveptr;
pid = strtok_r(argCopy, ",", &saveptr);
if( !pidWhiteList ) { if( !pidWhiteList ) {
pidWhiteList = Hashtable_new(8, false); pidWhiteList = Hashtable_new(8, false);
@ -424,11 +425,12 @@ int main(int argc, char** argv) {
while( pid ) { while( pid ) {
unsigned int num_pid = atoi(pid); unsigned int num_pid = atoi(pid);
Hashtable_put(pidWhiteList, num_pid, (void *) 1); Hashtable_put(pidWhiteList, num_pid, (void *) 1);
pid = strtok(NULL, ","); pid = strtok_r(NULL, ",", &saveptr);
} }
free(argCopy); free(argCopy);
break; break;
}
default: default:
exit(1); exit(1);
} }
@ -503,9 +505,7 @@ int main(int argc, char** argv) {
bool follow = false; bool follow = false;
struct timeval tv; struct timeval tv;
double newTime = 0.0;
double oldTime = 0.0; double oldTime = 0.0;
bool recalculate;
int ch = ERR; int ch = ERR;
int closeTimeout = 0; int closeTimeout = 0;
@ -516,8 +516,8 @@ int main(int argc, char** argv) {
while (!quit) { while (!quit) {
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
newTime = ((double)tv.tv_sec * 10) + ((double)tv.tv_usec / 100000); double newTime = ((double)tv.tv_sec * 10) + ((double)tv.tv_usec / 100000);
recalculate = (newTime - oldTime > settings->delay); bool recalculate = (newTime - oldTime > settings->delay);
int following = follow ? selectedPid(panel) : -1; int following = follow ? selectedPid(panel) : -1;
if (recalculate) { if (recalculate) {
Header_draw(header); Header_draw(header);