<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9199">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tests: xua_test: Fix array len computation<br><br>As warned by gcc 8.1.0:<br>In file included from libosmo-sccp/include/osmocom/sigtran/osmo_ss7.h:7,<br> from libosmo-sccp/include/../src/xua_internal.h:3,<br> from libosmo-sccp/tests/xua/xua_test.c:21:<br>/include/osmocom/core/utils.h:13:34: error: division ‘sizeof (const uint8_t (*)[12] {aka const unsigned char (*)[12]}) / sizeof (const uint8_t[12] {aka const unsigned char[12]})’ does not compute the number of array elements [-Werror=sizeof-pointer-div]<br> #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))<br> ^<br>libosmo-sccp/tests/xua/xua_test.c:371:45: note: in expansion of macro ‘ARRAY_SIZE’<br> #define PARTARR(x, data) { .tag = x, .len = ARRAY_SIZE(data), .dat = (uint8_t *) data }<br><br>Change-Id: Iad5703d68fee26fc83958741512820d2539e604e<br>---<br>M tests/xua/xua_test.c<br>1 file changed, 10 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/xua/xua_test.c b/tests/xua/xua_test.c</span><br><span>index 61f21d9..37ba645 100644</span><br><span>--- a/tests/xua/xua_test.c</span><br><span>+++ b/tests/xua/xua_test.c</span><br><span>@@ -387,8 +387,8 @@</span><br><span> .hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT),</span><br><span> .parts = {</span><br><span> PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class0),</span><br><span style="color: hsl(0, 100%, 40%);">- PARTARR(SUA_IEI_DEST_ADDR, &sua_addr_ssn_bssmap),</span><br><span style="color: hsl(0, 100%, 40%);">- PARTARR(SUA_IEI_SRC_ADDR, &sua_addr_ssn_bssmap),</span><br><span style="color: hsl(120, 100%, 40%);">+ PARTARR(SUA_IEI_DEST_ADDR, sua_addr_ssn_bssmap),</span><br><span style="color: hsl(120, 100%, 40%);">+ PARTARR(SUA_IEI_SRC_ADDR, sua_addr_ssn_bssmap),</span><br><span> },</span><br><span> },</span><br><span> }, {</span><br><span>@@ -398,8 +398,8 @@</span><br><span> .hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT),</span><br><span> .parts = {</span><br><span> PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class0),</span><br><span style="color: hsl(0, 100%, 40%);">- PARTARR(SUA_IEI_DEST_ADDR, &sua_addr_ssn_bssmap_pc1),</span><br><span style="color: hsl(0, 100%, 40%);">- PARTARR(SUA_IEI_SRC_ADDR, &sua_addr_ssn_bssmap_pc92),</span><br><span style="color: hsl(120, 100%, 40%);">+ PARTARR(SUA_IEI_DEST_ADDR, sua_addr_ssn_bssmap_pc1),</span><br><span style="color: hsl(120, 100%, 40%);">+ PARTARR(SUA_IEI_SRC_ADDR, sua_addr_ssn_bssmap_pc92),</span><br><span> },</span><br><span> },</span><br><span> }, {</span><br><span>@@ -409,8 +409,8 @@</span><br><span> .hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT),</span><br><span> .parts = {</span><br><span> PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class0),</span><br><span style="color: hsl(0, 100%, 40%);">- PARTARR(SUA_IEI_DEST_ADDR, &sua_addr_ssn_bssmap_pc1),</span><br><span style="color: hsl(0, 100%, 40%);">- PARTARR(SUA_IEI_SRC_ADDR, &sua_addr_ssn_bssmap_pc92),</span><br><span style="color: hsl(120, 100%, 40%);">+ PARTARR(SUA_IEI_DEST_ADDR, sua_addr_ssn_bssmap_pc1),</span><br><span style="color: hsl(120, 100%, 40%);">+ PARTARR(SUA_IEI_SRC_ADDR, sua_addr_ssn_bssmap_pc92),</span><br><span> },</span><br><span> },</span><br><span> }, {</span><br><span>@@ -420,8 +420,8 @@</span><br><span> .hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT),</span><br><span> .parts = {</span><br><span> PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class0),</span><br><span style="color: hsl(0, 100%, 40%);">- PARTARR(SUA_IEI_DEST_ADDR, &sua_addr_ssn_bssmap),</span><br><span style="color: hsl(0, 100%, 40%);">- PARTARR(SUA_IEI_SRC_ADDR, &sua_addr_ssn_bssmap),</span><br><span style="color: hsl(120, 100%, 40%);">+ PARTARR(SUA_IEI_DEST_ADDR, sua_addr_ssn_bssmap),</span><br><span style="color: hsl(120, 100%, 40%);">+ PARTARR(SUA_IEI_SRC_ADDR, sua_addr_ssn_bssmap),</span><br><span> },</span><br><span> },</span><br><span> }, {</span><br><span>@@ -432,7 +432,7 @@</span><br><span> .parts = {</span><br><span> PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class2),</span><br><span> PARTU32(SUA_IEI_SRC_REF, &sua_loc_ref_bsc),</span><br><span style="color: hsl(0, 100%, 40%);">- PARTARR(SUA_IEI_DEST_ADDR, &sua_addr_ssn_bssmap),</span><br><span style="color: hsl(120, 100%, 40%);">+ PARTARR(SUA_IEI_DEST_ADDR, sua_addr_ssn_bssmap),</span><br><span> },</span><br><span> },</span><br><span> }, {</span><br><span>@@ -443,7 +443,7 @@</span><br><span> .parts = {</span><br><span> PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class2),</span><br><span> PARTU32(SUA_IEI_SRC_REF, &sua_loc_ref_msc),</span><br><span style="color: hsl(0, 100%, 40%);">- PARTARR(SUA_IEI_DEST_ADDR, &sua_addr_ssn_bssmap),</span><br><span style="color: hsl(120, 100%, 40%);">+ PARTARR(SUA_IEI_DEST_ADDR, sua_addr_ssn_bssmap),</span><br><span> },</span><br><span> },</span><br><span> }, {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9199">change 9199</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/9199"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Iad5703d68fee26fc83958741512820d2539e604e </div>
<div style="display:none"> Gerrit-Change-Number: 9199 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Assignee: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>