Skip to content
GitLab
Menu
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
f49f5458
Commit
f49f5458
authored
Oct 13, 2018
by
Alan Barr
Committed by
Hisham Muhammad
Feb 10, 2019
Browse files
Fix printf() unsigned placeholders
Unsigned numbers should be using "%u". Raised by cppcheck
parent
60e55786
Changes
1
Hide whitespace changes
Inline
Side-by-side
Process.c
View file @
f49f5458
...
@@ -228,7 +228,7 @@ void Process_humanNumber(RichString* str, unsigned long number, bool coloring) {
...
@@ -228,7 +228,7 @@ void Process_humanNumber(RichString* str, unsigned long number, bool coloring) {
if
(
number
>=
(
10
*
ONE_DECIMAL_M
))
{
if
(
number
>=
(
10
*
ONE_DECIMAL_M
))
{
#ifdef __LP64__
#ifdef __LP64__
if
(
number
>=
(
100
*
ONE_DECIMAL_G
))
{
if
(
number
>=
(
100
*
ONE_DECIMAL_G
))
{
len
=
snprintf
(
buffer
,
10
,
"%4l
d
T "
,
number
/
ONE_G
);
len
=
snprintf
(
buffer
,
10
,
"%4l
u
T "
,
number
/
ONE_G
);
RichString_appendn
(
str
,
largeNumberColor
,
buffer
,
len
);
RichString_appendn
(
str
,
largeNumberColor
,
buffer
,
len
);
return
;
return
;
}
else
if
(
number
>=
(
1000
*
ONE_DECIMAL_M
))
{
}
else
if
(
number
>=
(
1000
*
ONE_DECIMAL_M
))
{
...
@@ -238,7 +238,7 @@ void Process_humanNumber(RichString* str, unsigned long number, bool coloring) {
...
@@ -238,7 +238,7 @@ void Process_humanNumber(RichString* str, unsigned long number, bool coloring) {
}
}
#endif
#endif
if
(
number
>=
(
100
*
ONE_DECIMAL_M
))
{
if
(
number
>=
(
100
*
ONE_DECIMAL_M
))
{
len
=
snprintf
(
buffer
,
10
,
"%4l
d
G "
,
number
/
ONE_M
);
len
=
snprintf
(
buffer
,
10
,
"%4l
u
G "
,
number
/
ONE_M
);
RichString_appendn
(
str
,
largeNumberColor
,
buffer
,
len
);
RichString_appendn
(
str
,
largeNumberColor
,
buffer
,
len
);
return
;
return
;
}
}
...
@@ -246,11 +246,11 @@ void Process_humanNumber(RichString* str, unsigned long number, bool coloring) {
...
@@ -246,11 +246,11 @@ void Process_humanNumber(RichString* str, unsigned long number, bool coloring) {
RichString_appendn
(
str
,
largeNumberColor
,
buffer
,
len
);
RichString_appendn
(
str
,
largeNumberColor
,
buffer
,
len
);
return
;
return
;
}
else
if
(
number
>=
100000
)
{
}
else
if
(
number
>=
100000
)
{
len
=
snprintf
(
buffer
,
10
,
"%4l
d
M "
,
number
/
ONE_K
);
len
=
snprintf
(
buffer
,
10
,
"%4l
u
M "
,
number
/
ONE_K
);
RichString_appendn
(
str
,
processMegabytesColor
,
buffer
,
len
);
RichString_appendn
(
str
,
processMegabytesColor
,
buffer
,
len
);
return
;
return
;
}
else
if
(
number
>=
1000
)
{
}
else
if
(
number
>=
1000
)
{
len
=
snprintf
(
buffer
,
10
,
"%2l
d
"
,
number
/
1000
);
len
=
snprintf
(
buffer
,
10
,
"%2l
u
"
,
number
/
1000
);
RichString_appendn
(
str
,
processMegabytesColor
,
buffer
,
len
);
RichString_appendn
(
str
,
processMegabytesColor
,
buffer
,
len
);
number
%=
1000
;
number
%=
1000
;
len
=
snprintf
(
buffer
,
10
,
"%03lu "
,
number
);
len
=
snprintf
(
buffer
,
10
,
"%03lu "
,
number
);
...
@@ -278,7 +278,7 @@ void Process_colorNumber(RichString* str, unsigned long long number, bool colori
...
@@ -278,7 +278,7 @@ void Process_colorNumber(RichString* str, unsigned long long number, bool colori
int
len
=
snprintf
(
buffer
,
13
,
" no perm "
);
int
len
=
snprintf
(
buffer
,
13
,
" no perm "
);
RichString_appendn
(
str
,
CRT_colors
[
PROCESS_SHADOW
],
buffer
,
len
);
RichString_appendn
(
str
,
CRT_colors
[
PROCESS_SHADOW
],
buffer
,
len
);
}
else
if
(
number
>
10000000000
)
{
}
else
if
(
number
>
10000000000
)
{
xSnprintf
(
buffer
,
13
,
"%11ll
d
"
,
number
/
1000
);
xSnprintf
(
buffer
,
13
,
"%11ll
u
"
,
number
/
1000
);
RichString_appendn
(
str
,
largeNumberColor
,
buffer
,
5
);
RichString_appendn
(
str
,
largeNumberColor
,
buffer
,
5
);
RichString_appendn
(
str
,
processMegabytesColor
,
buffer
+
5
,
3
);
RichString_appendn
(
str
,
processMegabytesColor
,
buffer
+
5
,
3
);
RichString_appendn
(
str
,
processColor
,
buffer
+
8
,
4
);
RichString_appendn
(
str
,
processColor
,
buffer
+
8
,
4
);
...
@@ -380,9 +380,9 @@ void Process_writeField(Process* this, RichString* str, ProcessField field) {
...
@@ -380,9 +380,9 @@ void Process_writeField(Process* this, RichString* str, ProcessField field) {
switch
(
field
)
{
switch
(
field
)
{
case
PERCENT_CPU
:
{
case
PERCENT_CPU
:
{
if
(
this
->
percent_cpu
>
999
.
9
)
{
if
(
this
->
percent_cpu
>
999
.
9
)
{
xSnprintf
(
buffer
,
n
,
"%4
d
"
,
(
unsigned
int
)
this
->
percent_cpu
);
xSnprintf
(
buffer
,
n
,
"%4
u
"
,
(
unsigned
int
)
this
->
percent_cpu
);
}
else
if
(
this
->
percent_cpu
>
99
.
9
)
{
}
else
if
(
this
->
percent_cpu
>
99
.
9
)
{
xSnprintf
(
buffer
,
n
,
"%3
d
. "
,
(
unsigned
int
)
this
->
percent_cpu
);
xSnprintf
(
buffer
,
n
,
"%3
u
. "
,
(
unsigned
int
)
this
->
percent_cpu
);
}
else
{
}
else
{
xSnprintf
(
buffer
,
n
,
"%4.1f "
,
this
->
percent_cpu
);
xSnprintf
(
buffer
,
n
,
"%4.1f "
,
this
->
percent_cpu
);
}
}
...
...
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