[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.10 and 1.11

version 1.10, 2005/12/24 04:10:51 version 1.11, 2005/12/30 17:51:01
Line 71 
Line 71 
 #endif /* not lint */  #endif /* not lint */
   
 #ifndef lint  #ifndef lint
 static const char rcsid[] = "$OpenBSD$";  static const char rcsid[] =
       "$OpenBSD$";
 #endif /* not lint */  #endif /* not lint */
   
 #include <sys/queue.h>  #include <sys/queue.h>
Line 247 
Line 248 
                 goto out;                  goto out;
   
         if (diff3_conflicts != 0) {          if (diff3_conflicts != 0) {
                 cvs_printf("%d conflict%s found during merge, please correct.\n",                  cvs_printf("%d conflict%s found during merge, "
                     diff3_conflicts, (diff3_conflicts > 1) ? "s" : "");                      "please correct.\n", diff3_conflicts,
                       (diff3_conflicts > 1) ? "s" : "");
         }          }
   
         xfree(data);          xfree(data);
Line 760 
Line 762 
                 (void)fseek(fp[2], (long)de[n].new.from, 0);                  (void)fseek(fp[2], (long)de[n].new.from, 0);
                 for (k = de[n].new.to-de[n].new.from; k > 0; k-= j) {                  for (k = de[n].new.to-de[n].new.from; k > 0; k-= j) {
                         j = k > BUFSIZ ? BUFSIZ : k;                          j = k > BUFSIZ ? BUFSIZ : k;
                         if (fread(block, (size_t)1, (size_t)j, fp[2]) != (size_t)j)                          if (fread(block, (size_t)1, (size_t)j,
                               fp[2]) != (size_t)j)
                                 return (-1);                                  return (-1);
                         block[j] = '\0';                          block[j] = '\0';
                         diff_output("%s", block);                          diff_output("%s", block);
Legend:
Removed from v.1.10  
changed lines
  Added in v.1.11