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

Diff for /src/usr.bin/cvs/diff3.c between version 1.55 and 1.56

version 1.55, 2012/03/04 04:05:15 version 1.56, 2014/12/01 21:58:46
Line 528 
Line 528 
                 do {                  do {
                         bufsize += 1024;                          bufsize += 1024;
                 } while (len + 1 > bufsize);                  } while (len + 1 > bufsize);
                 buf = xrealloc(buf, 1, bufsize);                  buf = xreallocarray(buf, 1, bufsize);
         }          }
         memcpy(buf, cp, len - 1);          memcpy(buf, cp, len - 1);
         buf[len - 1] = '\n';          buf[len - 1] = '\n';
Line 825 
Line 825 
         newsz = szchanges == 0 ? 64 : 2 * szchanges;          newsz = szchanges == 0 ? 64 : 2 * szchanges;
         incr = newsz - szchanges;          incr = newsz - szchanges;
   
         d13 = xrealloc(d13, newsz, sizeof(*d13));          d13 = xreallocarray(d13, newsz, sizeof(*d13));
         memset(d13 + szchanges, 0, incr * sizeof(*d13));          memset(d13 + szchanges, 0, incr * sizeof(*d13));
         d23 = xrealloc(d23, newsz, sizeof(*d23));          d23 = xreallocarray(d23, newsz, sizeof(*d23));
         memset(d23 + szchanges, 0, incr * sizeof(*d23));          memset(d23 + szchanges, 0, incr * sizeof(*d23));
         de = xrealloc(de, newsz, sizeof(*de));          de = xreallocarray(de, newsz, sizeof(*de));
         memset(de + szchanges, 0, incr * sizeof(*de));          memset(de + szchanges, 0, incr * sizeof(*de));
         overlap = xrealloc(overlap, newsz, sizeof(*overlap));          overlap = xreallocarray(overlap, newsz, sizeof(*overlap));
         memset(overlap + szchanges, 0, incr * sizeof(*overlap));          memset(overlap + szchanges, 0, incr * sizeof(*overlap));
         szchanges = newsz;          szchanges = newsz;
 }  }
Legend:
Removed from v.1.55  
changed lines
  Added in v.1.56