Thu Mar 8 20:50:47 2012 UTC ()
fix format string


(christos)
diff -r1.2 -r1.3 src/external/gpl2/xcvs/dist/diff/diff3.c

cvs diff -r1.2 -r1.3 src/external/gpl2/xcvs/dist/diff/diff3.c (expand / switch to unified diff)

--- src/external/gpl2/xcvs/dist/diff/diff3.c 2012/01/06 15:16:02 1.2
+++ src/external/gpl2/xcvs/dist/diff/diff3.c 2012/03/08 20:50:46 1.3
@@ -1493,27 +1493,27 @@ output_diff3 (diff, mapping, rev_mapping @@ -1493,27 +1493,27 @@ output_diff3 (diff, mapping, rev_mapping
1493 break; 1493 break;
1494 default: 1494 default:
1495 printf_output ("%d,%dc\n", lowt, hight); 1495 printf_output ("%d,%dc\n", lowt, hight);
1496 break; 1496 break;
1497 } 1497 }
1498 1498
1499 if (i == dontprint) continue; 1499 if (i == dontprint) continue;
1500 1500
1501 if (lowt <= hight) 1501 if (lowt <= hight)
1502 { 1502 {
1503 line = 0; 1503 line = 0;
1504 do 1504 do
1505 { 1505 {
1506 printf_output (line_prefix); 1506 printf_output ("%s", line_prefix);
1507 cp = D_RELNUM (ptr, realfile, line); 1507 cp = D_RELNUM (ptr, realfile, line);
1508 length = D_RELLEN (ptr, realfile, line); 1508 length = D_RELLEN (ptr, realfile, line);
1509 write_output (cp, length); 1509 write_output (cp, length);
1510 } 1510 }
1511 while (++line < hight - lowt + 1); 1511 while (++line < hight - lowt + 1);
1512 if (cp[length - 1] != '\n') 1512 if (cp[length - 1] != '\n')
1513 printf_output ("\n\\ No newline at end of file\n"); 1513 printf_output ("\n\\ No newline at end of file\n");
1514 } 1514 }
1515 } 1515 }
1516 } 1516 }
1517} 1517}
1518 1518
1519 1519