zeldon/htop
1
0
Fork 0
mirror of https://github.com/xzeldon/htop.git synced 2025-07-13 12:44:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into wip

Browse Source 
Conflicts:
	Process.c
	Process.h
	htop.c
	linux/LinuxProcess.c
	linux/LinuxProcess.h
	test_spec.lua
This commit is contained in:
Hisham Muhammad
2015-04-02 01:57:37 -03:00
parent 4315e0c2a0 cb8ac6b0f1
commit d880def0e9
11 changed files with 124 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ProcessList.c
View File

@ -287,7 +287,7 @@ void ProcessList_rebuildPanel(ProcessList* this) {
}
}
Process* ProcessList_getProcess(ProcessList* this, pid_t pid, bool* preExisting, Process_new_fn constructor) {
Process* ProcessList_getProcess(ProcessList* this, pid_t pid, bool* preExisting, Process_New constructor) {
Process* proc = (Process*) Hashtable_get(this->processTable, pid);
*preExisting = proc;
if (proc) {