![[BACK]](/icons/back.gif){kind=icon}
Return to diff3prog.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / diff3|
Return to diff3prog.c CVS log | Up to [local] / src / usr.bin / diff3 |
| version 1.2, 2003/07/14 17:43:52 | version 1.3, 2003/10/24 20:32:06 | ||
|---|---|---|---|
|
|
||
| int j, n; | int j, n; | ||
| for (n = 0; cline[i] < from - 1; n += j) { | for (n = 0; cline[i] < from - 1; n += j) { | ||
| if ((j = getline(fp[i])) == NULL) | if ((j = getline(fp[i])) == 0) | ||
| trouble(); | trouble(); | ||
| if (pr != NULL) | if (pr != NULL) | ||
| printf("%s%s", pr, line); | printf("%s%s", pr, line); |