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

Diff for /src/usr.bin/cvs/update.c between version 1.82 and 1.83

version 1.82, 2007/01/11 02:35:55 version 1.83, 2007/01/11 17:44:18
Line 419 
Line 419 
         char *content;          char *content;
         struct cvs_line *lp;          struct cvs_line *lp;
         struct cvs_lines *lines;          struct cvs_lines *lines;
           size_t len;
   
         cvs_log(LP_TRACE, "update_has_conflict_markers(%s)", cf->file_path);          cvs_log(LP_TRACE, "update_has_conflict_markers(%s)", cf->file_path);
   
Line 430 
Line 431 
                     cf->file_path);                      cf->file_path);
   
         cvs_buf_putc(bp, '\0');          cvs_buf_putc(bp, '\0');
           len = cvs_buf_len(bp);
         content = cvs_buf_release(bp);          content = cvs_buf_release(bp);
         if ((lines = cvs_splitlines(content)) == NULL)          if ((lines = cvs_splitlines(content, len)) == NULL)
                 fatal("update_has_conflict_markers: failed to split lines");                  fatal("update_has_conflict_markers: failed to split lines");
   
         xfree(content);  
   
         conflict = 0;          conflict = 0;
         TAILQ_FOREACH(lp, &(lines->l_lines), l_list) {          TAILQ_FOREACH(lp, &(lines->l_lines), l_list) {
                 if (lp->l_line == NULL)                  if (lp->l_line == NULL)
Line 453 
Line 453 
         }          }
   
         cvs_freelines(lines);          cvs_freelines(lines);
           xfree(content);
         return (conflict);          return (conflict);
 }  }
Legend:
Removed from v.1.82  
changed lines
  Added in v.1.83