version 1.18, 2007/01/11 18:13:33 |
version 1.19, 2007/02/22 08:30:45 |
|
|
|
|
if (oflag) { |
if (oflag) { |
i = snprintf(f1mark, sizeof(f1mark), "<<<<<<< %s", fmark); |
i = snprintf(f1mark, sizeof(f1mark), "<<<<<<< %s", fmark); |
if (i < 0 || i >= sizeof(f1mark)) |
if (i < 0 || i >= (int)sizeof(f1mark)) |
errx(1, "diff3_internal: string truncated"); |
errx(1, "diff3_internal: string truncated"); |
|
|
i = snprintf(f3mark, sizeof(f3mark), ">>>>>>> %s", rmark); |
i = snprintf(f3mark, sizeof(f3mark), ">>>>>>> %s", rmark); |
if (i < 0 || i >= sizeof(f3mark)) |
if (i < 0 || i >= (int)sizeof(f3mark)) |
errx(1, "diff3_internal: string truncated"); |
errx(1, "diff3_internal: string truncated"); |
} |
} |
|
|