[PATCH 15/17] scrrun/tests: Use the available ARRAY_SIZE() macro
Michael Stefaniuc <[email protected]> Wed, 30 May 2018 21:15:47 +0200
| Newsgroups | gmane.comp.emulators.wine.patches,gmane.comp.emulators.wine.devel |
|---|---|
| Message-ID | <[email protected]> |
U2lnbmVkLW9mZi1ieTogTWljaGFlbCBTdGVmYW5pdWMgPG1zdGVmYW5pQHdpbmVocS5vcmc+Ci0t LQogZGxscy9zY3JydW4vdGVzdHMvZGljdGlvbmFyeS5jIHwgIDYgKysrLS0tCiBkbGxzL3NjcnJ1 bi90ZXN0cy9maWxlc3lzdGVtLmMgfCAyNCArKysrKysrKysrKystLS0tLS0tLS0tLS0KIDIgZmls ZXMgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgMTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZGxscy9zY3JydW4vdGVzdHMvZGljdGlvbmFyeS5jIGIvZGxscy9zY3JydW4vdGVzdHMvZGlj dGlvbmFyeS5jCmluZGV4IDY1OGRkNjYwODYuLmNkYTI4OGIxYmIgMTAwNjQ0Ci0tLSBhL2RsbHMv c2NycnVuL3Rlc3RzL2RpY3Rpb25hcnkuYworKysgYi9kbGxzL3NjcnJ1bi90ZXN0cy9kaWN0aW9u YXJ5LmMKQEAgLTM2OCw3ICszNjgsNyBAQCBzdGF0aWMgdm9pZCB0ZXN0X2hhc2hfdmFsdWUodm9p ZCkKICAgICBvayhWX1ZUKCZoYXNoKSA9PSBWVF9JNCwgImdvdCAlZFxuIiwgVl9WVCgmaGFzaCkp OwogICAgIG9rKFZfSTQoJmhhc2gpID09IDAsICJnb3QgJWRcbiIsIFZfSTQoJmhhc2gpKTsKIAot ICAgIGZvciAoaSA9IDA7IGkgPCBzaXplb2Yoc3RyX2hhc2hfdGVzdHMpL3NpemVvZihzdHJfaGFz aF90ZXN0c1swXSk7IGkrKykgeworICAgIGZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKHN0cl9o YXNoX3Rlc3RzKTsgaSsrKSB7CiAgICAgICAgIGV4cGVjdGVkID0gZ2V0X3N0cl9oYXNoKHN0cl9o YXNoX3Rlc3RzW2ldLCBCaW5hcnlDb21wYXJlKTsKIAogICAgICAgICBociA9IElEaWN0aW9uYXJ5 X3B1dF9Db21wYXJlTW9kZShkaWN0LCBCaW5hcnlDb21wYXJlKTsKQEAgLTQ2MSw3ICs0NjEsNyBA QCBzdGF0aWMgdm9pZCB0ZXN0X2hhc2hfdmFsdWUodm9pZCkKICAgICBvayhWX1ZUKCZoYXNoKSA9 PSBWVF9JNCwgImdvdCAlZFxuIiwgVl9WVCgmaGFzaCkpOwogICAgIG9rKFZfSTQoJmhhc2gpID09 IH4wdSwgImdvdCBoYXNoIDB4JTA4eFxuIiwgVl9JNCgmaGFzaCkpOwogCi0gICAgZm9yIChpID0g MDsgaSA8IHNpemVvZihpbnRfaGFzaF90ZXN0cykvc2l6ZW9mKGludF9oYXNoX3Rlc3RzWzBdKTsg aSsrKSB7CisgICAgZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUoaW50X2hhc2hfdGVzdHMpOyBp KyspIHsKICAgICAgICAgU0hPUlQgaTI7CiAgICAgICAgIEJZVEUgdWkxOwogICAgICAgICBMT05H IGk0OwpAQCAtNTk3LDcgKzU5Nyw3IEBAIHN0YXRpYyB2b2lkIHRlc3RfaGFzaF92YWx1ZSh2b2lk KQogICAgIG9rKFZfVlQoJmhhc2gpID09IFZUX0k0LCAiZ290ICVkXG4iLCBWX1ZUKCZoYXNoKSk7 CiAgICAgb2soVl9JNCgmaGFzaCkgPT0gMCwgImdvdCBoYXNoIDB4JTA4eFxuIiwgVl9JNCgmaGFz aCkpOwogCi0gICAgZm9yIChpID0gMDsgaSA8IHNpemVvZihmbG9hdF9oYXNoX3Rlc3RzKS9zaXpl b2YoZmxvYXRfaGFzaF90ZXN0c1swXSk7IGkrKykgeworICAgIGZvciAoaSA9IDA7IGkgPCBBUlJB WV9TSVpFKGZsb2F0X2hhc2hfdGVzdHMpOyBpKyspIHsKICAgICAgICAgZG91YmxlIGRibDsKICAg ICAgICAgRkxPQVQgZmx0OwogICAgICAgICBEQVRFIGRhdGU7CmRpZmYgLS1naXQgYS9kbGxzL3Nj cnJ1bi90ZXN0cy9maWxlc3lzdGVtLmMgYi9kbGxzL3NjcnJ1bi90ZXN0cy9maWxlc3lzdGVtLmMK aW5kZXggZDBjNDQ4YzA4NS4uMjllZTczZjI0MyAxMDA2NDQKLS0tIGEvZGxscy9zY3JydW4vdGVz dHMvZmlsZXN5c3RlbS5jCisrKyBiL2RsbHMvc2NycnVuL3Rlc3RzL2ZpbGVzeXN0ZW0uYwpAQCAt Mzc1LDcgKzM3NSw3IEBAIHN0YXRpYyB2b2lkIHRlc3RfR2V0RmlsZVZlcnNpb24odm9pZCkKICAg ICBCU1RSIHBhdGgsIHZlcnNpb247CiAgICAgSFJFU1VMVCBocjsKIAotICAgIEdldFN5c3RlbURp cmVjdG9yeVcocGF0aFcsIHNpemVvZihwYXRoVykvc2l6ZW9mKFdDSEFSKSk7CisgICAgR2V0U3lz dGVtRGlyZWN0b3J5VyhwYXRoVywgQVJSQVlfU0laRShwYXRoVykpOwogCiAgICAgbHN0cmNweVco ZmlsZW5hbWVXLCBwYXRoVyk7CiAgICAgbHN0cmNhdFcoZmlsZW5hbWVXLCBrMzJXKTsKQEAgLTQz OCw3ICs0MzgsNyBAQCBzdGF0aWMgdm9pZCB0ZXN0X0dldFBhcmVudEZvbGRlck5hbWUodm9pZCkK ICAgICBociA9IElGaWxlU3lzdGVtM19HZXRQYXJlbnRGb2xkZXJOYW1lKGZzMywgTlVMTCwgTlVM TCk7CiAgICAgb2soaHIgPT0gRV9QT0lOVEVSLCAiR2V0UGFyZW50Rm9sZGVyTmFtZSByZXR1cm5l ZCAleCwgZXhwZWN0ZWQgRV9QT0lOVEVSXG4iLCBocik7CiAKLSAgICBmb3IoaT0wOyBpPHNpemVv Zih0ZXN0cykvc2l6ZW9mKHRlc3RzWzBdKTsgaSsrKSB7CisgICAgZm9yKGk9MDsgaSA8IEFSUkFZ X1NJWkUodGVzdHMpOyBpKyspIHsKICAgICAgICAgcmVzdWx0ID0gKEJTVFIpMHhkZWFkYmVlZjsK ICAgICAgICAgcGF0aCA9IHRlc3RzW2ldLnBhdGggPyBTeXNBbGxvY1N0cmluZyh0ZXN0c1tpXS5w YXRoKSA6IE5VTEw7CiAgICAgICAgIGhyID0gSUZpbGVTeXN0ZW0zX0dldFBhcmVudEZvbGRlck5h bWUoZnMzLCBwYXRoLCAmcmVzdWx0KTsKQEAgLTQ4MSw3ICs0ODEsNyBAQCBzdGF0aWMgdm9pZCB0 ZXN0X0dldEZpbGVOYW1lKHZvaWQpCiAgICAgaHIgPSBJRmlsZVN5c3RlbTNfR2V0RmlsZU5hbWUo ZnMzLCBOVUxMLCBOVUxMKTsKICAgICBvayhociA9PSBFX1BPSU5URVIsICJHZXRGaWxlTmFtZSBy ZXR1cm5lZCAleCwgZXhwZWN0ZWQgRV9QT0lOVEVSXG4iLCBocik7CiAKLSAgICBmb3IoaT0wOyBp PHNpemVvZih0ZXN0cykvc2l6ZW9mKHRlc3RzWzBdKTsgaSsrKSB7CisgICAgZm9yKGk9MDsgaSA8 IEFSUkFZX1NJWkUodGVzdHMpOyBpKyspIHsKICAgICAgICAgcmVzdWx0ID0gKEJTVFIpMHhkZWFk YmVlZjsKICAgICAgICAgcGF0aCA9IHRlc3RzW2ldLnBhdGggPyBTeXNBbGxvY1N0cmluZyh0ZXN0 c1tpXS5wYXRoKSA6IE5VTEw7CiAgICAgICAgIGhyID0gSUZpbGVTeXN0ZW0zX0dldEZpbGVOYW1l KGZzMywgcGF0aCwgJnJlc3VsdCk7CkBAIC01MjcsNyArNTI3LDcgQEAgc3RhdGljIHZvaWQgdGVz dF9HZXRCYXNlTmFtZSh2b2lkKQogICAgIGhyID0gSUZpbGVTeXN0ZW0zX0dldEJhc2VOYW1lKGZz MywgTlVMTCwgTlVMTCk7CiAgICAgb2soaHIgPT0gRV9QT0lOVEVSLCAiR2V0QmFzZU5hbWUgcmV0 dXJuZWQgJXgsIGV4cGVjdGVkIEVfUE9JTlRFUlxuIiwgaHIpOwogCi0gICAgZm9yKGk9MDsgaTxz aXplb2YodGVzdHMpL3NpemVvZih0ZXN0c1swXSk7IGkrKykgeworICAgIGZvcihpPTA7IGkgPCBB UlJBWV9TSVpFKHRlc3RzKTsgaSsrKSB7CiAgICAgICAgIHJlc3VsdCA9IChCU1RSKTB4ZGVhZGJl ZWY7CiAgICAgICAgIHBhdGggPSB0ZXN0c1tpXS5wYXRoID8gU3lzQWxsb2NTdHJpbmcodGVzdHNb aV0ucGF0aCkgOiBOVUxMOwogICAgICAgICBociA9IElGaWxlU3lzdGVtM19HZXRCYXNlTmFtZShm czMsIHBhdGgsICZyZXN1bHQpOwpAQCAtMTUyMSw3ICsxNTIxLDcgQEAgc3RhdGljIHZvaWQgdGVz dF9DcmVhdGVUZXh0RmlsZSh2b2lkKQogICAgIC8qIEZpbGUgd2FzIGNyZWF0ZWQgaW4gVW5pY29k ZSBtb2RlLCBpdCBjb250YWlucyAweGZmZmUgQk9NLiBPcGVuaW5nIGl0IGluIG5vbi1Vbmljb2Rl IG1vZGUKICAgICAgICB0cmVhdHMgQk9NIGxpa2UgYSB2YWx1YWJsZSBkYXRhIHdpdGggYXBwcm9w cmlhdGUgQ1BfQUNQIC0+IFdDSEFSIGNvbnZlcnNpb24uICovCiAgICAgYnVmZldbMF0gPSAwOwot ICAgIE11bHRpQnl0ZVRvV2lkZUNoYXIoQ1BfQUNQLCAwLCB1dGYxNmJvbSwgLTEsIGJ1ZmZXLCBz aXplb2YoYnVmZlcpL3NpemVvZihXQ0hBUikpOworICAgIE11bHRpQnl0ZVRvV2lkZUNoYXIoQ1Bf QUNQLCAwLCB1dGYxNmJvbSwgLTEsIGJ1ZmZXLCBBUlJBWV9TSVpFKGJ1ZmZXKSk7CiAKICAgICBo ciA9IElGaWxlU3lzdGVtM19PcGVuVGV4dEZpbGUoZnMzLCBuYW1lVywgRm9yUmVhZGluZywgVkFS SUFOVF9GQUxTRSwgVHJpc3RhdGVGYWxzZSwgJnN0cmVhbSk7CiAgICAgb2soaHIgPT0gU19PSywg ImdvdCAweCUwOHhcbiIsIGhyKTsKQEAgLTE1NjksNyArMTU2OSw3IEBAIHN0YXRpYyB2b2lkIHRl c3RfV3JpdGVMaW5lKHZvaWQpCiAgICAgcmV0ID0gUmVhZEZpbGUoZmlsZSwgYnVmZkEsIHNpemVv ZihidWZmQSksICZyLCBOVUxMKTsKICAgICBvayhyZXQgJiYgciwgInJlYWQgJWQsIGdvdCAlZCwg JWRcbiIsIHIsIHJldCwgR2V0TGFzdEVycm9yKCkpOwogCi0gICAgbGVuID0gTXVsdGlCeXRlVG9X aWRlQ2hhcihDUF9BQ1AsIDAsIGJ1ZmZBLCByLCBidWZmVywgc2l6ZW9mKGJ1ZmZXKS9zaXplb2Yo V0NIQVIpKTsKKyAgICBsZW4gPSBNdWx0aUJ5dGVUb1dpZGVDaGFyKENQX0FDUCwgMCwgYnVmZkEs IHIsIGJ1ZmZXLCBBUlJBWV9TSVpFKGJ1ZmZXKSk7CiAgICAgYnVmZldbbGVuXSA9IDA7CiAgICAg bHN0cmNweVcoYnVmZjJXLCBuYW1lVyk7CiAgICAgbHN0cmNhdFcoYnVmZjJXLCBjcmxmVyk7CkBA IC0xNjU1LDcgKzE2NTUsNyBAQCBzdGF0aWMgdm9pZCB0ZXN0X1JlYWRBbGwodm9pZCkKICAgICBo ciA9IElUZXh0U3RyZWFtX1JlYWRBbGwoc3RyZWFtLCAmc3RyKTsKICAgICBvayhociA9PSBTX0ZB TFNFIHx8IGJyb2tlbihociA9PSBTX09LKSAvKiB3aW4yayAqLywgImdvdCAweCUwOHhcbiIsIGhy KTsKICAgICBidWZmV1swXSA9IDA7Ci0gICAgTXVsdGlCeXRlVG9XaWRlQ2hhcihDUF9BQ1AsIDAs IHV0ZjE2Ym9tLCAtMSwgYnVmZlcsIHNpemVvZihidWZmVykvc2l6ZW9mKFdDSEFSKSk7CisgICAg TXVsdGlCeXRlVG9XaWRlQ2hhcihDUF9BQ1AsIDAsIHV0ZjE2Ym9tLCAtMSwgYnVmZlcsIEFSUkFZ X1NJWkUoYnVmZlcpKTsKICAgICBvayhzdHJbMF0gPT0gYnVmZldbMF0gJiYgc3RyWzFdID09IGJ1 ZmZXWzFdLCAiZ290ICVzLCAlZFxuIiwgd2luZV9kYmdzdHJfdyhzdHIpLCBTeXNTdHJpbmdMZW4o c3RyKSk7CiAgICAgU3lzRnJlZVN0cmluZyhzdHIpOwogICAgIElUZXh0U3RyZWFtX1JlbGVhc2Uo c3RyZWFtKTsKQEAgLTE4MDEsNyArMTgwMSw3IEBAIHN0YXRpYyB2b2lkIHRlc3RfUmVhZCh2b2lk KQogICAgIG9rKGhyID09IFNfT0ssICJnb3QgMHglMDh4XG4iLCBocik7CiAKICAgICBidWZmV1sw XSA9IDA7Ci0gICAgTXVsdGlCeXRlVG9XaWRlQ2hhcihDUF9BQ1AsIDAsIHV0ZjE2Ym9tLCAtMSwg YnVmZlcsIHNpemVvZihidWZmVykvc2l6ZW9mKFdDSEFSKSk7CisgICAgTXVsdGlCeXRlVG9XaWRl Q2hhcihDUF9BQ1AsIDAsIHV0ZjE2Ym9tLCAtMSwgYnVmZlcsIEFSUkFZX1NJWkUoYnVmZlcpKTsK IAogICAgIG9rKCFsc3RyY21wVyhzdHIsIGJ1ZmZXKSwgImdvdCAlcywgZXhwZWN0ZWQgJXNcbiIs IHdpbmVfZGJnc3RyX3coc3RyKSwgd2luZV9kYmdzdHJfdyhidWZmVykpOwogICAgIG9rKFN5c1N0 cmluZ0xlbihzdHIpID09IDIsICJnb3QgJWRcbiIsIFN5c1N0cmluZ0xlbihzdHIpKTsKQEAgLTIx NTEsNyArMjE1MSw3IEBAIHN0YXRpYyB2b2lkIHRlc3RfR2V0RXh0ZW5zaW9uTmFtZSh2b2lkKQog ICAgIEhSRVNVTFQgaHI7CiAgICAgaW50IGk7CiAKLSAgICBmb3IgKGkgPSAwOyBpIDwgc2l6ZW9m KGV4dGVuc2lvbl90ZXN0cykvc2l6ZW9mKGV4dGVuc2lvbl90ZXN0c1swXSk7IGkrKykgeworICAg IGZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKGV4dGVuc2lvbl90ZXN0cyk7IGkrKykgewogCiAg ICAgICAgcGF0aCA9IFN5c0FsbG9jU3RyaW5nKGV4dGVuc2lvbl90ZXN0c1tpXS5wYXRoKTsKICAg ICAgICBleHQgPSBOVUxMOwpAQCAtMjE5MCw3ICsyMTkwLDcgQEAgc3RhdGljIHZvaWQgdGVzdF9H ZXRTcGVjaWFsRm9sZGVyKHZvaWQpCiAgICAgb2soaHIgPT0gU19PSywgImdvdCAweCUwOHhcbiIs IGhyKTsKICAgICBociA9IElGb2xkZXJfZ2V0X1BhdGgoZm9sZGVyLCAmcGF0aCk7CiAgICAgb2so aHIgPT0gU19PSywgImdvdCAweCUwOHhcbiIsIGhyKTsKLSAgICBHZXRXaW5kb3dzRGlyZWN0b3J5 VyhwYXRoVywgc2l6ZW9mKHBhdGhXKS9zaXplb2YoV0NIQVIpKTsKKyAgICBHZXRXaW5kb3dzRGly ZWN0b3J5VyhwYXRoVywgQVJSQVlfU0laRShwYXRoVykpOwogICAgIG9rKCFsc3RyY21waVcocGF0 aFcsIHBhdGgpLCAiZ290ICVzLCBleHBlY3RlZCAlc1xuIiwgd2luZV9kYmdzdHJfdyhwYXRoKSwg d2luZV9kYmdzdHJfdyhwYXRoVykpOwogICAgIFN5c0ZyZWVTdHJpbmcocGF0aCk7CiAgICAgSUZv bGRlcl9SZWxlYXNlKGZvbGRlcik7CkBAIC0yMTk5LDcgKzIxOTksNyBAQCBzdGF0aWMgdm9pZCB0 ZXN0X0dldFNwZWNpYWxGb2xkZXIodm9pZCkKICAgICBvayhociA9PSBTX09LLCAiZ290IDB4JTA4 eFxuIiwgaHIpOwogICAgIGhyID0gSUZvbGRlcl9nZXRfUGF0aChmb2xkZXIsICZwYXRoKTsKICAg ICBvayhociA9PSBTX09LLCAiZ290IDB4JTA4eFxuIiwgaHIpOwotICAgIEdldFN5c3RlbURpcmVj dG9yeVcocGF0aFcsIHNpemVvZihwYXRoVykvc2l6ZW9mKFdDSEFSKSk7CisgICAgR2V0U3lzdGVt RGlyZWN0b3J5VyhwYXRoVywgQVJSQVlfU0laRShwYXRoVykpOwogICAgIG9rKCFsc3RyY21waVco cGF0aFcsIHBhdGgpLCAiZ290ICVzLCBleHBlY3RlZCAlc1xuIiwgd2luZV9kYmdzdHJfdyhwYXRo KSwgd2luZV9kYmdzdHJfdyhwYXRoVykpOwogICAgIFN5c0ZyZWVTdHJpbmcocGF0aCk7CiAgICAg SUZvbGRlcl9SZWxlYXNlKGZvbGRlcik7CkBAIC0yMjA4LDcgKzIyMDgsNyBAQCBzdGF0aWMgdm9p ZCB0ZXN0X0dldFNwZWNpYWxGb2xkZXIodm9pZCkKICAgICBvayhociA9PSBTX09LLCAiZ290IDB4 JTA4eFxuIiwgaHIpOwogICAgIGhyID0gSUZvbGRlcl9nZXRfUGF0aChmb2xkZXIsICZwYXRoKTsK ICAgICBvayhociA9PSBTX09LLCAiZ290IDB4JTA4eFxuIiwgaHIpOwotICAgIHJldCA9IEdldFRl bXBQYXRoVyhzaXplb2YocGF0aFcpL3NpemVvZihXQ0hBUiksIHBhdGhXKTsKKyAgICByZXQgPSBH ZXRUZW1wUGF0aFcoQVJSQVlfU0laRShwYXRoVyksIHBhdGhXKTsKICAgICBpZiAocmV0ICYmIHBh dGhXW3JldC0xXSA9PSAnXFwnKQogICAgICAgICBwYXRoV1tyZXQtMV0gPSAwOwogCi0tIAoyLjE0 LjMKCgoK