commit - 346b301a6191bd87507ba2768ce7a2adae448a06
commit + e19660d59fd85e4dc844d77fee9eb5837f3e3be5
blob - 4d9643e9bac62f141ee3a5b6d40826d1606f463e
blob + 1811956b0c0cb87bb4dba9843ed1241bf2f73502
--- lib/diff3.c
+++ lib/diff3.c
}
kind = *p++;
c = d = number(&p);
- if (*p==',') {
+ if (*p == ',') {
p++;
d = number(&p);
}
}
if (i) {
- (*dd)[i].old.from = (*dd)[i-1].old.to;
- (*dd)[i].new.from = (*dd)[i-1].new.to;
+ (*dd)[i].old.from = (*dd)[i - 1].old.to;
+ (*dd)[i].new.from = (*dd)[i - 1].new.to;
}
if (fclose(d3s->fp[0]) != 0)
* appropriately to make them coincide.
*/
if (d1->new.from < d2->new.from) {
- d2->old.from -= d2->new.from-d1->new.from;
+ d2->old.from -= d2->new.from - d1->new.from;
d2->new.from = d1->new.from;
} else if (d2->new.from < d1->new.from) {
- d1->old.from -= d1->new.from-d2->new.from;
+ d1->old.from -= d1->new.from - d2->new.from;
d1->new.from = d2->new.from;
}
if (d1->new.to > d2->new.to) {
*dpl = 0;
- if (r1->to-r1->from != r2->to-r2->from)
+ if (r1->to - r1->from != r2->to - r2->from)
return NULL;
err = skip(&nskipped, 0, r1->from, NULL, d3s);
if (err)
return err;
nchar = 0;
- for (nline=0; nline < r1->to - r1->from; nline++) {
+ for (nline = 0; nline < r1->to - r1->from; nline++) {
do {
c = getc(d3s->fp[0]);
if (c == EOF)
err = skip(&nskipped, 2, diff->new.from, NULL, d3s);
if (err)
return err;
- d3s->de[*j].new.from = d3s->de[*j - 1].new.to + nskipped;
+ d3s->de[*j].new.from = d3s->de[*j - 1].new.to + nskipped;
err = skip(&nskipped, 2, diff->new.to, NULL, d3s);
- d3s->de[*j].new.to = d3s->de[*j].new.from + nskipped;
+ d3s->de[*j].new.to = d3s->de[*j].new.from + nskipped;
return NULL;
}
== -1)
return got_error_from_errno("fseek");
k = d3s->de[n].new.to - d3s->de[n].new.from;
- for (; k > 0; k-= j) {
+ for (; k > 0; k -= j) {
j = k > BUFSIZ ? BUFSIZ : k;
if (fread(block, 1, j, d3s->fp[2]) != (size_t)j)
return got_ferror(d3s->fp[2], GOT_ERR_IO);