[PATCH 09/17] taskschd/tests: Use the available ARRAY_SIZE() macro
Michael Stefaniuc <[email protected]> Wed, 30 May 2018 21:15:41 +0200
| Newsgroups | gmane.comp.emulators.wine.patches,gmane.comp.emulators.wine.devel |
|---|---|
| Message-ID | <[email protected]> |
U2lnbmVkLW9mZi1ieTogTWljaGFlbCBTdGVmYW5pdWMgPG1zdGVmYW5pQHdpbmVocS5vcmc+Ci0t LQogZGxscy90YXNrc2NoZC90ZXN0cy9zY2hlZHVsZXIuYyB8IDMyICsrKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgMTYgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZGxscy90YXNrc2NoZC90ZXN0cy9zY2hlZHVsZXIuYyBi L2RsbHMvdGFza3NjaGQvdGVzdHMvc2NoZWR1bGVyLmMKaW5kZXggMTJjMzBlOGRiMy4uNWZjM2Fh YjU5NSAxMDA2NDQKLS0tIGEvZGxscy90YXNrc2NoZC90ZXN0cy9zY2hlZHVsZXIuYworKysgYi9k bGxzL3Rhc2tzY2hkL3Rlc3RzL3NjaGVkdWxlci5jCkBAIC02Niw3ICs2Niw3IEBAIHN0YXRpYyB2 b2lkIHRlc3RfQ29ubmVjdCh2b2lkKQogICAgIC8qIFdpbjcgZG9lc24ndCBzdXBwb3J0IFVOQyBc XCBwcmVmaXgsIGJ1dCBhY2NvcmRpbmcgdG8gYSB1c2VyCiAgICAgICogY29tbWVudCBvbiBNU0RO IFdpbjggc3VwcG9ydHMgYm90aCB3YXlzLgogICAgICAqLwotICAgIGxlbiA9IHNpemVvZihjb21w X25hbWUpL3NpemVvZihjb21wX25hbWVbMF0pOworICAgIGxlbiA9IEFSUkFZX1NJWkUoY29tcF9u YW1lKTsKICAgICBHZXRDb21wdXRlck5hbWVXKGNvbXBfbmFtZSwgJmxlbik7CiAKICAgICBWX1ZU KCZ2X251bGwpID0gVlRfTlVMTDsKQEAgLTQ4Niw3ICs0ODYsNyBAQCBzdGF0aWMgdm9pZCB0ZXN0 X0ZvbGRlckNvbGxlY3Rpb24odm9pZCkKICAgICBociA9IElUYXNrRm9sZGVyQ29sbGVjdGlvbl9n ZXRfSXRlbShmb2xkZXJzLCBpZHgsIE5VTEwpOwogICAgIG9rIChociA9PSBFX1BPSU5URVIsICJl eHBlY3RlZCBFX1BPSU5URVIsIGdvdCAlI3hcbiIsIGhyKTsKIAotICAgIGZvciAoaSA9IDA7IGkg PCBzaXplb2YodnQpL3NpemVvZih2dFswXSk7IGkrKykKKyAgICBmb3IgKGkgPSAwOyBpIDwgQVJS QVlfU0laRSh2dCk7IGkrKykKICAgICB7CiAgICAgICAgIHNldF92YXIodnRbaV0sICZpZHgsIDEp OwogICAgICAgICBociA9IElUYXNrRm9sZGVyQ29sbGVjdGlvbl9nZXRfSXRlbShmb2xkZXJzLCBp ZHgsICZzdWJmb2xkZXIpOwpAQCAtNzc0LDkgKzc3NCw5IEBAIHN0YXRpYyB2b2lkIHRlc3RfR2V0 VGFzayh2b2lkKQogICAgIG9rKGhyID09IEhSRVNVTFRfRlJPTV9XSU4zMihFUlJPUl9QQVRIX05P VF9GT1VORCkgfHwgaHIgPT0gSFJFU1VMVF9GUk9NX1dJTjMyKEVSUk9SX0ZJTEVfTk9UX0ZPVU5E KSAvKiB3aW43ICovLAogICAgICAgICJleHBlY3RlZCBFUlJPUl9QQVRIX05PVF9GT1VORCwgZ290 ICUjeFxuIiwgaHIpOwogCi0gICAgTXVsdGlCeXRlVG9XaWRlQ2hhcihDUF9BQ1AsIDAsIHhtbDEs IC0xLCB4bWxXLCBzaXplb2YoeG1sVykvc2l6ZW9mKHhtbFdbMF0pKTsKKyAgICBNdWx0aUJ5dGVU b1dpZGVDaGFyKENQX0FDUCwgMCwgeG1sMSwgLTEsIHhtbFcsIEFSUkFZX1NJWkUoeG1sVykpOwog Ci0gICAgZm9yIChpID0gMDsgaSA8IHNpemVvZihjcmVhdGVfbmV3X3Rhc2spL3NpemVvZihjcmVh dGVfbmV3X3Rhc2tbMF0pOyBpKyspCisgICAgZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUoY3Jl YXRlX25ld190YXNrKTsgaSsrKQogICAgIHsKICAgICAgICAgaHIgPSBJVGFza0ZvbGRlcl9SZWdp c3RlclRhc2socm9vdCwgV2luZV9UYXNrMSwgeG1sVywgY3JlYXRlX25ld190YXNrW2ldLmZsYWdz LCB2X251bGwsIHZfbnVsbCwgVEFTS19MT0dPTl9OT05FLCB2X251bGwsICZ0YXNrMSk7CiAgICAg ICAgIG9rKGhyID09IGNyZWF0ZV9uZXdfdGFza1tpXS5ociwgIiVkOiBleHBlY3RlZCAlI3gsIGdv dCAlI3hcbiIsIGksIGNyZWF0ZV9uZXdfdGFza1tpXS5ociwgaHIpOwpAQCAtODEwLDcgKzgxMCw3 IEBAIHRvZG9fd2luZQogICAgIGhyID0gSVRhc2tGb2xkZXJfUmVnaXN0ZXJUYXNrKHJvb3QsIFdp bmVfVGFzazEsIHhtbFcsIFRBU0tfQ1JFQVRFX09SX1VQREFURSwgdl9udWxsLCB2X251bGwsIFRB U0tfTE9HT05fTk9ORSwgdl9udWxsLCAmdGFzazEpOwogICAgIG9rKGhyID09IFNfT0ssICJSZWdp c3RlclRhc2sgZXJyb3IgJSN4XG4iLCBocik7CiAKLSAgICBmb3IgKGkgPSAwOyBpIDwgc2l6ZW9m KG9wZW5fZXhpc3RpbmdfdGFzaykvc2l6ZW9mKG9wZW5fZXhpc3RpbmdfdGFza1swXSk7IGkrKykK KyAgICBmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0laRShvcGVuX2V4aXN0aW5nX3Rhc2spOyBpKysp CiAgICAgewogICAgICAgICBociA9IElUYXNrRm9sZGVyX1JlZ2lzdGVyVGFzayhyb290LCBXaW5l X1Rhc2sxLCB4bWxXLCBvcGVuX2V4aXN0aW5nX3Rhc2tbaV0uZmxhZ3MsIHZfbnVsbCwgdl9udWxs LCBUQVNLX0xPR09OX05PTkUsIHZfbnVsbCwgJnRhc2syKTsKICAgICAgICAgb2soaHIgPT0gb3Bl bl9leGlzdGluZ190YXNrW2ldLmhyLCAiJWQ6IGV4cGVjdGVkICUjeCwgZ290ICUjeFxuIiwgaSwg b3Blbl9leGlzdGluZ190YXNrW2ldLmhyLCBocik7CkBAIC04NDEsNyArODQxLDcgQEAgdG9kb193 aW5lCiAgICAgaHIgPSBJVGFza0ZvbGRlcl9SZWdpc3RlclRhc2soZm9sZGVyLCBUYXNrMSwgeG1s VywgVEFTS19DUkVBVEUsIHZfbnVsbCwgdl9udWxsLCBUQVNLX0xPR09OX05PTkUsIHZfbnVsbCwg JnRhc2syKTsKICAgICBvayhociA9PSBIUkVTVUxUX0ZST01fV0lOMzIoRVJST1JfQUxSRUFEWV9F WElTVFMpLCAiZXhwZWN0ZWQgRVJST1JfQUxSRUFEWV9FWElTVFMsIGdvdCAlI3hcbiIsIGhyKTsK IAotICAgIE11bHRpQnl0ZVRvV2lkZUNoYXIoQ1BfQUNQLCAwLCB4bWwyLCAtMSwgeG1sVywgc2l6 ZW9mKHhtbFcpL3NpemVvZih4bWxXWzBdKSk7CisgICAgTXVsdGlCeXRlVG9XaWRlQ2hhcihDUF9B Q1AsIDAsIHhtbDIsIC0xLCB4bWxXLCBBUlJBWV9TSVpFKHhtbFcpKTsKIAogICAgIGhyID0gSVRh c2tGb2xkZXJfUmVnaXN0ZXJUYXNrKGZvbGRlciwgVGFzazIsIHhtbFcsIFRBU0tfQ1JFQVRFLCB2 X251bGwsIHZfbnVsbCwgVEFTS19MT0dPTl9OT05FLCB2X251bGwsICZ0YXNrMik7CiAgICAgb2so aHIgPT0gU19PSywgIlJlZ2lzdGVyVGFzayBlcnJvciAlI3hcbiIsIGhyKTsKQEAgLTEyNjIsNyAr MTI2Miw3IEBAIHN0YXRpYyB2b2lkIHRlc3RfZGFpbHlfdHJpZ2dlcihJVHJpZ2dlciAqdHJpZ2dl cikKICAgICBvayhociA9PSBTX09LLCAiZ2V0X1N0YXJ0Qm91bmRhcnkgZmFpbGVkOiAlMDh4XG4i LCBocik7CiAgICAgb2soc3RhcnRfYm91bmRhcnkgPT0gTlVMTCwgInN0YXJ0X2JvdW5kYXJ5IG5v dCBzZXRcbiIpOwogCi0gICAgZm9yIChpID0gMDsgaSA8IHNpemVvZihzdGFydF90ZXN0KS9zaXpl b2Yoc3RhcnRfdGVzdFswXSk7IGkrKykKKyAgICBmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0laRShz dGFydF90ZXN0KTsgaSsrKQogICAgIHsKICAgICAgICAgc3RhcnRfYm91bmRhcnkgPSBTeXNBbGxv Y1N0cmluZyhzdGFydF90ZXN0W2ldLnN0cik7CiAgICAgICAgIGhyID0gSURhaWx5VHJpZ2dlcl9w dXRfU3RhcnRCb3VuZGFyeShkYWlseV90cmlnZ2VyLCBzdGFydF9ib3VuZGFyeSk7CkBAIC0xNTY5 LDMzICsxNTY5LDMzIEBAIHN0YXRpYyB2b2lkIHRlc3RfVGFza0RlZmluaXRpb24odm9pZCkKICAg ICBociA9IElUYXNrRGVmaW5pdGlvbl9wdXRfWG1sVGV4dCh0YXNrZGVmLCBOVUxMKTsKICAgICBv ayhociA9PSBFX0lOVkFMSURBUkcsICJleHBlY3RlZCBFX0lOVkFMSURBUkcsIGdvdCAlI3hcbiIs IGhyKTsKIAotICAgIE11bHRpQnl0ZVRvV2lkZUNoYXIoQ1BfQUNQLCAwLCB4bWwxLCAtMSwgeG1s Vywgc2l6ZW9mKHhtbFcpL3NpemVvZih4bWxXWzBdKSk7CisgICAgTXVsdGlCeXRlVG9XaWRlQ2hh cihDUF9BQ1AsIDAsIHhtbDEsIC0xLCB4bWxXLCBBUlJBWV9TSVpFKHhtbFcpKTsKICAgICBociA9 IElUYXNrRGVmaW5pdGlvbl9wdXRfWG1sVGV4dCh0YXNrZGVmLCB4bWxXKTsKICAgICBvayhociA9 PSBTX09LLCAicHV0X1htbFRleHQgZXJyb3IgJSN4XG4iLCBocik7CiAKLSAgICBNdWx0aUJ5dGVU b1dpZGVDaGFyKENQX0FDUCwgMCwgeG1sMiwgLTEsIHhtbFcsIHNpemVvZih4bWxXKS9zaXplb2Yo eG1sV1swXSkpOworICAgIE11bHRpQnl0ZVRvV2lkZUNoYXIoQ1BfQUNQLCAwLCB4bWwyLCAtMSwg eG1sVywgQVJSQVlfU0laRSh4bWxXKSk7CiAgICAgaHIgPSBJVGFza0RlZmluaXRpb25fcHV0X1ht bFRleHQodGFza2RlZiwgeG1sVyk7CiAgICAgb2soaHIgPT0gU0NIRURfRV9OQU1FU1BBQ0UsICJl eHBlY3RlZCBTQ0hFRF9FX05BTUVTUEFDRSwgZ290ICUjeFxuIiwgaHIpOwogCi0gICAgTXVsdGlC eXRlVG9XaWRlQ2hhcihDUF9BQ1AsIDAsIHhtbDMsIC0xLCB4bWxXLCBzaXplb2YoeG1sVykvc2l6 ZW9mKHhtbFdbMF0pKTsKKyAgICBNdWx0aUJ5dGVUb1dpZGVDaGFyKENQX0FDUCwgMCwgeG1sMywg LTEsIHhtbFcsIEFSUkFZX1NJWkUoeG1sVykpOwogICAgIGhyID0gSVRhc2tEZWZpbml0aW9uX3B1 dF9YbWxUZXh0KHRhc2tkZWYsIHhtbFcpOwogdG9kb193aW5lCiAgICAgb2soaHIgPT0gU0NIRURf RV9VTkVYUEVDVEVETk9ERSwgImV4cGVjdGVkIFNDSEVEX0VfVU5FWFBFQ1RFRE5PREUsIGdvdCAl I3hcbiIsIGhyKTsKIAotICAgIE11bHRpQnl0ZVRvV2lkZUNoYXIoQ1BfQUNQLCAwLCB4bWw0LCAt MSwgeG1sVywgc2l6ZW9mKHhtbFcpL3NpemVvZih4bWxXWzBdKSk7CisgICAgTXVsdGlCeXRlVG9X aWRlQ2hhcihDUF9BQ1AsIDAsIHhtbDQsIC0xLCB4bWxXLCBBUlJBWV9TSVpFKHhtbFcpKTsKICAg ICBociA9IElUYXNrRGVmaW5pdGlvbl9wdXRfWG1sVGV4dCh0YXNrZGVmLCB4bWxXKTsKICAgICBv ayhociA9PSBTX09LLCAicHV0X1htbFRleHQgZXJyb3IgJSN4XG4iLCBocik7CiAKLSAgICBNdWx0 aUJ5dGVUb1dpZGVDaGFyKENQX0FDUCwgMCwgeG1sNSwgLTEsIHhtbFcsIHNpemVvZih4bWxXKS9z aXplb2YoeG1sV1swXSkpOworICAgIE11bHRpQnl0ZVRvV2lkZUNoYXIoQ1BfQUNQLCAwLCB4bWw1 LCAtMSwgeG1sVywgQVJSQVlfU0laRSh4bWxXKSk7CiAgICAgaHIgPSBJVGFza0RlZmluaXRpb25f cHV0X1htbFRleHQodGFza2RlZiwgeG1sVyk7CiB0b2RvX3dpbmUKICAgICBvayhociA9PSBTQ0hF RF9FX01JU1NJTkdOT0RFLCAiZXhwZWN0ZWQgU0NIRURfRV9NSVNTSU5HTk9ERSwgZ290ICUjeFxu IiwgaHIpOwogCi0gICAgTXVsdGlCeXRlVG9XaWRlQ2hhcihDUF9BQ1AsIDAsIHhtbDYsIC0xLCB4 bWxXLCBzaXplb2YoeG1sVykvc2l6ZW9mKHhtbFdbMF0pKTsKKyAgICBNdWx0aUJ5dGVUb1dpZGVD aGFyKENQX0FDUCwgMCwgeG1sNiwgLTEsIHhtbFcsIEFSUkFZX1NJWkUoeG1sVykpOwogICAgIGhy ID0gSVRhc2tEZWZpbml0aW9uX3B1dF9YbWxUZXh0KHRhc2tkZWYsIHhtbFcpOwogICAgIG9rKGhy ID09IFNDSEVEX0VfTUFMRk9STUVEWE1MLCAiZXhwZWN0ZWQgU0NIRURfRV9NQUxGT1JNRURYTUws IGdvdCAlI3hcbiIsIGhyKTsKIAotICAgIE11bHRpQnl0ZVRvV2lkZUNoYXIoQ1BfQUNQLCAwLCB4 bWw3LCAtMSwgeG1sVywgc2l6ZW9mKHhtbFcpL3NpemVvZih4bWxXWzBdKSk7CisgICAgTXVsdGlC eXRlVG9XaWRlQ2hhcihDUF9BQ1AsIDAsIHhtbDcsIC0xLCB4bWxXLCBBUlJBWV9TSVpFKHhtbFcp KTsKICAgICBociA9IElUYXNrRGVmaW5pdGlvbl9wdXRfWG1sVGV4dCh0YXNrZGVmLCB4bWxXKTsK ICAgICBvayhociA9PSBTQ0hFRF9FX0lOVkFMSURWQUxVRSwgImV4cGVjdGVkIFNDSEVEX0VfSU5W QUxJRFZBTFVFLCBnb3QgJSN4XG4iLCBocik7CiAKQEAgLTE2MDQsNyArMTYwNCw3IEBAIHRvZG9f d2luZQogICAgIG9rKGhyID09IFNDSEVEX0VfTUFMRk9STUVEWE1MLCAiZXhwZWN0ZWQgU0NIRURf RV9NQUxGT1JNRURYTUwsIGdvdCAlI3hcbiIsIGhyKTsKIAogICAgIC8qIHRlc3QgcmVnaXN0cmF0 aW9uIGluZm8gKi8KLSAgICBNdWx0aUJ5dGVUb1dpZGVDaGFyKENQX0FDUCwgMCwgeG1sMSwgLTEs IHhtbFcsIHNpemVvZih4bWxXKS9zaXplb2YoeG1sV1swXSkpOworICAgIE11bHRpQnl0ZVRvV2lk ZUNoYXIoQ1BfQUNQLCAwLCB4bWwxLCAtMSwgeG1sVywgQVJSQVlfU0laRSh4bWxXKSk7CiAgICAg aHIgPSBJVGFza0RlZmluaXRpb25fcHV0X1htbFRleHQodGFza2RlZiwgeG1sVyk7CiAgICAgb2so aHIgPT0gU19PSywgInB1dF9YbWxUZXh0IGVycm9yICUjeFxuIiwgaHIpOwogICAgIGhyID0gSVRh c2tEZWZpbml0aW9uX2dldF9SZWdpc3RyYXRpb25JbmZvKHRhc2tkZWYsICZyZWdpbmZvKTsKQEAg LTE2OTcsNyArMTY5Nyw3IEBAIGlmIChociA9PSBTX09LKQogCiAgICAgSVJlZ2lzdHJhdGlvbklu Zm9fUmVsZWFzZShyZWdpbmZvKTsKIAotICAgIE11bHRpQnl0ZVRvV2lkZUNoYXIoQ1BfQUNQLCAw LCB4bWw0LCAtMSwgeG1sVywgc2l6ZW9mKHhtbFcpL3NpemVvZih4bWxXWzBdKSk7CisgICAgTXVs dGlCeXRlVG9XaWRlQ2hhcihDUF9BQ1AsIDAsIHhtbDQsIC0xLCB4bWxXLCBBUlJBWV9TSVpFKHht bFcpKTsKICAgICBociA9IElUYXNrRGVmaW5pdGlvbl9wdXRfWG1sVGV4dCh0YXNrZGVmLCB4bWxX KTsKICAgICBvayhociA9PSBTX09LLCAicHV0X1htbFRleHQgZXJyb3IgJSN4XG4iLCBocik7CiAg ICAgaHIgPSBJVGFza0RlZmluaXRpb25fZ2V0X1JlZ2lzdHJhdGlvbkluZm8odGFza2RlZiwgJnJl Z2luZm8pOwotLSAKMi4xNC4zCgoKCg==