[PATCH 14/17] secure32/tests: Use the available ARRAY_SIZE() macro
Michael Stefaniuc <[email protected]> Wed, 30 May 2018 21:15:46 +0200
| Newsgroups | gmane.comp.emulators.wine.patches,gmane.comp.emulators.wine.devel |
|---|---|
| Message-ID | <[email protected]> |
U2lnbmVkLW9mZi1ieTogTWljaGFlbCBTdGVmYW5pdWMgPG1zdGVmYW5pQHdpbmVocS5vcmc+Ci0t LQogZGxscy9zZWN1cjMyL3Rlc3RzL250bG0uYyAgICB8ICA2ICsrKy0tLQogZGxscy9zZWN1cjMy L3Rlc3RzL3NlY3VyMzIuYyB8IDEwICsrKysrLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgOCBpbnNl cnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RsbHMvc2VjdXIzMi90ZXN0 cy9udGxtLmMgYi9kbGxzL3NlY3VyMzIvdGVzdHMvbnRsbS5jCmluZGV4IGI5ZmRmNmYyMzcuLjZi MTI0OWQyMDEgMTAwNjQ0Ci0tLSBhL2RsbHMvc2VjdXIzMi90ZXN0cy9udGxtLmMKKysrIGIvZGxs cy9zZWN1cjMyL3Rlc3RzL250bG0uYwpAQCAtMTE2NSw3ICsxMTY1LDcgQEAgc3RhdGljIHZvaWQg dGVzdFNpZ25TZWFsKHZvaWQpCiAKICAgICB0cmFjZSgiVGVzdGluZyB3aXRoIG1vcmUgdGhhbiBv bmUgYnVmZmVyLlxuIik7CiAKLSAgICBjcnlwdC5jQnVmZmVycyA9IHNpemVvZihjb21wbGV4X2Rh dGEpL3NpemVvZihjb21wbGV4X2RhdGFbMF0pOworICAgIGNyeXB0LmNCdWZmZXJzID0gQVJSQVlf U0laRShjb21wbGV4X2RhdGEpOwogICAgIGNyeXB0LnBCdWZmZXJzID0gY29tcGxleF9kYXRhOwog CiAgICAgY29tcGxleF9kYXRhWzBdLkJ1ZmZlclR5cGUgPSBTRUNCVUZGRVJfREFUQXxTRUNCVUZG RVJfUkVBRE9OTFlfV0lUSF9DSEVDS1NVTTsKQEAgLTE0MzYsNyArMTQzNiw3IEBAIHN0YXRpYyB2 b2lkIHRlc3RfY3JlZF9tdWx0aXBsZV91c2Uodm9pZCkKICAgICAgICAgICAgIGdldFNlY0Vycm9y KHJldCkpOwogCiAgICAgYnVmZmVyX2Rlc2MudWxWZXJzaW9uID0gU0VDQlVGRkVSX1ZFUlNJT047 Ci0gICAgYnVmZmVyX2Rlc2MuY0J1ZmZlcnMgPSBzaXplb2YoYnVmZmVycykvc2l6ZW9mKGJ1ZmZl cnNbMF0pOworICAgIGJ1ZmZlcl9kZXNjLmNCdWZmZXJzID0gQVJSQVlfU0laRShidWZmZXJzKTsK ICAgICBidWZmZXJfZGVzYy5wQnVmZmVycyA9IGJ1ZmZlcnM7CiAKICAgICByZXQgPSBwSW5pdGlh bGl6ZVNlY3VyaXR5Q29udGV4dEEoJmNyZWQsIE5VTEwsIE5VTEwsIElTQ19SRVFfQ09OTkVDVElP TiwKQEAgLTE0ODcsNyArMTQ4Nyw3IEBAIHN0YXRpYyB2b2lkIHRlc3RfbnVsbF9hdXRoX2RhdGEo dm9pZCkKICAgICBidWZmZXJzWzBdLnB2QnVmZmVyID0gSGVhcEFsbG9jKEdldFByb2Nlc3NIZWFw KCksIDAsIGJ1ZmZlcnNbMF0uY2JCdWZmZXIpOwogCiAgICAgYnVmZmVyX2Rlc2MudWxWZXJzaW9u ID0gU0VDQlVGRkVSX1ZFUlNJT047Ci0gICAgYnVmZmVyX2Rlc2MuY0J1ZmZlcnMgPSBzaXplb2Yo YnVmZmVycykvc2l6ZW9mKGJ1ZmZlcnNbMF0pOworICAgIGJ1ZmZlcl9kZXNjLmNCdWZmZXJzID0g QVJSQVlfU0laRShidWZmZXJzKTsKICAgICBidWZmZXJfZGVzYy5wQnVmZmVycyA9IGJ1ZmZlcnM7 CiAKICAgICBzaXplID0gc2l6ZW9mKHVzZXIpOwpkaWZmIC0tZ2l0IGEvZGxscy9zZWN1cjMyL3Rl c3RzL3NlY3VyMzIuYyBiL2RsbHMvc2VjdXIzMi90ZXN0cy9zZWN1cjMyLmMKaW5kZXggNDBjMjcy YWRhMy4uMmQyYzJhNjkyNSAxMDA2NDQKLS0tIGEvZGxscy9zZWN1cjMyL3Rlc3RzL3NlY3VyMzIu YworKysgYi9kbGxzL3NlY3VyMzIvdGVzdHMvc2VjdXIzMi5jCkBAIC02Nyw3ICs2Nyw3IEBAIHN0 YXRpYyB2b2lkIHRlc3RHZXRDb21wdXRlck9iamVjdE5hbWVBKHZvaWQpCiAgICAgQk9PTEVBTiBy YzsKICAgICBVSU5UIGk7CiAKLSAgICBmb3IgKGkgPSAwOyBpIDwgKHNpemVvZihmb3JtYXRzKSAv IHNpemVvZihmb3JtYXRzWzBdKSk7IGkrKykgeworICAgIGZvciAoaSA9IDA7IGkgPCBBUlJBWV9T SVpFKGZvcm1hdHMpOyBpKyspIHsKICAgICAgICAgc2l6ZSA9IDA7CiAgICAgICAgIFNldExhc3RF cnJvcigweGRlYWRiZWVmKTsKICAgICAgICAgcmMgPSBwR2V0Q29tcHV0ZXJPYmplY3ROYW1lQShm b3JtYXRzW2ldLCBOVUxMLCAmc2l6ZSk7CkBAIC0xMTIsNyArMTEyLDcgQEAgc3RhdGljIHZvaWQg dGVzdEdldENvbXB1dGVyT2JqZWN0TmFtZVcodm9pZCkKICAgICBCT09MRUFOIHJjOwogICAgIFVJ TlQgaTsKIAotICAgIGZvciAoaSA9IDA7IGkgPCAoc2l6ZW9mKGZvcm1hdHMpIC8gc2l6ZW9mKGZv cm1hdHNbMF0pKTsgaSsrKSB7CisgICAgZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUoZm9ybWF0 cyk7IGkrKykgewogICAgICAgICBzaXplID0gMDsKICAgICAgICAgU2V0TGFzdEVycm9yKDB4ZGVh ZGJlZWYpOwogICAgICAgICByYyA9IHBHZXRDb21wdXRlck9iamVjdE5hbWVXKGZvcm1hdHNbaV0s IE5VTEwsICZzaXplKTsKQEAgLTEzNCw3ICsxMzQsNyBAQCBzdGF0aWMgdm9pZCB0ZXN0R2V0Q29t cHV0ZXJPYmplY3ROYW1lVyh2b2lkKQogCiAgICAgICAgIGlmIChHZXRMYXN0RXJyb3IoKSAhPSBF UlJPUl9JTlNVRkZJQ0lFTlRfQlVGRkVSKSBjb250aW51ZTsKIAotICAgICAgICBzaXplID0gc2l6 ZW9mKG5hbWVXKS9zaXplb2YobmFtZVdbMF0pOworICAgICAgICBzaXplID0gQVJSQVlfU0laRShu YW1lVyk7CiAgICAgICAgIFNldExhc3RFcnJvcigweGRlYWRiZWVmKTsKICAgICAgICAgcmMgPSBw R2V0Q29tcHV0ZXJPYmplY3ROYW1lVyhmb3JtYXRzW2ldLCBuYW1lVywgJnNpemUpOwogICAgICAg ICBzd2l0Y2ggKGZvcm1hdHNbaV0pCkBAIC0xNTgsNyArMTU4LDcgQEAgc3RhdGljIHZvaWQgdGVz dEdldFVzZXJOYW1lRXhBKHZvaWQpCiAgICAgQk9PTEVBTiByYzsKICAgICBVSU5UIGk7CiAKLSAg ICBmb3IgKGkgPSAwOyBpIDwgKHNpemVvZihmb3JtYXRzKSAvIHNpemVvZihmb3JtYXRzWzBdKSk7 IGkrKykgeworICAgIGZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKGZvcm1hdHMpOyBpKyspIHsK ICAgICAgICAgc2l6ZSA9IHNpemVvZihuYW1lKTsKICAgICAgICAgWmVyb01lbW9yeShuYW1lLCBz aXplb2YobmFtZSkpOwogICAgICAgICByYyA9IHBHZXRVc2VyTmFtZUV4QShmb3JtYXRzW2ldLCBu YW1lLCAmc2l6ZSk7CkBAIC0yMDUsNyArMjA1LDcgQEAgc3RhdGljIHZvaWQgdGVzdEdldFVzZXJO YW1lRXhXKHZvaWQpCiAgICAgQk9PTEVBTiByYzsKICAgICBVSU5UIGk7CiAKLSAgICBmb3IgKGkg PSAwOyBpIDwgKHNpemVvZihmb3JtYXRzKSAvIHNpemVvZihmb3JtYXRzWzBdKSk7IGkrKykgewor ICAgIGZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKGZvcm1hdHMpOyBpKyspIHsKICAgICAgICAg c2l6ZSA9IHNpemVvZihuYW1lVyk7CiAgICAgICAgIFplcm9NZW1vcnkobmFtZVcsIHNpemVvZihu YW1lVykpOwogICAgICAgICByYyA9IHBHZXRVc2VyTmFtZUV4Vyhmb3JtYXRzW2ldLCBuYW1lVywg JnNpemUpOwotLSAKMi4xNC4zCgoKCg==