mirror of https://github.com/xzeldon/htop.git
Merge pull request #486 from mmcco/null-check
Remove needless allocation error conditions
This commit is contained in:
commit
2ea4bee66d
|
@ -280,11 +280,9 @@ char* Platform_getProcessEnv(pid_t pid) {
|
|||
|
||||
size_t size = endp - p;
|
||||
env = xMalloc(size+2);
|
||||
if (env) {
|
||||
memcpy(env, p, size);
|
||||
env[size] = 0;
|
||||
env[size+1] = 0;
|
||||
}
|
||||
memcpy(env, p, size);
|
||||
env[size] = 0;
|
||||
env[size+1] = 0;
|
||||
}
|
||||
}
|
||||
free(buf);
|
||||
|
|
|
@ -265,9 +265,6 @@ void Platform_setSwapValues(Meter* this) {
|
|||
}
|
||||
|
||||
swdev = xCalloc(nswap, sizeof(*swdev));
|
||||
if (swdev == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
rnswap = swapctl(SWAP_STATS, swdev, nswap);
|
||||
if (rnswap == -1) {
|
||||
|
|
Loading…
Reference in New Issue