comparison mercurial/cext/revlog.c @ 38915:fff675dfb80b

index: pass only nodetree to nt_new()

The function now only depends on the nodetree, not the index.

Differential Revision: https://phab.mercurial-scm.org/D4111

38914:f28e64bbdd29

	}
	/* multiple matches against an ambiguous prefix */
	return -4;
}

static int nt_new(indexObject *self)
{
	nodetree *nt = self->nt;
	if (nt->length == nt->capacity) {
		if (nt->capacity >= INT_MAX / (sizeof(nodetreenode) * 2)) {
			PyErr_SetString(PyExc_MemoryError,
					"overflow in nt_new");
			return -1;
		}
		nt->capacity *= 2;
		nt->nodes = realloc(nt->nodes,
				    nt->capacity * sizeof(nodetreenode));
		if (nt->nodes == NULL) {
			PyErr_SetString(PyExc_MemoryError, "out of memory");
			return -1;
		}
		memset(&nt->nodes[nt->length], 0,
		       sizeof(nodetreenode) * (nt->capacity - nt->length));
	}
	return nt->length++;
}

static int nt_insert(indexObject *self, const char *node, int rev)
{
	int level = 0;

				return -1;
			if (!memcmp(oldnode, node, 20)) {
				n->children[k] = -rev - 2;
				return 0;
			}
			noff = nt_new(self);
			if (noff == -1)
				return -1;
			/* self->nt->nodes may have been changed by realloc */
			self->nt->nodes[off].children[k] = noff;
			off = noff;

38915:fff675dfb80b

	}
	/* multiple matches against an ambiguous prefix */
	return -4;
}

static int nt_new(nodetree *self)
{
	if (self->length == self->capacity) {
		if (self->capacity >= INT_MAX / (sizeof(nodetreenode) * 2)) {
			PyErr_SetString(PyExc_MemoryError,
					"overflow in nt_new");
			return -1;
		}
		self->capacity *= 2;
		self->nodes = realloc(self->nodes,
		                      self->capacity * sizeof(nodetreenode));
		if (self->nodes == NULL) {
			PyErr_SetString(PyExc_MemoryError, "out of memory");
			return -1;
		}
		memset(&self->nodes[self->length], 0,
		       sizeof(nodetreenode) * (self->capacity - self->length));
	}
	return self->length++;
}

static int nt_insert(indexObject *self, const char *node, int rev)
{
	int level = 0;

				return -1;
			if (!memcmp(oldnode, node, 20)) {
				n->children[k] = -rev - 2;
				return 0;
			}
			noff = nt_new(self->nt);
			if (noff == -1)
				return -1;
			/* self->nt->nodes may have been changed by realloc */
			self->nt->nodes[off].children[k] = noff;
			off = noff;