diff options
author | Nathan Scott <nathans@redhat.com> | 2020-08-20 09:35:24 +1000 |
---|---|---|
committer | Nathan Scott <nathans@redhat.com> | 2020-08-20 09:35:33 +1000 |
commit | 500fb283e9b86a6580cedbf834aea9d7dd639a66 (patch) | |
tree | 52c0df7aa5178887f14e48fc40c1dc45a8530dfc /Affinity.c | |
parent | 5228f5d47a10d9194297a31bf4cf7dbbade6c868 (diff) |
Resolve compiler warnings and errors relating to the Arg union
Promote the Arg union to a core data type in Object.c such
that it is visible everywhere (many source files need it),
and correct declarations of several functions that use it.
The Process_sendSignal function is also corrected to have
the expected return type (bool, not void) - an error being
masked by ignoring this not-quite-harmless warning. I've
also added error checking to the kill(2) call here, which
was previously overlooked / missing (?).
Diffstat (limited to 'Affinity.c')
-rw-r--r-- | Affinity.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -1,6 +1,7 @@ /* htop - Affinity.c (C) 2004-2011 Hisham H. Muhammad +(C) 2020 Red Hat, Inc. All Rights Reserved. Released under the GNU GPL, see the COPYING file in the source distribution for its full text. */ @@ -79,7 +80,8 @@ Affinity* Affinity_get(Process* proc, ProcessList* pl) { return affinity; } -bool Affinity_set(Process* proc, Affinity* this) { +bool Affinity_set(Process* proc, Arg arg) { + Affinity *this = arg.v; hwloc_cpuset_t cpuset = hwloc_bitmap_alloc(); for (int i = 0; i < this->used; i++) { hwloc_bitmap_set(cpuset, this->cpus[i]); @@ -103,7 +105,8 @@ Affinity* Affinity_get(Process* proc, ProcessList* pl) { return affinity; } -bool Affinity_set(Process* proc, Affinity* this) { +bool Affinity_set(Process* proc, Arg arg) { + Affinity *this = arg.v; cpu_set_t cpuset; CPU_ZERO(&cpuset); for (int i = 0; i < this->used; i++) { |