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

Diff for /src/usr.bin/diff3/diff3prog.c between version 1.13 and 1.14

version 1.13, 2013/11/15 22:20:04 version 1.14, 2014/12/01 06:36:32
Line 573 
Line 573 
         newsz = szchanges == 0 ? 64 : 2 * szchanges;          newsz = szchanges == 0 ? 64 : 2 * szchanges;
         incr = newsz - szchanges;          incr = newsz - szchanges;
   
         p = realloc(d13, newsz * sizeof(struct diff));          p = reallocarray(d13, newsz, sizeof(struct diff));
         if (p == NULL)          if (p == NULL)
                 err(1, NULL);                  err(1, NULL);
         memset(p + szchanges, 0, incr * sizeof(struct diff));          memset(p + szchanges, 0, incr * sizeof(struct diff));
         d13 = p;          d13 = p;
         p = realloc(d23, newsz * sizeof(struct diff));          p = reallocarray(d23, newsz, sizeof(struct diff));
         if (p == NULL)          if (p == NULL)
                 err(1, NULL);                  err(1, NULL);
         memset(p + szchanges, 0, incr * sizeof(struct diff));          memset(p + szchanges, 0, incr * sizeof(struct diff));
         d23 = p;          d23 = p;
         p = realloc(de, newsz * sizeof(struct diff));          p = reallocarray(de, newsz, sizeof(struct diff));
         if (p == NULL)          if (p == NULL)
                 err(1, NULL);                  err(1, NULL);
         memset(p + szchanges, 0, incr * sizeof(struct diff));          memset(p + szchanges, 0, incr * sizeof(struct diff));
         de = p;          de = p;
         q = realloc(overlap, newsz * sizeof(char));          q = reallocarray(overlap, newsz, sizeof(char));
         if (q == NULL)          if (q == NULL)
                 err(1, NULL);                  err(1, NULL);
         memset(q + szchanges, 0, incr * sizeof(char));          memset(q + szchanges, 0, incr * sizeof(char));

Legend:
Removed from v.1.13  
changed lines
  Added in v.1.14