Browse Source

xdiff: minor changes to match libxdiff-0.21

This reformats the change 621c53cc08
introduced to match what upstream author implemented in libxdiff-0.21
without changing any logic (hopefully ;-).  This is to help keep
us in sync with the upstream.

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 19 years ago
parent
commit
d281786fcd
  1. 11
      xdiff/xutils.c
  2. 1
      xdiff/xutils.h

11
xdiff/xutils.c

@ -44,21 +44,18 @@ long xdl_bogosqrt(long n) {


int xdl_emit_diffrec(char const *rec, long size, char const *pre, long psize, int xdl_emit_diffrec(char const *rec, long size, char const *pre, long psize,
xdemitcb_t *ecb) { xdemitcb_t *ecb) {
int i = 2;
mmbuffer_t mb[3]; mmbuffer_t mb[3];
int i;


mb[0].ptr = (char *) pre; mb[0].ptr = (char *) pre;
mb[0].size = psize; mb[0].size = psize;
mb[1].ptr = (char *) rec; mb[1].ptr = (char *) rec;
mb[1].size = size; mb[1].size = size;
i = 2; if (size > 0 && rec[size - 1] != '\n') {

mb[2].ptr = (char *) "\n\\ No newline at end of file\n";
if (!size || rec[size-1] != '\n') {
mb[2].ptr = "\n\\ No newline at end of file\n";
mb[2].size = strlen(mb[2].ptr); mb[2].size = strlen(mb[2].ptr);
i = 3; i++;
} }

if (ecb->outf(ecb->priv, mb, i) < 0) { if (ecb->outf(ecb->priv, mb, i) < 0) {


return -1; return -1;

1
xdiff/xutils.h

@ -24,6 +24,7 @@
#define XUTILS_H #define XUTILS_H





long xdl_bogosqrt(long n); long xdl_bogosqrt(long n);
int xdl_emit_diffrec(char const *rec, long size, char const *pre, long psize, int xdl_emit_diffrec(char const *rec, long size, char const *pre, long psize,
xdemitcb_t *ecb); xdemitcb_t *ecb);

Loading…
Cancel
Save