mercurial-scm/hg: comparison mercurial/bdiff.c

equal deleted inserted replaced

-:666832b9e154
+:4ce1fc91e30a
 #include "compat.h"
 #include "util.h"
 #include "bitmanipulation.h"
-struct line {
+struct bdiff_line {
 	int hash, n, e;
 	ssize_t len;
 	const char *l;
 };
 struct pos {
 	int pos, len;
 };
-struct hunk;
+struct bdiff_hunk;
-struct hunk {
+struct bdiff_hunk {
 	int a1, a2, b1, b2;
-	struct hunk *next;
+	struct bdiff_hunk *next;
 };
-static int splitlines(const char *a, ssize_t len, struct line **lr)
+static int bdiff_splitlines(const char *a, ssize_t len, struct bdiff_line **lr)
 {
 	unsigned hash;
 	int i;
 	const char *p, *b = a;
 	const char * const plast = a + len - 1;
-	struct line *l;
+	struct bdiff_line *l;
 	/* count the lines */
 	i = 1; /* extra line for sentinel */
 	for (p = a; p < a + len; p++)
 		if (*p == '\n' || p == plast)
 			i++;
-	*lr = l = (struct line *)malloc(sizeof(struct line) * i);
+	*lr = l = (struct bdiff_line *)malloc(sizeof(struct bdiff_line) * i);
 	if (!l)
 		return -1;
 	/* build the line array and calculate hashes */
 	hash = 0;
 	l->len = 0;
 	l->l = a + len;
 	return i - 1;
 }
-static inline int cmp(struct line *a, struct line *b)
+static inline int cmp(struct bdiff_line *a, struct bdiff_line *b)
 {
 	return a->hash != b->hash || a->len != b->len || memcmp(a->l, b->l, a->len);
 }
-static int equatelines(struct line *a, int an, struct line *b, int bn)
+static int equatelines(struct bdiff_line *a, int an, struct bdiff_line *b,
+	int bn)
 {
 	int i, j, buckets = 1, t, scale;
 	struct pos *h = NULL;
 	/* build a hash table of the next highest power of 2 */
 	/* discard hash tables */
 	free(h);
 	return 1;
 }
-static int longest_match(struct line *a, struct line *b, struct pos *pos,
+static int longest_match(struct bdiff_line *a, struct bdiff_line *b,
+			struct pos *pos,
 			 int a1, int a2, int b1, int b2, int *omi, int *omj)
 {
 	int mi = a1, mj = b1, mk = 0, i, j, k, half;
 	/* window our search on large regions to better bound
 	*omj = mj;
 	return mk;
 }
-static struct hunk *recurse(struct line *a, struct line *b, struct pos *pos,
+static struct bdiff_hunk *recurse(struct bdiff_line *a, struct bdiff_line *b,
-			    int a1, int a2, int b1, int b2, struct hunk *l)
+				struct pos *pos,
+			    int a1, int a2, int b1, int b2, struct bdiff_hunk *l)
 {
 	int i, j, k;
 	while (1) {
 		/* find the longest match in this chunk */
 		/* and recurse on the remaining chunks on either side */
 		l = recurse(a, b, pos, a1, i, b1, j, l);
 		if (!l)
 			return NULL;
-		l->next = (struct hunk *)malloc(sizeof(struct hunk));
+		l->next = (struct bdiff_hunk *)malloc(sizeof(struct bdiff_hunk));
 		if (!l->next)
 			return NULL;
 		l = l->next;
 		l->a1 = i;
 		a1 = i + k;
 		b1 = j + k;
 	}
 }
-static int diff(struct line *a, int an, struct line *b, int bn,
+static int bdiff_diff(struct bdiff_line *a, int an, struct bdiff_line *b,
-		 struct hunk *base)
+		int bn, struct bdiff_hunk *base)
 {
-	struct hunk *curr;
+	struct bdiff_hunk *curr;
 	struct pos *pos;
 	int t, count = 0;
 	/* allocate and fill arrays */
 	t = equatelines(a, an, b, bn);
 		curr = recurse(a, b, pos, 0, an, 0, bn, base);
 		if (!curr)
 			return -1;
 		/* sentinel end hunk */
-		curr->next = (struct hunk *)malloc(sizeof(struct hunk));
+		curr->next = (struct bdiff_hunk *)malloc(sizeof(struct bdiff_hunk));
 		if (!curr->next)
 			return -1;
 		curr = curr->next;
 		curr->a1 = curr->a2 = an;
 		curr->b1 = curr->b2 = bn;
 	free(pos);
 	/* normalize the hunk list, try to push each hunk towards the end */
 	for (curr = base->next; curr; curr = curr->next) {
-		struct hunk *next = curr->next;
+		struct bdiff_hunk *next = curr->next;
 		if (!next)
 			break;
 		if (curr->a2 == next->a1 || curr->b2 == next->b1)
 	for (curr = base->next; curr; curr = curr->next)
 		count++;
 	return count;
 }
-static void freehunks(struct hunk *l)
+static void bdiff_freehunks(struct bdiff_hunk *l)
 {
-	struct hunk *n;
+	struct bdiff_hunk *n;
 	for (; l; l = n) {
 		n = l->next;
 		free(l);
 	}
 }
 static PyObject *blocks(PyObject *self, PyObject *args)
 {
 	PyObject *sa, *sb, *rl = NULL, *m;
-	struct line *a, *b;
+	struct bdiff_line *a, *b;
-	struct hunk l, *h;
+	struct bdiff_hunk l, *h;
 	int an, bn, count, pos = 0;
 	l.next = NULL;
 	if (!PyArg_ParseTuple(args, "SS:bdiff", &sa, &sb))
 		return NULL;
-	an = splitlines(PyBytes_AsString(sa), PyBytes_Size(sa), &a);
+	an = bdiff_splitlines(PyBytes_AsString(sa), PyBytes_Size(sa), &a);
-	bn = splitlines(PyBytes_AsString(sb), PyBytes_Size(sb), &b);
+	bn = bdiff_splitlines(PyBytes_AsString(sb), PyBytes_Size(sb), &b);
 	if (!a || !b)
 		goto nomem;
-	count = diff(a, an, b, bn, &l);
+	count = bdiff_diff(a, an, b, bn, &l);
 	if (count < 0)
 		goto nomem;
 	rl = PyList_New(count);
 	if (!rl)
 	}
 nomem:
 	free(a);
 	free(b);
-	freehunks(l.next);
+	bdiff_freehunks(l.next);
 	return rl ? rl : PyErr_NoMemory();
 }
 static PyObject *bdiff(PyObject *self, PyObject *args)
 {
 	char *sa, *sb, *rb;
 	PyObject *result = NULL;
-	struct line *al, *bl;
+	struct bdiff_line *al, *bl;
-	struct hunk l, *h;
+	struct bdiff_hunk l, *h;
 	int an, bn, count;
 	Py_ssize_t len = 0, la, lb;
 	PyThreadState *_save;
 	l.next = NULL;
 		PyErr_SetString(PyExc_ValueError, "bdiff inputs too large");
 		return NULL;
 	}
 	_save = PyEval_SaveThread();
-	an = splitlines(sa, la, &al);
+	an = bdiff_splitlines(sa, la, &al);
-	bn = splitlines(sb, lb, &bl);
+	bn = bdiff_splitlines(sb, lb, &bl);
 	if (!al || !bl)
 		goto nomem;
-	count = diff(al, an, bl, bn, &l);
+	count = bdiff_diff(al, an, bl, bn, &l);
 	if (count < 0)
 		goto nomem;
 	/* calculate length of output */
 	la = lb = 0;
 nomem:
 	if (_save)
 		PyEval_RestoreThread(_save);
 	free(al);
 	free(bl);
-	freehunks(l.next);
+	bdiff_freehunks(l.next);
 	return result ? result : PyErr_NoMemory();
 }
 /*
 * If allws != 0, remove all whitespace (' ', \t and \r). Otherwise,

changeset 29540	4ce1fc91e30a
parent 29539	666832b9e154
child 29541	9631ff5ebbeb