Changeset 144

Show
Ignore:
Timestamp:
07/12/06 07:41:24 (2 years ago)
Author:
jtv
Message:

Fix for spaces in /proc/meminfo entry names

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/memory.c

    r143 r144  
    116116  char fact[20]; 
    117117  const int x = sscanf(localbuf, 
    118       "%s %lld %19s", 
     118      "%[^:]: %lld %19s", 
    119119      result->entry, 
    120120      &result->value, 
    …… 
    213213  { 
    214214  case 'B': 
    215     if (strcmp(inf->entry, "Buffers:")==0)         st->Buffers = inf->value; 
     215    if (strcmp(inf->entry, "Buffers")==0)         st->Buffers = inf->value; 
    216216    break; 
    217217  case 'C': 
    218     if (strcmp(inf->entry, "Cached:")==0)          st->Cached = inf->value; 
     218    if (strcmp(inf->entry, "Cached")==0)          st->Cached = inf->value; 
    219219    break; 
    220220  case 'D': 
    221     if (strcmp(inf->entry, "Dirty:")==0)           st->Dirty = inf->value; 
     221    if (strcmp(inf->entry, "Dirty")==0)           st->Dirty = inf->value; 
    222222    break; 
    223223  case 'M': 
    224224    if (strncmp(inf->entry,"Mem",3) == 0) 
    225225    { 
    226       if (strcmp(inf->entry+3, "Total:")==0)       st->MemTotal = inf->value; 
    227       else if (strcmp(inf->entry+3, "Free:")==0)   st->MemFree = inf->value; 
     226      if (strcmp(inf->entry+3, "Total")==0)       st->MemTotal = inf->value; 
     227      else if (strcmp(inf->entry+3, "Free")==0)   st->MemFree = inf->value; 
    228228    } 
    229229    break; 
    …… 
    231231    if (strncmp(inf->entry,"Swap",4) == 0) 
    232232    { 
    233       if (strcmp(inf->entry+4, "Total:")==0)       st->SwapTotal = inf->value; 
    234       else if (strcmp(inf->entry+4, "Free:")==0)   st->SwapFree = inf->value; 
    235       else if (strcmp(inf->entry+4, "Cached:")==0) st->SwapCached = inf->value; 
     233      if (strcmp(inf->entry+4, "Total")==0)       st->SwapTotal = inf->value; 
     234      else if (strcmp(inf->entry+4, "Free")==0)   st->SwapFree = inf->value; 
     235      else if (strcmp(inf->entry+4, "Cached")==0) st->SwapCached = inf->value; 
    236236    } 
    237237    break; 
    238238  case 'W': 
    239     if (strcmp(inf->entry,"Writeback:")==0)        st->Writeback = inf->value; 
     239    if (strcmp(inf->entry,"Writeback")==0)        st->Writeback = inf->value; 
    240240    break; 
    241241  }