← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff-delta.c

  • Committer: Vincent Ladeuil
  • Date: 2011-10-06 07:43:13 UTC
  • mfrom: (6015.33.8 2.4)
  • mto: This revision was merged to the branch mainline in revision 6192.
  • Revision ID: v.ladeuil+lp@free.fr-20111006074313-w3f2t8lgzy04pjjb
Merge 2.4 into trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff-delta.c
720
720
 
721
721
    max_num_entries = (src->size - 1)  / RABIN_WINDOW;
722
722
 
 
723
    if (!max_num_entries) {
 
724
        *fresh = old_index;
 
725
        return DELTA_OK;
 
726
    }
 
727
 
723
728
    /* allocate an array to hold whatever entries we find */
724
729
    entries = malloc(sizeof(*entry) * max_num_entries);
725
730
    if (!entries) /* malloc failure */