Skip to content

Commit c98dc22

Browse files
authored
Update meta files to work on new gcc and perl (#950)
1 parent 70e5f72 commit c98dc22

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

Diff for: meta/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ xml: $(DEPS) Doxyfile $(CONSTHEADERS)
9090
EXTRA = acronyms.txt aspell.en.pws *.pm *.cap
9191

9292
saimetadatatest.c saimetadata.c saimetadata.h: xml $(XMLDEPS) parse.pl $(CONSTHEADERS) $(EXTRA)
93-
perl parse.pl
93+
perl -I. parse.pl
9494

9595
HEADERS = saimetadata.h $(CONSTHEADERS)
9696

Diff for: meta/saisanitycheck.c

+2
Original file line numberDiff line numberDiff line change
@@ -852,6 +852,8 @@ void check_attr_default_required(
852852
break;
853853
}
854854

855+
META_MD_ASSERT_FAIL(md, "default value on chardata const");
856+
855857
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_OBJECT_LIST:
856858
case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_OBJECT_LIST:
857859
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT8_LIST:

Diff for: meta/saiserializetest.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -757,14 +757,14 @@ void test_deserialize_ip_prefix()
757757
uint16_t ip6[] = { 0x1111, 0x2222, 0x3303, 0x4444, 0x5555, 0x6666, 0xaaaa, 0xbbbb };
758758
uint16_t mask[16];
759759

760-
memset(mask, 0xff, 16);
760+
memset(mask, 0xff, sizeof(mask));
761761
res = sai_deserialize_ip_prefix("1111:2222:333:4444:5555:6666:aaaa:bbbb/128", &prefix);
762762
ASSERT_TRUE(prefix.addr_family == SAI_IP_ADDR_FAMILY_IPV6, "expected true");
763763
ASSERT_TRUE(memcmp(prefix.addr.ip6, ip6, 16) == 0, "expected true");
764764
ASSERT_TRUE(memcmp(prefix.mask.ip6, mask, 16) == 0, "expected true");
765765
ASSERT_TRUE(res == (int)strlen("1111:2222:333:4444:5555:6666:aaaa:bbbb/128"), "expected true: %d", res);
766766

767-
memset(mask, 0, 16);
767+
memset(mask, 0, sizeof(mask));
768768
memset(mask, 0xff, 8);
769769
((uint8_t*)mask)[8] = 0x80;
770770

@@ -777,7 +777,7 @@ void test_deserialize_ip_prefix()
777777
ASSERT_TRUE(memcmp(prefix.addr.ip6, ip6a, 16) == 0, "expected true");
778778
ASSERT_TRUE(memcmp(prefix.mask.ip6, mask, 16) == 0, "expected true");
779779

780-
memset(mask, 0, 16);
780+
memset(mask, 0, sizeof(mask));
781781
res = sai_deserialize_ip_prefix("1::ff/0", &prefix);
782782
ASSERT_TRUE(prefix.addr_family == SAI_IP_ADDR_FAMILY_IPV6, "expected true");
783783
ASSERT_TRUE(res == (int)strlen("1::ff/0"), "expected true");
@@ -787,7 +787,7 @@ void test_deserialize_ip_prefix()
787787

788788
uint16_t ip6b[] = { 0, 0, 0, 0, 0, 0, 0, 0x100 };
789789

790-
memset(mask, 0xff, 16);
790+
memset(mask, 0xff, sizeof(mask));
791791
res = sai_deserialize_ip_prefix("::1/128", &prefix);
792792
ASSERT_TRUE(prefix.addr_family == SAI_IP_ADDR_FAMILY_IPV6, "expected true");
793793
ASSERT_TRUE(res == (int)strlen("::1/128"), "expected true");

Diff for: meta/test.pm

+1-1
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ sub CreateApiNameTest
248248
}
249249

250250
WriteTest " {";
251-
WriteTest " sai_${api}_api_t ${api}_api;";
251+
WriteTest " sai_${api}_api_t ${api}_api = { 0 };";
252252

253253
if (defined $main::NON_OBJECT_ID_STRUCTS{$ot})
254254
{

0 commit comments

Comments
 (0)