[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.42 and 1.43

version 1.42, 2008/02/27 22:34:04 version 1.43, 2008/02/28 20:35:27
Line 303 
Line 303 
         increase();          increase();
   
         /* fds[0] and fds[1] are closed in readin() */          /* fds[0] and fds[1] are closed in readin() */
         cvs_printf("calling readin with fds[0] (%s)\n", argv[0]);  
         m = readin(fds[0], &d13);          m = readin(fds[0], &d13);
         cvs_printf("calling readin with fds[1] (%s)\n", argv[1]);  
         n = readin(fds[1], &d23);          n = readin(fds[1], &d23);
   
         for (i = 0; i <= 2; i++) {          for (i = 0; i <= 2; i++) {
                 cvs_printf("opening fds[%d] (%s)\n", i + 2, argv[i + 2]);  
                 if ((fp[i] = fdopen(fds[i + 2], "r")) == NULL) {                  if ((fp[i] = fdopen(fds[i + 2], "r")) == NULL) {
                         cvs_log(LP_ERR, "%s", argv[i + 2]);                          cvs_log(LP_ERR, "%s", argv[i + 2]);
                         return (-1);                          return (-1);
Legend:
Removed from v.1.42  
changed lines
  Added in v.1.43