Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
htop
Commits
50000d80
Commit
50000d80
authored
10 years ago
by
Hisham Muhammad
Browse files
Options
Download
Email Patches
Plain Diff
Silence warnings reported in #70.
parent
5ca9b8e0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
linux/Battery.c
+2
-1
linux/Battery.c
linux/LinuxProcessList.c
+3
-2
linux/LinuxProcessList.c
linux/Platform.c
+3
-2
linux/Platform.c
with
8 additions
and
5 deletions
+8
-5
linux/Battery.c
View file @
50000d80
...
...
@@ -117,7 +117,8 @@ static ACPresence procAcpiCheck() {
}
char
line
[
100
];
fgets
(
line
,
sizeof
line
,
file
);
char
*
ok
=
fgets
(
line
,
sizeof
line
,
file
);
if
(
!
ok
)
continue
;
line
[
sizeof
(
line
)
-
1
]
=
'\0'
;
fclose
(
file
);
...
...
This diff is collapsed.
Click to expand it.
linux/LinuxProcessList.c
View file @
50000d80
...
...
@@ -344,7 +344,7 @@ static void LinuxProcessList_readOpenVZData(ProcessList* this, Process* process,
FILE
*
file
=
fopen
(
filename
,
"r"
);
if
(
!
file
)
return
;
fscanf
(
file
,
(
void
)
fscanf
(
file
,
"%*32u %*32s %*1c %*32u %*32u %*32u %*32u %*32u %*32u %*32u "
"%*32u %*32u %*32u %*32u %*32u %*32u %*32u %*32u "
"%*32u %*32u %*32u %*32u %*32u %*32u %*32u %*32u "
...
...
@@ -692,7 +692,8 @@ static inline double LinuxProcessList_scanCPUTime(LinuxProcessList* this) {
// Dependending on your kernel version,
// 5, 7, 8 or 9 of these fields will be set.
// The rest will remain at zero.
fgets
(
buffer
,
255
,
file
);
char
*
ok
=
fgets
(
buffer
,
255
,
file
);
if
(
!
ok
)
buffer
[
0
]
=
'\0'
;
if
(
i
==
0
)
sscanf
(
buffer
,
"cpu %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu"
,
&
usertime
,
&
nicetime
,
&
systemtime
,
&
idletime
,
&
ioWait
,
&
irq
,
&
softIrq
,
&
steal
,
&
guest
,
&
guestnice
);
else
{
...
...
This diff is collapsed.
Click to expand it.
linux/Platform.c
View file @
50000d80
...
...
@@ -80,8 +80,9 @@ int Platform_getUptime() {
double
uptime
=
0
;
FILE
*
fd
=
fopen
(
PROCDIR
"/uptime"
,
"r"
);
if
(
fd
)
{
fscanf
(
fd
,
"%64lf"
,
&
uptime
);
int
n
=
fscanf
(
fd
,
"%64lf"
,
&
uptime
);
fclose
(
fd
);
if
(
n
<=
0
)
return
0
;
}
return
(
int
)
floor
(
uptime
);
}
...
...
@@ -103,7 +104,7 @@ int Platform_getMaxPid() {
FILE
*
file
=
fopen
(
PROCDIR
"/sys/kernel/pid_max"
,
"r"
);
if
(
!
file
)
return
-
1
;
int
maxPid
=
4194303
;
fscanf
(
file
,
"%32d"
,
&
maxPid
);
(
void
)
fscanf
(
file
,
"%32d"
,
&
maxPid
);
fclose
(
file
);
return
maxPid
;
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help