[PATCH 17/17] rsaenh/tests: Use the available ARRAY_SIZE() macro
Michael Stefaniuc <[email protected]> Wed, 30 May 2018 21:15:49 +0200
| Newsgroups | gmane.comp.emulators.wine.patches,gmane.comp.emulators.wine.devel |
|---|---|
| Message-ID | <[email protected]> |
U2lnbmVkLW9mZi1ieTogTWljaGFlbCBTdGVmYW5pdWMgPG1zdGVmYW5pQHdpbmVocS5vcmc+Ci0t LQogZGxscy9yc2FlbmgvdGVzdHMvcnNhZW5oLmMgfCAxOCArKysrKysrKystLS0tLS0tLS0KIDEg ZmlsZSBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZGxscy9yc2FlbmgvdGVzdHMvcnNhZW5oLmMgYi9kbGxzL3JzYWVuaC90ZXN0cy9yc2Flbmgu YwppbmRleCBiYzhlNzk4Y2RkLi5kZjMxYWViNTRiIDEwMDY0NAotLS0gYS9kbGxzL3JzYWVuaC90 ZXN0cy9yc2FlbmguYworKysgYi9kbGxzL3JzYWVuaC90ZXN0cy9yc2FlbmguYwpAQCAtMTgxNSw3 ICsxODE1LDcgQEAgc3RhdGljIHZvaWQgdGVzdF9obWFjKHZvaWQpIHsKICAgICAgICAgMHhjZiwg MHgxMCwgMHg2YiwgMHhiNiwgMHg3ZCwgMHgwZiwgMHgxMywgMHgzMiB9OwogICAgIGludCBpOwog Ci0gICAgZm9yIChpPTA7IGk8c2l6ZW9mKGFiRGF0YSkvc2l6ZW9mKEJZVEUpOyBpKyspIGFiRGF0 YVtpXSA9IChCWVRFKWk7CisgICAgZm9yIChpPTA7IGkgPCBBUlJBWV9TSVpFKGFiRGF0YSk7IGkr KykgYWJEYXRhW2ldID0gKEJZVEUpaTsKIAogICAgIGlmICghZGVyaXZlX2tleShDQUxHX1JDMiwg JmhLZXksIDU2KSkgcmV0dXJuOwogCkBAIC0xODI5LDcgKzE4MjksNyBAQCBzdGF0aWMgdm9pZCB0 ZXN0X2htYWModm9pZCkgewogICAgIHJlc3VsdCA9IENyeXB0SGFzaERhdGEoaEhhc2gsIGFiRGF0 YSwgc2l6ZW9mKGFiRGF0YSksIDApOwogICAgIG9rKHJlc3VsdCwgIiUwOHhcbiIsIEdldExhc3RF cnJvcigpKTsKIAotICAgIGR3TGVuID0gc2l6ZW9mKGFiRGF0YSkvc2l6ZW9mKEJZVEUpOworICAg IGR3TGVuID0gQVJSQVlfU0laRShhYkRhdGEpOwogICAgIHJlc3VsdCA9IENyeXB0R2V0SGFzaFBh cmFtKGhIYXNoLCBIUF9IQVNIVkFMLCBhYkRhdGEsICZkd0xlbiwgMCk7CiAgICAgb2socmVzdWx0 LCAiJTA4eFxuIiwgR2V0TGFzdEVycm9yKCkpOwogCkBAIC0xODU1LDggKzE4NTUsOCBAQCBzdGF0 aWMgdm9pZCB0ZXN0X21hYyh2b2lkKSB7CiAgICAgc3RhdGljIGNvbnN0IEJZVEUgbWFjXzQwWzhd ID0geyAweGI3LCAweGEyLCAweDQ2LCAweGU5LCAweDExLCAweDMxLCAweGUwLCAweGFkfTsKICAg ICBpbnQgaTsKIAotICAgIGZvciAoaT0wOyBpPHNpemVvZihhYkRhdGEpL3NpemVvZihCWVRFKTsg aSsrKSBhYkRhdGFbaV0gPSAoQllURSlpOwotICAgIGZvciAoaT0wOyBpPHNpemVvZihhYkRhdGEp L3NpemVvZihCWVRFKTsgaSsrKSBhYkVuY1tpXSA9IChCWVRFKWk7CisgICAgZm9yIChpPTA7IGkg PCBBUlJBWV9TSVpFKGFiRGF0YSk7IGkrKykgYWJEYXRhW2ldID0gKEJZVEUpaTsKKyAgICBmb3Ig KGk9MDsgaSA8IEFSUkFZX1NJWkUoYWJEYXRhKTsgaSsrKSBhYkVuY1tpXSA9IChCWVRFKWk7CiAK ICAgICBpZiAoIWRlcml2ZV9rZXkoQ0FMR19SQzIsICZoS2V5LCA0MCkpIHJldHVybjsKIApAQCAt MTg3MSw3ICsxODcxLDcgQEAgc3RhdGljIHZvaWQgdGVzdF9tYWModm9pZCkgewogICAgIHJlc3Vs dCA9IENyeXB0SGFzaERhdGEoaEhhc2gsIGFiRGF0YSwgc2l6ZW9mKGFiRGF0YSksIDApOwogICAg IG9rKHJlc3VsdCwgIiUwOHhcbiIsIEdldExhc3RFcnJvcigpKTsKIAotICAgIGR3TGVuID0gc2l6 ZW9mKGFiRGF0YSkvc2l6ZW9mKEJZVEUpOworICAgIGR3TGVuID0gQVJSQVlfU0laRShhYkRhdGEp OwogICAgIHJlc3VsdCA9IENyeXB0R2V0SGFzaFBhcmFtKGhIYXNoLCBIUF9IQVNIVkFMLCBhYkRh dGEsICZkd0xlbiwgMCk7CiAgICAgb2socmVzdWx0ICYmIGR3TGVuID09IDgsICIlMDh4LCBkd0xl bjogJWRcbiIsIEdldExhc3RFcnJvcigpLCBkd0xlbik7CiAKQEAgLTI3MjUsNyArMjcyNSw3IEBA IHN0YXRpYyB2b2lkIHRlc3RfaW1wb3J0X2htYWModm9pZCkKICAgICB9OwogICAgIERXT1JEIGk7 CiAKLSAgICBmb3IgKGkgPSAwOyBpIDwgc2l6ZW9mKGNhc2VzKSAvIHNpemVvZihjYXNlc1swXSk7 IGkrKykKKyAgICBmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0laRShjYXNlcyk7IGkrKykKICAgICB7 CiAgICAgICAgIGNvbnN0IHN0cnVjdCByZmMyMjAyX3Rlc3RfY2FzZSAqdGVzdF9jYXNlID0gJmNh c2VzW2ldOwogICAgICAgICBEV09SRCBzaXplID0gc2l6ZW9mKEJMT0JIRUFERVIpICsgc2l6ZW9m KERXT1JEKSArIHRlc3RfY2FzZS0+a2V5X2xlbjsKQEAgLTM4MjIsMTMgKzM4MjIsMTMgQEAgc3Rh dGljIHZvaWQgdGVzdF9rZXlfZGVyaXZhdGlvbihjb25zdCBjaGFyICpwcm92KQogICAgICAgICB9 LAogICAgIH07CiAgICAgLyogRHVlIHRvIGRpZmZlcmVuY2VzIGJldHdlZW4gZW5jcnlwdGlvbiBm cm9tIDw9IDIwMDAgYW5kID49IFhQIHNvbWUgdGVzdHMgbmVlZCB0byBiZSBza2lwcGVkICovCi0g ICAgaW50IG9sZF9icm9rZW5bc2l6ZW9mKHRlc3RzKS9zaXplb2YodGVzdHNbMF0pXTsKKyAgICBp bnQgb2xkX2Jyb2tlbltBUlJBWV9TSVpFKHRlc3RzKV07CiAgICAgbWVtc2V0KG9sZF9icm9rZW4s IDAsIHNpemVvZihvbGRfYnJva2VuKSk7CiAgICAgb2xkX2Jyb2tlblszXSA9IG9sZF9icm9rZW5b NF0gPSBvbGRfYnJva2VuWzE1XSA9IG9sZF9icm9rZW5bMTZdID0gMTsKICAgICBvbGRfYnJva2Vu WzI3XSA9IG9sZF9icm9rZW5bMjhdID0gb2xkX2Jyb2tlblszOV0gPSBvbGRfYnJva2VuWzQwXSA9 IDE7CiAgICAgdW5pcXVlY29udGFpbmVyKE5VTEwpOwogCi0gICAgZm9yIChpPTA7IGk8c2l6ZW9m KHRlc3RzKS9zaXplb2YodGVzdHNbMF0pOyBpKyspCisgICAgZm9yIChpPTA7IGkgPCBBUlJBWV9T SVpFKHRlc3RzKTsgaSsrKQogICAgIHsKICAgICAgICAgaWYgKHdpbjJrICYmIG9sZF9icm9rZW5b aV0pIGNvbnRpbnVlOwogCkBAIC0zODg2LDcgKzM4ODYsNyBAQCBlcnI6CiAKIFNUQVJUX1RFU1Qo cnNhZW5oKQogewotICAgIGZvciAoaVByb3YgPSAwOyBpUHJvdiA8IHNpemVvZihzelByb3ZpZGVy cykgLyBzaXplb2Yoc3pQcm92aWRlcnNbMF0pOyBpUHJvdisrKQorICAgIGZvciAoaVByb3YgPSAw OyBpUHJvdiA8IEFSUkFZX1NJWkUoc3pQcm92aWRlcnMpOyBpUHJvdisrKQogICAgIHsKICAgICAg ICAgaWYgKCFpbml0X2Jhc2VfZW52aXJvbm1lbnQoc3pQcm92aWRlcnNbaVByb3ZdLCAwKSkKICAg ICAgICAgICAgIGNvbnRpbnVlOwotLSAKMi4xNC4zCgoKCg==