[PATCH 07/17] ucrtbase/tests: Use the available ARRAY_SIZE() macro
Michael Stefaniuc <[email protected]> Wed, 30 May 2018 21:15:39 +0200
| Newsgroups | gmane.comp.emulators.wine.patches,gmane.comp.emulators.wine.devel |
|---|---|
| Message-ID | <[email protected]> |
U2lnbmVkLW9mZi1ieTogTWljaGFlbCBTdGVmYW5pdWMgPG1zdGVmYW5pQHdpbmVocS5vcmc+Ci0t LQogZGxscy91Y3J0YmFzZS90ZXN0cy9taXNjLmMgICB8ICA2ICsrKy0tLQogZGxscy91Y3J0YmFz ZS90ZXN0cy9wcmludGYuYyB8IDE4ICsrKysrKysrKy0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2Vk LCAxMiBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kbGxzL3Vj cnRiYXNlL3Rlc3RzL21pc2MuYyBiL2RsbHMvdWNydGJhc2UvdGVzdHMvbWlzYy5jCmluZGV4IDJi YjIyMWI4NGUuLjE4ODM4YTNkNzcgMTAwNjQ0Ci0tLSBhL2RsbHMvdWNydGJhc2UvdGVzdHMvbWlz Yy5jCisrKyBiL2RsbHMvdWNydGJhc2UvdGVzdHMvbWlzYy5jCkBAIC03MDMsNyArNzAzLDcgQEAg c3RhdGljIHZvaWQgdGVzdF9tYXRoX2Vycm9ycyh2b2lkKQogICAgIC8qIG5lY2Vzc2FyeSBzbyB0 aGF0IGV4cCgxZTEwMCk9PUlORklOSVRZIG9uIGdsaWJjLCB3ZSBjYW4gcmVtb3ZlIHRoaXMgaWYg d2UgY2hhbmdlIG91ciBpbXBsZW1lbnRhdGlvbiAqLwogICAgIHBfZmVzZXRyb3VuZChGRV9UT05F QVJFU1QpOwogCi0gICAgZm9yKGkgPSAwOyBpIDwgc2l6ZW9mKHRlc3RzZCkvc2l6ZW9mKHRlc3Rz ZFswXSk7IGkrKykgeworICAgIGZvcihpID0gMDsgaSA8IEFSUkFZX1NJWkUodGVzdHNkKTsgaSsr KSB7CiAgICAgICAgIHBfZnVuY2QgPSAodm9pZCopR2V0UHJvY0FkZHJlc3MobW9kdWxlLCB0ZXN0 c2RbaV0uZnVuYyk7CiAgICAgICAgICpwX2Vycm5vKCkgPSAtMTsKICAgICAgICAgZXhjZXB0aW9u LnR5cGUgPSAtMTsKQEAgLTcxNyw3ICs3MTcsNyBAQCBzdGF0aWMgdm9pZCB0ZXN0X21hdGhfZXJy b3JzKHZvaWQpCiAgICAgICAgICAgICIlcyglZikgZ290IGV4Y2VwdGlvbiBhcmcxICVmXG4iLCB0 ZXN0c2RbaV0uZnVuYywgdGVzdHNkW2ldLngsIGV4Y2VwdGlvbi5hcmcxKTsKICAgICB9CiAKLSAg ICBmb3IoaSA9IDA7IGkgPCBzaXplb2YodGVzdHMyZCkvc2l6ZW9mKHRlc3RzMmRbMF0pOyBpKysp IHsKKyAgICBmb3IoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKHRlc3RzMmQpOyBpKyspIHsKICAgICAg ICAgcF9mdW5jMmQgPSAodm9pZCopR2V0UHJvY0FkZHJlc3MobW9kdWxlLCB0ZXN0czJkW2ldLmZ1 bmMpOwogICAgICAgICAqcF9lcnJubygpID0gLTE7CiAgICAgICAgIGV4Y2VwdGlvbi50eXBlID0g LTE7CkBAIC03MzMsNyArNzMzLDcgQEAgc3RhdGljIHZvaWQgdGVzdF9tYXRoX2Vycm9ycyh2b2lk KQogICAgICAgICAgICAiJXMoJWYsICVmKSBnb3QgZXhjZXB0aW9uIGFyZzIgJWZcbiIsIHRlc3Rz MmRbaV0uZnVuYywgdGVzdHMyZFtpXS5hLCB0ZXN0czJkW2ldLmIsIGV4Y2VwdGlvbi5hcmcyKTsK ICAgICB9CiAKLSAgICBmb3IoaSA9IDA7IGkgPCBzaXplb2YodGVzdHNkbCkvc2l6ZW9mKHRlc3Rz ZGxbMF0pOyBpKyspIHsKKyAgICBmb3IoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKHRlc3RzZGwpOyBp KyspIHsKICAgICAgICAgcF9mdW5jZGwgPSAodm9pZCopR2V0UHJvY0FkZHJlc3MobW9kdWxlLCB0 ZXN0c2RsW2ldLmZ1bmMpOwogICAgICAgICAqcF9lcnJubygpID0gLTE7CiAgICAgICAgIGV4Y2Vw dGlvbi50eXBlID0gLTE7CmRpZmYgLS1naXQgYS9kbGxzL3VjcnRiYXNlL3Rlc3RzL3ByaW50Zi5j IGIvZGxscy91Y3J0YmFzZS90ZXN0cy9wcmludGYuYwppbmRleCAwZTM4MDAzNzFmLi40MWJiNmEz MzVlIDEwMDY0NAotLS0gYS9kbGxzL3VjcnRiYXNlL3Rlc3RzL3ByaW50Zi5jCisrKyBiL2RsbHMv dWNydGJhc2UvdGVzdHMvcHJpbnRmLmMKQEAgLTE3MSw3ICsxNzEsNyBAQCBzdGF0aWMgdm9pZCB0 ZXN0X3NucHJpbnRmICh2b2lkKQogICAgIHVuc2lnbmVkIGludCBpOwogCiAgICAgLyogTGVnYWN5 IF9zbnByaW50ZiBzdHlsZSB0ZXJtaW5hdGlvbiAqLwotICAgIGZvciAoaSA9IDA7IGkgPCBzaXpl b2YgdGVzdHMgLyBzaXplb2YgdGVzdHNbMF07IGkrKykgeworICAgIGZvciAoaSA9IDA7IGkgPCBB UlJBWV9TSVpFKHRlc3RzKTsgaSsrKSB7CiAgICAgICAgIGNvbnN0IGNoYXIgKmZtdCAgPSB0ZXN0 c1tpXTsKICAgICAgICAgY29uc3QgaW50IGV4cGVjdCA9IHN0cmxlbihmbXQpID4gYnVmc2l6ID8g LTEgOiBzdHJsZW4oZm10KTsKICAgICAgICAgY29uc3QgaW50IG4gICAgICA9IHZzcHJpbnRmX3dy YXBwZXIgKFVDUlRCQVNFX1BSSU5URl9MRUdBQ1lfVlNQUklOVEZfTlVMTF9URVJNSU5BVElPTiwg YnVmZmVyLCBidWZzaXosIGZtdCk7CkBAIC0xODQsNyArMTg0LDcgQEAgc3RhdGljIHZvaWQgdGVz dF9zbnByaW50ZiAodm9pZCkKICAgICB9CiAKICAgICAvKiBDOTkgc25wcmludGYgc3R5bGUgdGVy bWluYXRpb24gKi8KLSAgICBmb3IgKGkgPSAwOyBpIDwgc2l6ZW9mIHRlc3RzIC8gc2l6ZW9mIHRl c3RzWzBdOyBpKyspIHsKKyAgICBmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0laRSh0ZXN0cyk7IGkr KykgewogICAgICAgICBjb25zdCBjaGFyICpmbXQgID0gdGVzdHNbaV07CiAgICAgICAgIGNvbnN0 IGludCBleHBlY3QgPSBzdHJsZW4oZm10KTsKICAgICAgICAgY29uc3QgaW50IG4gICAgICA9IHZz cHJpbnRmX3dyYXBwZXIgKFVDUlRCQVNFX1BSSU5URl9TVEFOREFSRF9TTlBSSU5URl9CRUhBVklP VVIsIGJ1ZmZlciwgYnVmc2l6LCBmbXQpOwpAQCAtMTk5LDcgKzE5OSw3IEBAIHN0YXRpYyB2b2lk IHRlc3Rfc25wcmludGYgKHZvaWQpCiAgICAgfQogCiAgICAgLyogc3dwcmludGYgc3R5bGUgdGVy bWluYXRpb24gKi8KLSAgICBmb3IgKGkgPSAwOyBpIDwgc2l6ZW9mIHRlc3RzIC8gc2l6ZW9mIHRl c3RzWzBdOyBpKyspIHsKKyAgICBmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0laRSh0ZXN0cyk7IGkr KykgewogICAgICAgICBjb25zdCBjaGFyICpmbXQgID0gdGVzdHNbaV07CiAgICAgICAgIGNvbnN0 IGludCBleHBlY3QgPSBzdHJsZW4oZm10KSA+PSBidWZzaXogPyAtMiA6IHN0cmxlbihmbXQpOwog ICAgICAgICBjb25zdCBpbnQgbiAgICAgID0gdnNwcmludGZfd3JhcHBlciAoMCwgYnVmZmVyLCBi dWZzaXosIGZtdCk7CkBAIC0yNDIsMTEgKzI0MiwxMSBAQCBzdGF0aWMgdm9pZCB0ZXN0X3N3cHJp bnRmICh2b2lkKQogCiAgICAgd2NoYXJfdCBidWZmZXJbOF07CiAgICAgY2hhciBuYXJyb3dbOF0s IG5hcnJvd19mbXRbMTZdOwotICAgIGNvbnN0IGludCBidWZzaXogPSBzaXplb2YgYnVmZmVyIC8g c2l6ZW9mIGJ1ZmZlclswXTsKKyAgICBjb25zdCBpbnQgYnVmc2l6ID0gQVJSQVlfU0laRShidWZm ZXIpOwogICAgIHVuc2lnbmVkIGludCBpOwogCiAgICAgLyogTGVnYWN5IF9zbnByaW50ZiBzdHls ZSB0ZXJtaW5hdGlvbiAqLwotICAgIGZvciAoaSA9IDA7IGkgPCBzaXplb2YgdGVzdHMgLyBzaXpl b2YgdGVzdHNbMF07IGkrKykgeworICAgIGZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKHRlc3Rz KTsgaSsrKSB7CiAgICAgICAgIGNvbnN0IHdjaGFyX3QgKmZtdCA9IHRlc3RzW2ldOwogICAgICAg ICBjb25zdCBpbnQgZXhwZWN0ICAgPSB3Y3NsZW4oZm10KSA+IGJ1ZnNpeiA/IC0xIDogd2NzbGVu KGZtdCk7CiAgICAgICAgIGNvbnN0IGludCBuICAgICAgICA9IHZzd3ByaW50Zl93cmFwcGVyIChV Q1JUQkFTRV9QUklOVEZfTEVHQUNZX1ZTUFJJTlRGX05VTExfVEVSTUlOQVRJT04sIGJ1ZmZlciwg YnVmc2l6LCBmbXQpOwpAQCAtMjYxLDcgKzI2MSw3IEBAIHN0YXRpYyB2b2lkIHRlc3Rfc3dwcmlu dGYgKHZvaWQpCiAgICAgfQogCiAgICAgLyogQzk5IHNucHJpbnRmIHN0eWxlIHRlcm1pbmF0aW9u ICovCi0gICAgZm9yIChpID0gMDsgaSA8IHNpemVvZiB0ZXN0cyAvIHNpemVvZiB0ZXN0c1swXTsg aSsrKSB7CisgICAgZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUodGVzdHMpOyBpKyspIHsKICAg ICAgICAgY29uc3Qgd2NoYXJfdCAqZm10ID0gdGVzdHNbaV07CiAgICAgICAgIGNvbnN0IGludCBl eHBlY3QgICA9IHdjc2xlbihmbXQpOwogICAgICAgICBjb25zdCBpbnQgbiAgICAgICAgPSB2c3dw cmludGZfd3JhcHBlciAoVUNSVEJBU0VfUFJJTlRGX1NUQU5EQVJEX1NOUFJJTlRGX0JFSEFWSU9V UiwgYnVmZmVyLCBidWZzaXosIGZtdCk7CkBAIC0yNzgsNyArMjc4LDcgQEAgc3RhdGljIHZvaWQg dGVzdF9zd3ByaW50ZiAodm9pZCkKICAgICB9CiAKICAgICAvKiBzd3ByaW50ZiBzdHlsZSB0ZXJt aW5hdGlvbiAqLwotICAgIGZvciAoaSA9IDA7IGkgPCBzaXplb2YgdGVzdHMgLyBzaXplb2YgdGVz dHNbMF07IGkrKykgeworICAgIGZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKHRlc3RzKTsgaSsr KSB7CiAgICAgICAgIGNvbnN0IHdjaGFyX3QgKmZtdCA9IHRlc3RzW2ldOwogICAgICAgICBjb25z dCBpbnQgZXhwZWN0ICAgPSB3Y3NsZW4oZm10KSA+PSBidWZzaXogPyAtMiA6IHdjc2xlbihmbXQp OwogICAgICAgICBjb25zdCBpbnQgbiAgICAgICAgPSB2c3dwcmludGZfd3JhcHBlciAoMCwgYnVm ZmVyLCBidWZzaXosIGZtdCk7CkBAIC00MTEsMTIgKzQxMSwxMiBAQCBzdGF0aWMgdm9pZCB0ZXN0 X2Z3cHJpbnRmKHZvaWQpCiAgICAgcF9mY2xvc2UoZnApOwogCiAgICAgZnAgPSBwX2ZvcGVuKGZp bGVfbmFtZSwgInJiIik7Ci0gICAgcF9mZ2V0d3MoYnVmdywgc2l6ZW9mKGJ1ZncpL3NpemVvZihi dWZ3WzBdKSwgZnApOworICAgIHBfZmdldHdzKGJ1ZncsIEFSUkFZX1NJWkUoYnVmdyksIGZwKTsK ICAgICByZXQgPSBwX2Z0ZWxsKGZwKTsKICAgICBvayhyZXQgPT0gMjQsICJmdGVsbCByZXR1cm5l ZCAlZFxuIiwgcmV0KTsKICAgICBvayghd2NzY21wKGJ1ZncsIHNpbXBsZSksICJidWYgPSAlc1xu Iiwgd2luZV9kYmdzdHJfdyhidWZ3KSk7CiAKLSAgICBwX2ZnZXR3cyhidWZ3LCBzaXplb2YoYnVm dykvc2l6ZW9mKGJ1ZndbMF0pLCBmcCk7CisgICAgcF9mZ2V0d3MoYnVmdywgQVJSQVlfU0laRShi dWZ3KSwgZnApOwogICAgIHJldCA9IHBfZnRlbGwoZnApOwogICAgIG9rKHJldCA9PSA1MiwgInJl dCA9ICVkXG4iLCByZXQpOwogICAgIG9rKCFtZW1jbXAoYnVmdywgY29udCwgMjgpLCAiYnVmID0g JXNcbiIsIHdpbmVfZGJnc3RyX3coYnVmdykpOwotLSAKMi4xNC4zCgoKCg==