@@ -888,8 +888,8 @@ static void test_regex_2_strings_hwe_dir(const struct hwt_state *hwt)
/* foo:barz matches kv3 and kv2 and kv1 */
pp = mock_path_flags(vnd_foo.value, prd_barz.value, USE_VPD_VND);
TEST_PROP(prio_name(&pp->prio), prio_rdac.value);
- TEST_PROP(pp->uid_attribute, NULL);
assert_int_equal(pp->vpd_vendor_id, VPD_VP_HP3PAR);
+ TEST_PROP(pp->uid_attribute, uid_baz.value);
TEST_PROP(checker_name(&pp->checker), chk_hp.value);
}
@@ -229,7 +229,7 @@ int __wrap_ioctl(int fd, unsigned long request, void *param)
if (hdr->interface_id == 'S' && hdr->cmdp[0] == 0x12
&& (hdr->cmdp[1] & 1) == 1 && hdr->cmdp[2] == HP3PAR_VPD) {
assert_in_range(hdr->dxfer_len,
- sizeof(vpd_data + 3), INT_MAX);
+ sizeof(vpd_data) + 3, INT_MAX);
memset(buf, 0, hdr->dxfer_len);
buf[1] = HP3PAR_VPD;
put_unaligned_be16(sizeof(vpd_data), &buf[2]);