comparison mercurial/cext/revlog.c @ 48767:654baf1faa52

revlog: memset whole record instead of dealing with padding

This is less error-prone.

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

48766:d9a7131648a3

static const long entry_v2_offset_parent_2 = 28;
static const long entry_v2_offset_node_id = 32;
static const long entry_v2_offset_sidedata_offset = 64;
static const long entry_v2_offset_sidedata_comp_len = 72;
static const long entry_v2_offset_all_comp_mode = 76;
static const long entry_v2_offset_padding_start = 77;

static const char comp_mode_inline = 2;
static const char rank_unknown = -1;

static void raise_revlog_error(void)

		self->added_length = new_added_length;
	}
	rev = self->length + self->new_length;
	data = self->added + self->entry_size * self->new_length++;

	if (self->format_version == format_v1) {
		putbe32(offset_flags >> 32, data + entry_v1_offset_high);
		putbe32(offset_flags & 0xffffffffU,
		        data + entry_v1_offset_offset_flags);
		putbe32(comp_len, data + entry_v1_offset_comp_len);

		putbe32(link_rev, data + entry_v1_offset_link_rev);
		putbe32(parent_1, data + entry_v1_offset_parent_1);
		putbe32(parent_2, data + entry_v1_offset_parent_2);
		memcpy(data + entry_v1_offset_node_id, c_node_id,
		       c_node_id_len);
		/* Padding since SHA-1 is only 20 bytes for now */
		memset(data + entry_v1_offset_node_id + c_node_id_len, 0,
		       entry_v1_offset_node_id - c_node_id_len);
	} else if (self->format_version == format_v2) {
		putbe32(offset_flags >> 32, data + entry_v2_offset_high);
		putbe32(offset_flags & 0xffffffffU,
		        data + entry_v2_offset_offset_flags);
		putbe32(comp_len, data + entry_v2_offset_comp_len);

		putbe32(link_rev, data + entry_v2_offset_link_rev);
		putbe32(parent_1, data + entry_v2_offset_parent_1);
		putbe32(parent_2, data + entry_v2_offset_parent_2);
		memcpy(data + entry_v2_offset_node_id, c_node_id,
		       c_node_id_len);
		/* Padding since SHA-1 is only 20 bytes for now */
		memset(data + entry_v2_offset_node_id + c_node_id_len, 0,
		       entry_v2_offset_node_id - c_node_id_len);
		putbe64(sidedata_offset,
		        data + entry_v2_offset_sidedata_offset);
		putbe32(sidedata_comp_len,
		        data + entry_v2_offset_sidedata_comp_len);
		comp_field = data_comp_mode & 3;
		comp_field = comp_field | (sidedata_comp_mode & 3) << 2;
		data[entry_v2_offset_all_comp_mode] = comp_field;
		/* Padding for 96 bytes alignment */
		memset(data + entry_v2_offset_padding_start, 0,
		       self->entry_size - entry_v2_offset_padding_start);
	} else {
		raise_revlog_error();
		return NULL;
	}

48767:654baf1faa52

static const long entry_v2_offset_parent_2 = 28;
static const long entry_v2_offset_node_id = 32;
static const long entry_v2_offset_sidedata_offset = 64;
static const long entry_v2_offset_sidedata_comp_len = 72;
static const long entry_v2_offset_all_comp_mode = 76;
/* next free offset: 77 */

static const char comp_mode_inline = 2;
static const char rank_unknown = -1;

static void raise_revlog_error(void)

		self->added_length = new_added_length;
	}
	rev = self->length + self->new_length;
	data = self->added + self->entry_size * self->new_length++;

	memset(data, 0, self->entry_size);

	if (self->format_version == format_v1) {
		putbe32(offset_flags >> 32, data + entry_v1_offset_high);
		putbe32(offset_flags & 0xffffffffU,
		        data + entry_v1_offset_offset_flags);
		putbe32(comp_len, data + entry_v1_offset_comp_len);

		putbe32(link_rev, data + entry_v1_offset_link_rev);
		putbe32(parent_1, data + entry_v1_offset_parent_1);
		putbe32(parent_2, data + entry_v1_offset_parent_2);
		memcpy(data + entry_v1_offset_node_id, c_node_id,
		       c_node_id_len);
	} else if (self->format_version == format_v2) {
		putbe32(offset_flags >> 32, data + entry_v2_offset_high);
		putbe32(offset_flags & 0xffffffffU,
		        data + entry_v2_offset_offset_flags);
		putbe32(comp_len, data + entry_v2_offset_comp_len);

		putbe32(link_rev, data + entry_v2_offset_link_rev);
		putbe32(parent_1, data + entry_v2_offset_parent_1);
		putbe32(parent_2, data + entry_v2_offset_parent_2);
		memcpy(data + entry_v2_offset_node_id, c_node_id,
		       c_node_id_len);
		putbe64(sidedata_offset,
		        data + entry_v2_offset_sidedata_offset);
		putbe32(sidedata_comp_len,
		        data + entry_v2_offset_sidedata_comp_len);
		comp_field = data_comp_mode & 3;
		comp_field = comp_field | (sidedata_comp_mode & 3) << 2;
		data[entry_v2_offset_all_comp_mode] = comp_field;
	} else {
		raise_revlog_error();
		return NULL;
	}