[BACK]Return to machine.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / top

Diff for /src/usr.bin/top/machine.c between version 1.61 and 1.62

version 1.61, 2007/05/29 00:56:56 version 1.62, 2007/07/27 13:57:50
Line 162 
Line 162 
         mib[1] = HW_NCPU;          mib[1] = HW_NCPU;
         if (sysctl(mib, 2, &ncpu, &size, NULL, 0) == -1)          if (sysctl(mib, 2, &ncpu, &size, NULL, 0) == -1)
                 return (-1);                  return (-1);
         cpu_states = malloc(ncpu * CPUSTATES * sizeof(int64_t));          cpu_states = calloc(ncpu, CPUSTATES * sizeof(int64_t));
         if (cpu_states == NULL)          if (cpu_states == NULL)
                 err(1, NULL);                  err(1, NULL);
         cp_time = malloc(ncpu * sizeof(int64_t *));          cp_time = calloc(ncpu, sizeof(int64_t *));
         cp_old  = malloc(ncpu * sizeof(int64_t *));          cp_old  = calloc(ncpu, sizeof(int64_t *));
         cp_diff = malloc(ncpu * sizeof(int64_t *));          cp_diff = calloc(ncpu, sizeof(int64_t *));
         if (cp_time == NULL || cp_old == NULL || cp_diff == NULL)          if (cp_time == NULL || cp_old == NULL || cp_diff == NULL)
                 err(1, NULL);                  err(1, NULL);
         for (cpu = 0; cpu < ncpu; cpu++) {          for (cpu = 0; cpu < ncpu; cpu++) {
Line 709 
Line 709 
         if (nswap == 0)          if (nswap == 0)
                 return 0;                  return 0;
   
         swdev = malloc(nswap * sizeof(*swdev));          swdev = calloc(nswap, sizeof(*swdev));
         if (swdev == NULL)          if (swdev == NULL)
                 return 0;                  return 0;
   

Legend:
Removed from v.1.61  
changed lines
  Added in v.1.62