libprocps-ng: readproc.c: some type conversion help

Return if unable to open /proc

A patch from Debian.

Backported-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Craig Small 2009-11-24 11:00:41 +11:00 committed by Craig Small
parent 0c82b0ceda
commit 16329a7c3c

View File

@ -218,7 +218,7 @@ ENTER(0x220);
// examine a field name (hash and compare) // examine a field name (hash and compare)
base: base:
if(unlikely(!*S)) break; if(unlikely(!*S)) break;
entry = table[63 & (asso[S[3]] + asso[S[2]] + asso[S[0]])]; entry = table[63 & (asso[(int)S[3]] + asso[(int)S[2]] + asso[(int)S[0]])];
colon = strchr(S, ':'); colon = strchr(S, ':');
if(unlikely(!colon)) break; if(unlikely(!colon)) break;
if(unlikely(colon[1]!='\t')) break; if(unlikely(colon[1]!='\t')) break;
@ -1239,6 +1239,8 @@ proc_t** readproctab(int flags, ...) {
else else
PT = openproc(flags); PT = openproc(flags);
va_end(ap); va_end(ap);
if (!PT)
return 0;
do { /* read table: */ do { /* read table: */
tab = xrealloc(tab, (n+1)*sizeof(proc_t*));/* realloc as we go, using */ tab = xrealloc(tab, (n+1)*sizeof(proc_t*));/* realloc as we go, using */
tab[n] = readproc_direct(PT, NULL); /* final null to terminate */ tab[n] = readproc_direct(PT, NULL); /* final null to terminate */