[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.9 and 1.10

version 1.9, 2005/12/20 18:17:01 version 1.10, 2005/12/24 04:10:51
Line 187 
Line 187 
         if ((b3 = rcs_getrev(rf, rev2)) == NULL)          if ((b3 = rcs_getrev(rf, rev2)) == NULL)
                 goto out;                  goto out;
   
         if ((d1 = cvs_buf_alloc((size_t)128, BUF_AUTOEXT)) == NULL)          d1 = cvs_buf_alloc((size_t)128, BUF_AUTOEXT);
                 goto out;          d2 = cvs_buf_alloc((size_t)128, BUF_AUTOEXT);
           diffb = cvs_buf_alloc((size_t)128, BUF_AUTOEXT);
         if ((d2 = cvs_buf_alloc((size_t)128, BUF_AUTOEXT)) == NULL)  
                 goto out;  
   
         if ((diffb = cvs_buf_alloc((size_t)128, BUF_AUTOEXT)) == NULL)  
                 goto out;  
   
         strlcpy(path1, "/tmp/diff1.XXXXXXXXXX", sizeof(path1));          strlcpy(path1, "/tmp/diff1.XXXXXXXXXX", sizeof(path1));
         cvs_buf_write_stmp(b1, path1, 0600);          cvs_buf_write_stmp(b1, path1, 0600);

Legend:
Removed from v.1.9  
changed lines
  Added in v.1.10