[PATCH 06/17] userenv/tests: Use the available ARRAY_SIZE() macro
Michael Stefaniuc <[email protected]> Wed, 30 May 2018 21:15:38 +0200
| Newsgroups | gmane.comp.emulators.wine.patches,gmane.comp.emulators.wine.devel |
|---|---|
| Message-ID | <[email protected]> |
U2lnbmVkLW9mZi1ieTogTWljaGFlbCBTdGVmYW5pdWMgPG1zdGVmYW5pQHdpbmVocS5vcmc+Ci0t LQogZGxscy91c2VyZW52L3Rlc3RzL3VzZXJlbnYuYyB8IDggKysrKy0tLS0KIDEgZmlsZSBjaGFu Z2VkLCA0IGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZGxscy91 c2VyZW52L3Rlc3RzL3VzZXJlbnYuYyBiL2RsbHMvdXNlcmVudi90ZXN0cy91c2VyZW52LmMKaW5k ZXggNTY0N2NmMzQwYi4uNzliNGQ1OWE2MSAxMDA2NDQKLS0tIGEvZGxscy91c2VyZW52L3Rlc3Rz L3VzZXJlbnYuYworKysgYi9kbGxzL3VzZXJlbnYvdGVzdHMvdXNlcmVudi5jCkBAIC0xNTgsNyAr MTU4LDcgQEAgc3RhdGljIHZvaWQgdGVzdF9jcmVhdGVfZW52KHZvaWQpCiAgICAgfQogCiAgICAg LyogVGVzdCBmb3IgY29tbW9uIGVudmlyb25tZW50IHZhcmlhYmxlcyAoTlQ0IGFuZCBoaWdoZXIp ICovCi0gICAgZm9yIChpID0gMDsgaSA8IHNpemVvZihjb21tb25fdmFycykvc2l6ZW9mKGNvbW1v bl92YXJzWzBdKTsgaSsrKQorICAgIGZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKGNvbW1vbl92 YXJzKTsgaSsrKQogICAgIHsKICAgICAgICAgZm9yIChqID0gMDsgaiA8IDQ7IGorKykKICAgICAg ICAgewpAQCAtMTc1LDcgKzE3NSw3IEBAIHN0YXRpYyB2b2lkIHRlc3RfY3JlYXRlX2Vudih2b2lk KQogICAgIH0KICAgICBlbHNlCiAgICAgewotICAgICAgICBmb3IgKGkgPSAwOyBpIDwgc2l6ZW9m KGNvbW1vbl9wb3N0X250NF92YXJzKS9zaXplb2YoY29tbW9uX3Bvc3RfbnQ0X3ZhcnNbMF0pOyBp KyspCisgICAgICAgIGZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKGNvbW1vbl9wb3N0X250NF92 YXJzKTsgaSsrKQogICAgICAgICB7CiAgICAgICAgICAgICBmb3IgKGogPSAwOyBqIDwgNDsgaisr KQogICAgICAgICAgICAgewpAQCAtMTkwLDcgKzE5MCw3IEBAIHN0YXRpYyB2b2lkIHRlc3RfY3Jl YXRlX2Vudih2b2lkKQogICAgICAgICBwSXNXb3c2NFByb2Nlc3MoR2V0Q3VycmVudFByb2Nlc3Mo KSwgJmlzX3dvdzY0KTsKICAgICBpZiAoc2l6ZW9mKHZvaWQqKT09OCB8fCBpc193b3c2NCkKICAg ICB7Ci0gICAgICAgIGZvciAoaSA9IDA7IGkgPCBzaXplb2YoY29tbW9uX3dpbjY0X3ZhcnMpL3Np emVvZihjb21tb25fd2luNjRfdmFyc1swXSk7IGkrKykKKyAgICAgICAgZm9yIChpID0gMDsgaSA8 IEFSUkFZX1NJWkUoY29tbW9uX3dpbjY0X3ZhcnMpOyBpKyspCiAgICAgICAgIHsKICAgICAgICAg ICAgIGZvciAoaj0wOyBqPDQ7IGorKykKICAgICAgICAgICAgIHsKQEAgLTIxNSw3ICsyMTUsNyBA QCBzdGF0aWMgdm9pZCB0ZXN0X2NyZWF0ZV9lbnYodm9pZCkKICAgICBleHBlY3QoVFJVRSwgcik7 CiAgICAgaWYgKHIpIEhlYXBGcmVlKEdldFByb2Nlc3NIZWFwKCksIDAsIHN0KTsKIAotICAgIGZv ciAoaSA9IDA7IGkgPCBzaXplb2YoZW52KSAvIHNpemVvZihlbnZbMF0pOyBpKyspCisgICAgZm9y IChpID0gMDsgaSA8IEFSUkFZX1NJWkUoZW52KTsgaSsrKQogICAgIHsKICAgICAgICAgciA9IERl c3Ryb3lFbnZpcm9ubWVudEJsb2NrKGVudltpXSk7CiAgICAgICAgIGV4cGVjdChUUlVFLCByKTsK LS0gCjIuMTQuMwoKCgo=