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

Remove redundant sscanf calls (in (s)scanf a blank validates _zero_ or more whitespace) 

man sscanf(3):
A sequence of white-space characters (space, tab, newline, etc.; see isspace(3)).
This directive matches any amount of white space, including none, in the input.
This commit is contained in:
Daniel Lange 2022-05-04 16:53:23 +02:00 committed by BenBE
parent 549fcb6bb8
commit e08eec813c
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
linux/LinuxProcessList.c
View File

@ -2101,16 +2101,11 @@ static void scanCPUFrequencyFromCPUinfo(LinuxProcessList* this) {
if (fgets(buffer, PROC_LINE_LENGTH, file) == NULL) if (fgets(buffer, PROC_LINE_LENGTH, file) == NULL)
break; break;
if ( if (sscanf(buffer, "processor : %d", &cpuid) == 1) {
(sscanf(buffer, "processor : %d", &cpuid) == 1) ||
(sscanf(buffer, "processor: %d", &cpuid) == 1)
) {
continue; continue;
} else if ( } else if (
(sscanf(buffer, "cpu MHz : %lf", &frequency) == 1) || (sscanf(buffer, "cpu MHz : %lf", &frequency) == 1) ||
(sscanf(buffer, "cpu MHz: %lf", &frequency) == 1) || (sscanf(buffer, "clock : %lfMHz", &frequency) == 1)
(sscanf(buffer, "clock : %lfMHz", &frequency) == 1) ||
(sscanf(buffer, "clock: %lfMHz", &frequency) == 1)
) { ) {
if (cpuid < 0 || (unsigned int)cpuid > (existingCPUs - 1)) { if (cpuid < 0 || (unsigned int)cpuid > (existingCPUs - 1)) {
continue; continue;