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
229d0058
Commit
229d0058
authored
Sep 08, 2015
by
Hisham Muhammad
Browse files
Merge pull request #262 from eworm-de/calloc
fix calloc() calls
parents
2df36ee2
e8970b6f
Changes
6
Show whitespace changes
Inline
Side-by-side
Header.c
View file @
229d0058
...
@@ -89,7 +89,7 @@ void Header_writeBackToSettings(const Header* this) {
...
@@ -89,7 +89,7 @@ void Header_writeBackToSettings(const Header* this) {
for
(
int
i
=
0
;
i
<
len
;
i
++
)
{
for
(
int
i
=
0
;
i
<
len
;
i
++
)
{
Meter
*
meter
=
(
Meter
*
)
Vector_get
(
vec
,
i
);
Meter
*
meter
=
(
Meter
*
)
Vector_get
(
vec
,
i
);
char
*
name
=
calloc
(
64
,
sizeof
(
char
*
));
char
*
name
=
calloc
(
64
,
sizeof
(
char
));
if
(
meter
->
param
)
{
if
(
meter
->
param
)
{
snprintf
(
name
,
63
,
"%s(%d)"
,
As_Meter
(
meter
)
->
name
,
meter
->
param
);
snprintf
(
name
,
63
,
"%s(%d)"
,
As_Meter
(
meter
)
->
name
,
meter
->
param
);
}
else
{
}
else
{
...
...
Panel.c
View file @
229d0058
...
@@ -455,7 +455,7 @@ bool Panel_onKey(Panel* this, int key) {
...
@@ -455,7 +455,7 @@ bool Panel_onKey(Panel* this, int key) {
HandlerResult
Panel_selectByTyping
(
Panel
*
this
,
int
ch
)
{
HandlerResult
Panel_selectByTyping
(
Panel
*
this
,
int
ch
)
{
int
size
=
Panel_size
(
this
);
int
size
=
Panel_size
(
this
);
if
(
!
this
->
eventHandlerState
)
if
(
!
this
->
eventHandlerState
)
this
->
eventHandlerState
=
calloc
(
100
,
1
);
this
->
eventHandlerState
=
calloc
(
100
,
sizeof
(
char
)
);
char
*
buffer
=
this
->
eventHandlerState
;
char
*
buffer
=
this
->
eventHandlerState
;
if
(
ch
<
255
&&
isalnum
(
ch
))
{
if
(
ch
<
255
&&
isalnum
(
ch
))
{
...
...
darwin/DarwinProcess.c
View file @
229d0058
...
@@ -39,7 +39,7 @@ ProcessClass DarwinProcess_class = {
...
@@ -39,7 +39,7 @@ ProcessClass DarwinProcess_class = {
};
};
DarwinProcess
*
DarwinProcess_new
(
Settings
*
settings
)
{
DarwinProcess
*
DarwinProcess_new
(
Settings
*
settings
)
{
DarwinProcess
*
this
=
calloc
(
sizeof
(
DarwinProcess
)
,
1
);
DarwinProcess
*
this
=
calloc
(
1
,
sizeof
(
DarwinProcess
));
Object_setClass
(
this
,
Class
(
DarwinProcess
));
Object_setClass
(
this
,
Class
(
DarwinProcess
));
Process_init
(
&
this
->
super
,
settings
);
Process_init
(
&
this
->
super
,
settings
);
...
...
freebsd/FreeBSDProcess.c
View file @
229d0058
...
@@ -86,7 +86,7 @@ ProcessPidColumn Process_pidColumns[] = {
...
@@ -86,7 +86,7 @@ ProcessPidColumn Process_pidColumns[] = {
};
};
FreeBSDProcess
*
FreeBSDProcess_new
(
Settings
*
settings
)
{
FreeBSDProcess
*
FreeBSDProcess_new
(
Settings
*
settings
)
{
FreeBSDProcess
*
this
=
calloc
(
sizeof
(
FreeBSDProcess
)
,
1
);
FreeBSDProcess
*
this
=
calloc
(
1
,
sizeof
(
FreeBSDProcess
));
Object_setClass
(
this
,
Class
(
FreeBSDProcess
));
Object_setClass
(
this
,
Class
(
FreeBSDProcess
));
Process_init
(
&
this
->
super
,
settings
);
Process_init
(
&
this
->
super
,
settings
);
return
this
;
return
this
;
...
...
linux/LinuxProcess.c
View file @
229d0058
...
@@ -242,7 +242,7 @@ ProcessClass LinuxProcess_class = {
...
@@ -242,7 +242,7 @@ ProcessClass LinuxProcess_class = {
};
};
LinuxProcess
*
LinuxProcess_new
(
Settings
*
settings
)
{
LinuxProcess
*
LinuxProcess_new
(
Settings
*
settings
)
{
LinuxProcess
*
this
=
calloc
(
sizeof
(
LinuxProcess
)
,
1
);
LinuxProcess
*
this
=
calloc
(
1
,
sizeof
(
LinuxProcess
));
Object_setClass
(
this
,
Class
(
LinuxProcess
));
Object_setClass
(
this
,
Class
(
LinuxProcess
));
Process_init
(
&
this
->
super
,
settings
);
Process_init
(
&
this
->
super
,
settings
);
return
this
;
return
this
;
...
...
unsupported/UnsupportedProcess.c
View file @
229d0058
...
@@ -17,7 +17,7 @@ in the source distribution for its full text.
...
@@ -17,7 +17,7 @@ in the source distribution for its full text.
}*/
}*/
Process
*
UnsupportedProcess_new
(
Settings
*
settings
)
{
Process
*
UnsupportedProcess_new
(
Settings
*
settings
)
{
Process
*
this
=
calloc
(
sizeof
(
Process
)
,
1
);
Process
*
this
=
calloc
(
1
,
sizeof
(
Process
));
Object_setClass
(
this
,
Class
(
Process
));
Object_setClass
(
this
,
Class
(
Process
));
Process_init
(
this
,
settings
);
Process_init
(
this
,
settings
);
return
this
;
return
this
;
...
...
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