10742 2006-09-05 18:22:45 -0700 More Objective-C DOM auto-generation cleanup 2006-09-05 19:53:41 -0700 1 1 1 Unclassified WebKit WebCore Misc. 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 sam webkit-unassigned oldest_to_newest 54854 0 sam 2006-09-05 18:22:45 -0700 Factor out implementation type-getters into their own function and standardize naming as was done for type-makers (ie. HTML and CSS prefixing). Patch to come. 54855 1 10409 sam 2006-09-05 18:26:56 -0700 Created attachment 10409 patch 54856 2 10409 timothy 2006-09-05 19:28:28 -0700 Comment on attachment 10409 patch r=me, nice cleanup 54857 3 sam 2006-09-05 19:53:41 -0700 Landed in r16242. 10409 2006-09-05 18:26:56 -0700 2006-09-05 19:28:28 -0700 patch autoClean.diff text/plain 14607 sam SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxNjI0MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNDUgQEAKKzIwMDYtMDktMDUgIFNhbSBXZWluaWcgIDxzYW0ud2VpbmlnQGdtYWls LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQ YXRjaCBmb3IgaHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNnaT9pZD0x MDc0MgorICAgICAgICBNb3JlIE9iamVjdGl2ZS1DIERPTSBhdXRvLWdlbmVyYXRpb24gY2xlYW51 cAorICAgICAgICAKKyAgICAgICAgLSBGYWN0b3Igb3V0IGltcGxlbWVudGF0aW9uIHR5cGUtZ2V0 dGVycyBpbnRvIHRoZWlyIG93biBmdW5jdGlvbiAKKyAgICAgICAgICBhbmQgc3RhbmRhcmRpemUg bmFtaW5nIGFzIHdhcyBkb25lIGZvciB0eXBlLW1ha2VycyAoaWUuIEhUTUwgCisgICAgICAgICAg YW5kIENTUyBwcmVmaXhpbmcgZm9yIG1ldGhvZCBuYW1lcykuCisKKyAgICAgICAgKiBiaW5kaW5n cy9vYmpjL0RPTUNTUy5tbToKKyAgICAgICAgKC1bRE9NQ1NTU3R5bGVEZWNsYXJhdGlvbiBnZXRQ cm9wZXJ0eVNob3J0aGFuZDpdKToKKyAgICAgICAgKC1bRE9NQ1NTU3R5bGVEZWNsYXJhdGlvbiBp c1Byb3BlcnR5SW1wbGljaXQ6XSk6CisgICAgICAgICgtW0RPTUNTU1N0eWxlRGVjbGFyYXRpb24g X0NTU1N0eWxlRGVjbGFyYXRpb25dKToKKyAgICAgICAgKiBiaW5kaW5ncy9vYmpjL0RPTUhUTUwu bW06CisgICAgICAgICgtW0RPTUhUTUxUYWJsZUNhcHRpb25FbGVtZW50IF9IVE1MVGFibGVDYXB0 aW9uRWxlbWVudF0pOgorICAgICAgICAoLVtET01IVE1MVGFibGVTZWN0aW9uRWxlbWVudCBfSFRN TFRhYmxlU2VjdGlvbkVsZW1lbnRdKToKKyAgICAgICAgKC1bRE9NSFRNTFRhYmxlRWxlbWVudCBf SFRNTFRhYmxlRWxlbWVudF0pOgorICAgICAgICAoLVtET01IVE1MVGFibGVDZWxsRWxlbWVudCBf SFRNTFRhYmxlQ2VsbEVsZW1lbnRdKToKKyAgICAgICAgKC1bRE9NSFRNTEVtYmVkRWxlbWVudCBf SFRNTEVtYmVkRWxlbWVudF0pOgorICAgICAgICAoLVtET01IVE1MRW1iZWRFbGVtZW50IGFsaWdu XSk6CisgICAgICAgICgtW0RPTUhUTUxFbWJlZEVsZW1lbnQgc2V0QWxpZ246XSk6CisgICAgICAg ICgtW0RPTUhUTUxFbWJlZEVsZW1lbnQgaGVpZ2h0XSk6CisgICAgICAgICgtW0RPTUhUTUxFbWJl ZEVsZW1lbnQgc2V0SGVpZ2h0Ol0pOgorICAgICAgICAoLVtET01IVE1MRW1iZWRFbGVtZW50IG5h bWVdKToKKyAgICAgICAgKC1bRE9NSFRNTEVtYmVkRWxlbWVudCBzZXROYW1lOl0pOgorICAgICAg ICAoLVtET01IVE1MRW1iZWRFbGVtZW50IHNyY10pOgorICAgICAgICAoLVtET01IVE1MRW1iZWRF bGVtZW50IHNldFNyYzpdKToKKyAgICAgICAgKC1bRE9NSFRNTEVtYmVkRWxlbWVudCB0eXBlXSk6 CisgICAgICAgICgtW0RPTUhUTUxFbWJlZEVsZW1lbnQgc2V0VHlwZTpdKToKKyAgICAgICAgKC1b RE9NSFRNTEVtYmVkRWxlbWVudCB3aWR0aF0pOgorICAgICAgICAoLVtET01IVE1MRW1iZWRFbGVt ZW50IHNldFdpZHRoOl0pOgorICAgICAgICAqIGJpbmRpbmdzL29iamMvRE9NSW50ZXJuYWwuaDoK KyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JPYmpDLnBtOgorICAgICAg ICAqIGJyaWRnZS9tYWMvV2ViQ29yZUZyYW1lQnJpZGdlLm1tOgorICAgICAgICAoLVtXZWJDb3Jl RnJhbWVCcmlkZ2Ugc2V0VHlwaW5nU3R5bGU6d2l0aFVuZG9BY3Rpb246XSk6CisgICAgICAgICgt W1dlYkNvcmVGcmFtZUJyaWRnZSBhcHBseVN0eWxlOndpdGhVbmRvQWN0aW9uOl0pOgorICAgICAg ICAoLVtXZWJDb3JlRnJhbWVCcmlkZ2UgYXBwbHlQYXJhZ3JhcGhTdHlsZTp3aXRoVW5kb0FjdGlv bjpdKToKKyAgICAgICAgKC1bV2ViQ29yZUZyYW1lQnJpZGdlIHNlbGVjdGlvblN0YXJ0SGFzU3R5 bGU6XSk6CisgICAgICAgICgtW1dlYkNvcmVGcmFtZUJyaWRnZSBzZWxlY3Rpb25IYXNTdHlsZTpd KToKKwogMjAwNi0wOS0wNSAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgSm9obi4KSW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mvb2JqYy9E T01DU1MubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9vYmpjL0RPTUNTUy5tbQko cmV2aXNpb24gMTYyNDApCisrKyBXZWJDb3JlL2JpbmRpbmdzL29iamMvRE9NQ1NTLm1tCSh3b3Jr aW5nIGNvcHkpCkBAIC0yNTksMTIgKzI1OSwxMiBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsK IAogLSAoTlNTdHJpbmcgKilnZXRQcm9wZXJ0eVNob3J0aGFuZDooTlNTdHJpbmcgKilwcm9wZXJ0 eU5hbWUKIHsKLSAgICByZXR1cm4gW3NlbGYgX3N0eWxlRGVjbGFyYXRpb25dLT5nZXRQcm9wZXJ0 eVNob3J0aGFuZChwcm9wZXJ0eU5hbWUpOworICAgIHJldHVybiBbc2VsZiBfQ1NTU3R5bGVEZWNs YXJhdGlvbl0tPmdldFByb3BlcnR5U2hvcnRoYW5kKHByb3BlcnR5TmFtZSk7CiB9CiAKIC0gKEJP T0wpaXNQcm9wZXJ0eUltcGxpY2l0OihOU1N0cmluZyAqKXByb3BlcnR5TmFtZQogewotICAgIHJl dHVybiBbc2VsZiBfc3R5bGVEZWNsYXJhdGlvbl0tPmlzUHJvcGVydHlJbXBsaWNpdChwcm9wZXJ0 eU5hbWUpOworICAgIHJldHVybiBbc2VsZiBfQ1NTU3R5bGVEZWNsYXJhdGlvbl0tPmlzUHJvcGVy dHlJbXBsaWNpdChwcm9wZXJ0eU5hbWUpOwogfQogCiBAZW5kCkBAIC0yOTMsNyArMjkzLDcgQEAg dXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAgICAgcmV0dXJuIFtbW3NlbGYgYWxsb2NdIF9pbml0 V2l0aFN0eWxlRGVjbGFyYXRpb246aW1wbF0gYXV0b3JlbGVhc2VdOwogfQogCi0tIChDU1NTdHls ZURlY2xhcmF0aW9uICopX3N0eWxlRGVjbGFyYXRpb24KKy0gKENTU1N0eWxlRGVjbGFyYXRpb24g KilfQ1NTU3R5bGVEZWNsYXJhdGlvbgogewogICAgIHJldHVybiBET01fY2FzdDxDU1NTdHlsZURl Y2xhcmF0aW9uKj4oX2ludGVybmFsKTsKIH0KSW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mvb2JqYy9E T01IVE1MLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3Mvb2JqYy9ET01IVE1MLm1t CShyZXZpc2lvbiAxNjI0MCkKKysrIFdlYkNvcmUvYmluZGluZ3Mvb2JqYy9ET01IVE1MLm1tCSh3 b3JraW5nIGNvcHkpCkBAIC0yNTEsNyArMjUxLDcgQEAgdXNpbmcgbmFtZXNwYWNlIEhUTUxOYW1l czsKICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8RE9NSFRNTFRhYmxlQ2FwdGlvbkVsZW1lbnQqPihb RE9NTm9kZSBfbm9kZVdpdGg6aW1wbF0pOwogfQogCi0tIChIVE1MVGFibGVDYXB0aW9uRWxlbWVu dCAqKV90YWJsZUNhcHRpb25FbGVtZW50CistIChIVE1MVGFibGVDYXB0aW9uRWxlbWVudCAqKV9I VE1MVGFibGVDYXB0aW9uRWxlbWVudAogewogICAgIHJldHVybiBzdGF0aWNfY2FzdDxIVE1MVGFi bGVDYXB0aW9uRWxlbWVudCo+KERPTV9jYXN0PE5vZGUqPihfaW50ZXJuYWwpKTsKIH0KQEAgLTI2 OSw3ICsyNjksNyBAQCB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVzOwogICAgIHJldHVybiBzdGF0 aWNfY2FzdDxET01IVE1MVGFibGVTZWN0aW9uRWxlbWVudCo+KFtET01Ob2RlIF9ub2RlV2l0aDpp bXBsXSk7CiB9CiAKLS0gKEhUTUxUYWJsZVNlY3Rpb25FbGVtZW50ICopX3RhYmxlU2VjdGlvbkVs ZW1lbnQKKy0gKEhUTUxUYWJsZVNlY3Rpb25FbGVtZW50ICopX0hUTUxUYWJsZVNlY3Rpb25FbGVt ZW50CiB7CiAgICAgcmV0dXJuIHN0YXRpY19jYXN0PEhUTUxUYWJsZVNlY3Rpb25FbGVtZW50Kj4o RE9NX2Nhc3Q8Tm9kZSo+KF9pbnRlcm5hbCkpOwogfQpAQCAtMjg3LDcgKzI4Nyw3IEBAIHVzaW5n IG5hbWVzcGFjZSBIVE1MTmFtZXM7CiAgICAgcmV0dXJuIHN0YXRpY19jYXN0PERPTUhUTUxUYWJs ZUVsZW1lbnQqPihbRE9NTm9kZSBfbm9kZVdpdGg6aW1wbF0pOwogfQogCi0tIChIVE1MVGFibGVF bGVtZW50ICopX3RhYmxlRWxlbWVudAorLSAoSFRNTFRhYmxlRWxlbWVudCAqKV9IVE1MVGFibGVF bGVtZW50CiB7CiAgICAgcmV0dXJuIHN0YXRpY19jYXN0PEhUTUxUYWJsZUVsZW1lbnQqPihET01f Y2FzdDxOb2RlKj4oX2ludGVybmFsKSk7CiB9CkBAIC0zMDUsNyArMzA1LDcgQEAgdXNpbmcgbmFt ZXNwYWNlIEhUTUxOYW1lczsKICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8RE9NSFRNTFRhYmxlQ2Vs bEVsZW1lbnQqPihbRE9NTm9kZSBfbm9kZVdpdGg6aW1wbF0pOwogfQogCi0tIChIVE1MVGFibGVD ZWxsRWxlbWVudCAqKV90YWJsZUNlbGxFbGVtZW50CistIChIVE1MVGFibGVDZWxsRWxlbWVudCAq KV9IVE1MVGFibGVDZWxsRWxlbWVudAogewogICAgIHJldHVybiBzdGF0aWNfY2FzdDxIVE1MVGFi bGVDZWxsRWxlbWVudCo+KERPTV9jYXN0PE5vZGUqPihfaW50ZXJuYWwpKTsKIH0KQEAgLTMyMSw2 OSArMzIxLDY5IEBAIHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFtZXM7CiAKIEBpbXBsZW1lbnRhdGlv biBET01IVE1MRW1iZWRFbGVtZW50CiAKLS0gKEhUTUxFbWJlZEVsZW1lbnQgKilfZW1iZWRFbGVt ZW50CistIChIVE1MRW1iZWRFbGVtZW50ICopX0hUTUxFbWJlZEVsZW1lbnQKIHsKICAgICByZXR1 cm4gc3RhdGljX2Nhc3Q8SFRNTEVtYmVkRWxlbWVudCo+KERPTV9jYXN0PE5vZGUqPihfaW50ZXJu YWwpKTsKIH0KIAogLSAoTlNTdHJpbmcgKilhbGlnbgogewotICAgIHJldHVybiBbc2VsZiBfZW1i ZWRFbGVtZW50XS0+Z2V0QXR0cmlidXRlKGFsaWduQXR0cik7CisgICAgcmV0dXJuIFtzZWxmIF9I VE1MRW1iZWRFbGVtZW50XS0+Z2V0QXR0cmlidXRlKGFsaWduQXR0cik7CiB9CiAKIC0gKHZvaWQp c2V0QWxpZ246KE5TU3RyaW5nICopYWxpZ24KIHsKLSAgICBbc2VsZiBfZW1iZWRFbGVtZW50XS0+ c2V0QXR0cmlidXRlKGFsaWduQXR0ciwgYWxpZ24pOworICAgIFtzZWxmIF9IVE1MRW1iZWRFbGVt ZW50XS0+c2V0QXR0cmlidXRlKGFsaWduQXR0ciwgYWxpZ24pOwogfQogCiAtIChpbnQpaGVpZ2h0 CiB7Ci0gICAgcmV0dXJuIFtzZWxmIF9lbWJlZEVsZW1lbnRdLT5nZXRBdHRyaWJ1dGUoaGVpZ2h0 QXR0cikudG9JbnQoKTsKKyAgICByZXR1cm4gW3NlbGYgX0hUTUxFbWJlZEVsZW1lbnRdLT5nZXRB dHRyaWJ1dGUoaGVpZ2h0QXR0cikudG9JbnQoKTsKIH0KIAogLSAodm9pZClzZXRIZWlnaHQ6KGlu dCloZWlnaHQKIHsKLSAgICBbc2VsZiBfZW1iZWRFbGVtZW50XS0+c2V0QXR0cmlidXRlKGhlaWdo dEF0dHIsIFN0cmluZzo6bnVtYmVyKGhlaWdodCkpOworICAgIFtzZWxmIF9IVE1MRW1iZWRFbGVt ZW50XS0+c2V0QXR0cmlidXRlKGhlaWdodEF0dHIsIFN0cmluZzo6bnVtYmVyKGhlaWdodCkpOwog fQogCiAtIChOU1N0cmluZyAqKW5hbWUKIHsKLSAgICByZXR1cm4gW3NlbGYgX2VtYmVkRWxlbWVu dF0tPmdldEF0dHJpYnV0ZShuYW1lQXR0cik7CisgICAgcmV0dXJuIFtzZWxmIF9IVE1MRW1iZWRF bGVtZW50XS0+Z2V0QXR0cmlidXRlKG5hbWVBdHRyKTsKIH0KIAogLSAodm9pZClzZXROYW1lOihO U1N0cmluZyAqKW5hbWUKIHsKLSAgICBbc2VsZiBfZW1iZWRFbGVtZW50XS0+c2V0QXR0cmlidXRl KG5hbWVBdHRyLCBuYW1lKTsKKyAgICBbc2VsZiBfSFRNTEVtYmVkRWxlbWVudF0tPnNldEF0dHJp YnV0ZShuYW1lQXR0ciwgbmFtZSk7CiB9CiAKIC0gKE5TU3RyaW5nICopc3JjCiB7Ci0gICAgcmV0 dXJuIFtzZWxmIF9lbWJlZEVsZW1lbnRdLT5nZXRBdHRyaWJ1dGUoc3JjQXR0cik7CisgICAgcmV0 dXJuIFtzZWxmIF9IVE1MRW1iZWRFbGVtZW50XS0+Z2V0QXR0cmlidXRlKHNyY0F0dHIpOwogfQog CiAtICh2b2lkKXNldFNyYzooTlNTdHJpbmcgKilzcmMKIHsKLSAgICBbc2VsZiBfZW1iZWRFbGVt ZW50XS0+c2V0QXR0cmlidXRlKHNyY0F0dHIsIHNyYyk7CisgICAgW3NlbGYgX0hUTUxFbWJlZEVs ZW1lbnRdLT5zZXRBdHRyaWJ1dGUoc3JjQXR0ciwgc3JjKTsKIH0KIAogLSAoTlNTdHJpbmcgKil0 eXBlCiB7Ci0gICAgcmV0dXJuIFtzZWxmIF9lbWJlZEVsZW1lbnRdLT5nZXRBdHRyaWJ1dGUodHlw ZUF0dHIpOworICAgIHJldHVybiBbc2VsZiBfSFRNTEVtYmVkRWxlbWVudF0tPmdldEF0dHJpYnV0 ZSh0eXBlQXR0cik7CiB9CiAKIC0gKHZvaWQpc2V0VHlwZTooTlNTdHJpbmcgKil0eXBlCiB7Ci0g ICAgW3NlbGYgX2VtYmVkRWxlbWVudF0tPnNldEF0dHJpYnV0ZSh0eXBlQXR0ciwgdHlwZSk7Cisg ICAgW3NlbGYgX0hUTUxFbWJlZEVsZW1lbnRdLT5zZXRBdHRyaWJ1dGUodHlwZUF0dHIsIHR5cGUp OwogfQogCiAtIChpbnQpd2lkdGgKIHsKLSAgICByZXR1cm4gW3NlbGYgX2VtYmVkRWxlbWVudF0t PmdldEF0dHJpYnV0ZSh3aWR0aEF0dHIpLnRvSW50KCk7CisgICAgcmV0dXJuIFtzZWxmIF9IVE1M RW1iZWRFbGVtZW50XS0+Z2V0QXR0cmlidXRlKHdpZHRoQXR0cikudG9JbnQoKTsKIH0KIAogLSAo dm9pZClzZXRXaWR0aDooaW50KXdpZHRoCiB7Ci0gICAgW3NlbGYgX2VtYmVkRWxlbWVudF0tPnNl dEF0dHJpYnV0ZSh3aWR0aEF0dHIsIFN0cmluZzo6bnVtYmVyKHdpZHRoKSk7CisgICAgW3NlbGYg X0hUTUxFbWJlZEVsZW1lbnRdLT5zZXRBdHRyaWJ1dGUod2lkdGhBdHRyLCBTdHJpbmc6Om51bWJl cih3aWR0aCkpOwogfQogCiBAZW5kCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL29iamMvRE9NSW50 ZXJuYWwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL29iamMvRE9NSW50ZXJuYWwu aAkocmV2aXNpb24gMTYyNDApCisrKyBXZWJDb3JlL2JpbmRpbmdzL29iamMvRE9NSW50ZXJuYWwu aAkod29ya2luZyBjb3B5KQpAQCAtMjI1LDIyICsyMjUsMjIgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogCiBAaW50ZXJmYWNlIERPTUhUTUxUYWJsZUNhcHRpb25FbGVtZW50IChXZWJDb3JlSW50ZXJu YWwpCiArIChET01IVE1MVGFibGVDYXB0aW9uRWxlbWVudCAqKV9IVE1MVGFibGVDYXB0aW9uRWxl bWVudFdpdGg6KFdlYkNvcmU6OkhUTUxUYWJsZUNhcHRpb25FbGVtZW50ICopaW1wbDsKLS0gKFdl YkNvcmU6OkhUTUxUYWJsZUNhcHRpb25FbGVtZW50ICopX3RhYmxlQ2FwdGlvbkVsZW1lbnQ7Cist IChXZWJDb3JlOjpIVE1MVGFibGVDYXB0aW9uRWxlbWVudCAqKV9IVE1MVGFibGVDYXB0aW9uRWxl bWVudDsKIEBlbmQKIAogQGludGVyZmFjZSBET01IVE1MVGFibGVTZWN0aW9uRWxlbWVudCAoV2Vi Q29yZUludGVybmFsKQogKyAoRE9NSFRNTFRhYmxlU2VjdGlvbkVsZW1lbnQgKilfSFRNTFRhYmxl U2VjdGlvbkVsZW1lbnRXaXRoOihXZWJDb3JlOjpIVE1MVGFibGVTZWN0aW9uRWxlbWVudCAqKWlt cGw7Ci0tIChXZWJDb3JlOjpIVE1MVGFibGVTZWN0aW9uRWxlbWVudCAqKV90YWJsZVNlY3Rpb25F bGVtZW50OworLSAoV2ViQ29yZTo6SFRNTFRhYmxlU2VjdGlvbkVsZW1lbnQgKilfSFRNTFRhYmxl U2VjdGlvbkVsZW1lbnQ7CiBAZW5kCiAKIEBpbnRlcmZhY2UgRE9NSFRNTFRhYmxlRWxlbWVudCAo V2ViQ29yZUludGVybmFsKQogKyAoRE9NSFRNTFRhYmxlRWxlbWVudCAqKV9IVE1MVGFibGVFbGVt ZW50V2l0aDooV2ViQ29yZTo6SFRNTFRhYmxlRWxlbWVudCAqKWltcGw7Ci0tIChXZWJDb3JlOjpI VE1MVGFibGVFbGVtZW50ICopX3RhYmxlRWxlbWVudDsKKy0gKFdlYkNvcmU6OkhUTUxUYWJsZUVs ZW1lbnQgKilfSFRNTFRhYmxlRWxlbWVudDsKIEBlbmQKIAogQGludGVyZmFjZSBET01IVE1MVGFi bGVDZWxsRWxlbWVudCAoV2ViQ29yZUludGVybmFsKQogKyAoRE9NSFRNTFRhYmxlQ2VsbEVsZW1l bnQgKilfSFRNTFRhYmxlQ2VsbEVsZW1lbnRXaXRoOihXZWJDb3JlOjpIVE1MVGFibGVDZWxsRWxl bWVudCAqKWltcGw7Ci0tIChXZWJDb3JlOjpIVE1MVGFibGVDZWxsRWxlbWVudCAqKV90YWJsZUNl bGxFbGVtZW50OworLSAoV2ViQ29yZTo6SFRNTFRhYmxlQ2VsbEVsZW1lbnQgKilfSFRNTFRhYmxl Q2VsbEVsZW1lbnQ7CiBAZW5kCiAKIEBpbnRlcmZhY2UgRE9NSFRNTEltYWdlRWxlbWVudCAoV2Vi Q29yZUludGVybmFsKQpAQCAtMjUyLDcgKzI1Miw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIEBl bmQKIAogQGludGVyZmFjZSBET01IVE1MT3B0aW9uRWxlbWVudCAoV2ViQ29yZUludGVybmFsKQot LSAoV2ViQ29yZTo6SFRNTE9wdGlvbkVsZW1lbnQgKilfb3B0aW9uRWxlbWVudDsKKy0gKFdlYkNv cmU6OkhUTUxPcHRpb25FbGVtZW50ICopX0hUTUxPcHRpb25FbGVtZW50OwogQGVuZAogCiBAaW50 ZXJmYWNlIERPTUhUTUxJbnB1dEVsZW1lbnQgKFdlYkNvcmVJbnRlcm5hbCkKQEAgLTI5MSw3ICsy OTEsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIEBpbnRlcmZhY2UgRE9NQ1NTU3R5bGVEZWNs YXJhdGlvbiAoV2ViQ29yZUludGVybmFsKQogKyAoRE9NQ1NTU3R5bGVEZWNsYXJhdGlvbiAqKV9D U1NTdHlsZURlY2xhcmF0aW9uV2l0aDooV2ViQ29yZTo6Q1NTU3R5bGVEZWNsYXJhdGlvbiAqKWlt cGw7Ci0tIChXZWJDb3JlOjpDU1NTdHlsZURlY2xhcmF0aW9uICopX3N0eWxlRGVjbGFyYXRpb247 CistIChXZWJDb3JlOjpDU1NTdHlsZURlY2xhcmF0aW9uICopX0NTU1N0eWxlRGVjbGFyYXRpb247 CiBAZW5kCiAKIEBpbnRlcmZhY2UgRE9NQ1NTU3R5bGVTaGVldCAoV2ViQ29yZUludGVybmFsKQpJ bmRleDogV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JPYmpDLnBtCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yT2JqQy5wbQko cmV2aXNpb24gMTYyNDApCisrKyBXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRv ck9iakMucG0JKHdvcmtpbmcgY29weSkKQEAgLTI5OSw2ICsyOTksMTggQEAgc3ViIEdldE9iakNU eXBlTWFrZXIKICAgICByZXR1cm4gJHR5cGVNYWtlcjsKIH0KIAorc3ViIEdldE9iakNUeXBlR2V0 dGVyCit7CisgICAgbXkgJGFyZ05hbWUgPSBzaGlmdDsKKyAgICBteSAkdHlwZSA9ICRjb2RlR2Vu ZXJhdG9yLT5TdHJpcE1vZHVsZShzaGlmdCk7CisKKyAgICByZXR1cm4gJGFyZ05hbWUgaWYgJGNv ZGVHZW5lcmF0b3ItPklzUHJpbWl0aXZlVHlwZSgkdHlwZSkgb3IgJHR5cGUgZXEgIkRPTVN0cmlu ZyIgb3IgJHR5cGUgZXEgIlVSTCI7CisgICAgcmV0dXJuICJbbmF0aXZlUmVzb2x2ZXIgX3hwYXRo TlNSZXNvbHZlcl0iIGlmICR0eXBlIGVxICJYUGF0aE5TUmVzb2x2ZXIiOworICAgIHJldHVybiAi WyIgLiAkYXJnTmFtZSAuICIgX3hwYXRoUmVzdWx0XSIgaWYgJHR5cGUgZXEgIlhQYXRoUmVzdWx0 IjsKKyAgICByZXR1cm4gIlsiIC4gJGFyZ05hbWUgLiAiIF8iIC4gJHR5cGUgLiAiXSIgaWYgJHR5 cGUgPX4gL14oSFRNTHxDU1MpLzsKKyAgICByZXR1cm4gIlsiIC4gJGFyZ05hbWUgLiAiIF8iIC4g bGNmaXJzdCgkdHlwZSkgLiAiXSI7Cit9CisKIHN1YiBBZGRGb3J3YXJkRGVjbGFyYXRpb25zRm9y VHlwZQogewogICAgIG15ICR0eXBlID0gJGNvZGVHZW5lcmF0b3ItPlN0cmlwTW9kdWxlKHNoaWZ0 KTsKQEAgLTczMywxOSArNzQ1LDcgQEAgc3ViIEdlbmVyYXRlSW1wbGVtZW50YXRpb24KICAgICAg ICAgICAgICAgICAkYXR0cmlidXRlTmFtZSA9ICJzZXQiIC4gdWNmaXJzdCgkYXR0cmlidXRlTmFt ZSk7CiAgICAgICAgICAgICAgICAgbXkgJHNldHRlck5hbWUgPSAic2V0IiAuIHVjZmlyc3QoJGF0 dHJpYnV0ZUludGVyZmFjZU5hbWUpOwogICAgICAgICAgICAgICAgIG15ICRhcmdOYW1lID0gIm5l dyIgLiB1Y2ZpcnN0KCRhdHRyaWJ1dGVJbnRlcmZhY2VOYW1lKTsKLQotICAgICAgICAgICAgICAg ICMgRklYTUU6IHNob3VsZCBtb3ZlIHRoaXMgb3V0IGludG8gaXQncyBvd24gZnVjdGlvbiB0byBz aGFyZSB3aXRoCi0gICAgICAgICAgICAgICAgIyB0aGUgc2ltaWxhciBmdW5jdGlvbiBwYXJhbWV0 ZXIgY29kZSBiZWxvdy4KLSAgICAgICAgICAgICAgICBteSAkYXJnID0gIiI7Ci0gICAgICAgICAg ICAgICAgaWYgKCRjb2RlR2VuZXJhdG9yLT5Jc1ByaW1pdGl2ZVR5cGUoJGlkbFR5cGUpIG9yICRp ZGxUeXBlIGVxICJET01TdHJpbmciKSB7Ci0gICAgICAgICAgICAgICAgICAgICRhcmcgPSAkYXJn TmFtZTsKLSAgICAgICAgICAgICAgICB9IGVsc2lmICgkaWRsVHlwZSBlcSAiSFRNTFRhYmxlQ2Fw dGlvbkVsZW1lbnQiKSB7Ci0gICAgICAgICAgICAgICAgICAgICRhcmcgPSAiWyIgLiAkYXJnTmFt ZSAuICIgX3RhYmxlQ2FwdGlvbkVsZW1lbnRdIjsKLSAgICAgICAgICAgICAgICB9IGVsc2lmICgk aWRsVHlwZSBlcSAiSFRNTFRhYmxlU2VjdGlvbkVsZW1lbnQiKSB7Ci0gICAgICAgICAgICAgICAg ICAgICRhcmcgPSAiWyIgLiAkYXJnTmFtZSAuICIgX3RhYmxlU2VjdGlvbkVsZW1lbnRdIjsKLSAg ICAgICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgICAgICAkYXJnID0gIlsiIC4g JGFyZ05hbWUgLiAiIF8iIC4gbGNmaXJzdCgkaWRsVHlwZSkgLiAiXSI7Ci0gICAgICAgICAgICAg ICAgfQorICAgICAgICAgICAgICAgIG15ICRhcmcgPSBHZXRPYmpDVHlwZUdldHRlcigkYXJnTmFt ZSwgJGlkbFR5cGUpOwogCiAgICAgICAgICAgICAgICAgbXkgJHNldHRlclNpZyA9ICItICh2b2lk KSRzZXR0ZXJOYW1lOigkYXR0cmlidXRlVHlwZSkkYXJnTmFtZVxuIjsKIApAQCAtNzk2LDI4ICs3 OTYsMTEgQEAgc3ViIEdlbmVyYXRlSW1wbGVtZW50YXRpb24KIAogICAgICAgICAgICAgICAgIEFk ZEluY2x1ZGVzRm9yVHlwZSgkcGFyYW0tPnR5cGUpOwogCi0gICAgICAgICAgICAgICAgIyBGSVhN RTogc2hvdWxkIG1vdmUgdGhpcyBvdXQgaW50byBpdCdzIG93biBmdWN0aW9uIHRvIHNoYXJlIHdp dGgKLSAgICAgICAgICAgICAgICAjIHRoZSBzaW1pbGFyIHNldHRlciBwYXJhbWV0ZXIgY29kZSBh Ym92ZS4KICAgICAgICAgICAgICAgICBteSAkaWRsVHlwZSA9ICRjb2RlR2VuZXJhdG9yLT5TdHJp cE1vZHVsZSgkcGFyYW0tPnR5cGUpOwotICAgICAgICAgICAgICAgIGlmICgkY29kZUdlbmVyYXRv ci0+SXNQcmltaXRpdmVUeXBlKCRpZGxUeXBlKSBvciAkaWRsVHlwZSBlcSAiRE9NU3RyaW5nIikg ewotICAgICAgICAgICAgICAgICAgICBwdXNoKEBwYXJhbWV0ZXJOYW1lcywgJHBhcmFtTmFtZSk7 Ci0gICAgICAgICAgICAgICAgfSBlbHNpZiAoJGlkbFR5cGUgZXEgIlhQYXRoTlNSZXNvbHZlciIp IHsKLSAgICAgICAgICAgICAgICAgICAgbXkgJGltcGxHZXR0ZXIgPSAiW25hdGl2ZVJlc29sdmVy IF94cGF0aE5TUmVzb2x2ZXJdIjsKLSAgICAgICAgICAgICAgICAgICAgcHVzaChAcGFyYW1ldGVy TmFtZXMsICRpbXBsR2V0dGVyKTsKLSAgICAgICAgICAgICAgICAgICAgJG5lZWRzQ3VzdG9teyJY UGF0aE5TUmVzb2x2ZXIifSA9ICRwYXJhbU5hbWU7Ci0gICAgICAgICAgICAgICAgfSBlbHNpZiAo JGlkbFR5cGUgZXEgIlhQYXRoUmVzdWx0IikgewotICAgICAgICAgICAgICAgICAgICBteSAkaW1w bEdldHRlciA9ICJbIiAuICRwYXJhbU5hbWUgLiAiIF94cGF0aFJlc3VsdF0iOwotICAgICAgICAg ICAgICAgICAgICBwdXNoKEBwYXJhbWV0ZXJOYW1lcywgJGltcGxHZXR0ZXIpOwotICAgICAgICAg ICAgICAgIH0gZWxzaWYgKCRpZGxUeXBlIGVxICJIVE1MRWxlbWVudCIpIHsKLSAgICAgICAgICAg ICAgICAgICAgbXkgJGltcGxHZXR0ZXIgPSAiWyIgLiAkcGFyYW1OYW1lIC4gIiBfSFRNTEVsZW1l bnRdIjsKLSAgICAgICAgICAgICAgICAgICAgcHVzaChAcGFyYW1ldGVyTmFtZXMsICRpbXBsR2V0 dGVyKTsKLSAgICAgICAgICAgICAgICB9IGVsc2lmICgkaWRsVHlwZSBlcSAiSFRNTE9wdGlvbkVs ZW1lbnQiKSB7Ci0gICAgICAgICAgICAgICAgICAgIG15ICRpbXBsR2V0dGVyID0gIlsiIC4gJHBh cmFtTmFtZSAuICIgX29wdGlvbkVsZW1lbnRdIjsKLSAgICAgICAgICAgICAgICAgICAgcHVzaChA cGFyYW1ldGVyTmFtZXMsICRpbXBsR2V0dGVyKTsKLSAgICAgICAgICAgICAgICB9IGVsc2Ugewot ICAgICAgICAgICAgICAgICAgICBteSAkaW1wbEdldHRlciA9ICJbIiAuICRwYXJhbU5hbWUgLiAi IF8iIC4gbGNmaXJzdCgkaWRsVHlwZSkgLiAiXSI7Ci0gICAgICAgICAgICAgICAgICAgIHB1c2go QHBhcmFtZXRlck5hbWVzLCAkaW1wbEdldHRlcik7Ci0gICAgICAgICAgICAgICAgfQorICAgICAg ICAgICAgICAgIG15ICRpbXBsR2V0dGVyID0gR2V0T2JqQ1R5cGVHZXR0ZXIoJHBhcmFtTmFtZSwg JGlkbFR5cGUpOworCisgICAgICAgICAgICAgICAgcHVzaChAcGFyYW1ldGVyTmFtZXMsICRpbXBs R2V0dGVyKTsKKyAgICAgICAgICAgICAgICAkbmVlZHNDdXN0b217IlhQYXRoTlNSZXNvbHZlciJ9 ID0gJHBhcmFtTmFtZSBpZiAkaWRsVHlwZSBlcSAiWFBhdGhOU1Jlc29sdmVyIjsKIAogICAgICAg ICAgICAgICAgIHVubGVzcyAoJGNvZGVHZW5lcmF0b3ItPklzUHJpbWl0aXZlVHlwZSgkaWRsVHlw ZSkgb3IgJGlkbFR5cGUgZXEgIkRPTVN0cmluZyIpIHsKICAgICAgICAgICAgICAgICAgICAgcHVz aChAbmVlZHNBc3NlcnQsICIgICAgQVNTRVJUKCRwYXJhbU5hbWUpO1xuIik7CkluZGV4OiBXZWJD b3JlL2JyaWRnZS9tYWMvV2ViQ29yZUZyYW1lQnJpZGdlLm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvYnJpZGdlL21hYy9XZWJDb3JlRnJhbWVCcmlkZ2UubW0JKHJldmlzaW9uIDE2MjQwKQorKysg V2ViQ29yZS9icmlkZ2UvbWFjL1dlYkNvcmVGcmFtZUJyaWRnZS5tbQkod29ya2luZyBjb3B5KQpA QCAtMjIyMywzNSArMjIyMywzNSBAQCBzdGF0aWMgSFRNTEZvcm1FbGVtZW50ICpmb3JtRWxlbWVu dEZyb21ECiB7CiAgICAgaWYgKCFtX2ZyYW1lKQogICAgICAgICByZXR1cm47Ci0gICAgbV9mcmFt ZS0+Y29tcHV0ZUFuZFNldFR5cGluZ1N0eWxlKFtzdHlsZSBfc3R5bGVEZWNsYXJhdGlvbl0sIHN0 YXRpY19jYXN0PEVkaXRBY3Rpb24+KHVuZG9BY3Rpb24pKTsKKyAgICBtX2ZyYW1lLT5jb21wdXRl QW5kU2V0VHlwaW5nU3R5bGUoW3N0eWxlIF9DU1NTdHlsZURlY2xhcmF0aW9uXSwgc3RhdGljX2Nh c3Q8RWRpdEFjdGlvbj4odW5kb0FjdGlvbikpOwogfQogCiAtICh2b2lkKWFwcGx5U3R5bGU6KERP TUNTU1N0eWxlRGVjbGFyYXRpb24gKilzdHlsZSB3aXRoVW5kb0FjdGlvbjooV2ViVW5kb0FjdGlv bil1bmRvQWN0aW9uCiB7CiAgICAgaWYgKCFtX2ZyYW1lKQogICAgICAgICByZXR1cm47Ci0gICAg bV9mcmFtZS0+YXBwbHlTdHlsZShbc3R5bGUgX3N0eWxlRGVjbGFyYXRpb25dLCBzdGF0aWNfY2Fz dDxFZGl0QWN0aW9uPih1bmRvQWN0aW9uKSk7CisgICAgbV9mcmFtZS0+YXBwbHlTdHlsZShbc3R5 bGUgX0NTU1N0eWxlRGVjbGFyYXRpb25dLCBzdGF0aWNfY2FzdDxFZGl0QWN0aW9uPih1bmRvQWN0 aW9uKSk7CiB9CiAKIC0gKHZvaWQpYXBwbHlQYXJhZ3JhcGhTdHlsZTooRE9NQ1NTU3R5bGVEZWNs YXJhdGlvbiAqKXN0eWxlIHdpdGhVbmRvQWN0aW9uOihXZWJVbmRvQWN0aW9uKXVuZG9BY3Rpb24K IHsKICAgICBpZiAoIW1fZnJhbWUpCiAgICAgICAgIHJldHVybjsKLSAgICBtX2ZyYW1lLT5hcHBs eVBhcmFncmFwaFN0eWxlKFtzdHlsZSBfc3R5bGVEZWNsYXJhdGlvbl0sIHN0YXRpY19jYXN0PEVk aXRBY3Rpb24+KHVuZG9BY3Rpb24pKTsKKyAgICBtX2ZyYW1lLT5hcHBseVBhcmFncmFwaFN0eWxl KFtzdHlsZSBfQ1NTU3R5bGVEZWNsYXJhdGlvbl0sIHN0YXRpY19jYXN0PEVkaXRBY3Rpb24+KHVu ZG9BY3Rpb24pKTsKIH0KIAogLSAoQk9PTClzZWxlY3Rpb25TdGFydEhhc1N0eWxlOihET01DU1NT dHlsZURlY2xhcmF0aW9uICopc3R5bGUKIHsKICAgICBpZiAoIW1fZnJhbWUpCiAgICAgICAgIHJl dHVybiBOTzsKLSAgICByZXR1cm4gbV9mcmFtZS0+c2VsZWN0aW9uU3RhcnRIYXNTdHlsZShbc3R5 bGUgX3N0eWxlRGVjbGFyYXRpb25dKTsKKyAgICByZXR1cm4gbV9mcmFtZS0+c2VsZWN0aW9uU3Rh cnRIYXNTdHlsZShbc3R5bGUgX0NTU1N0eWxlRGVjbGFyYXRpb25dKTsKIH0KIAogLSAoTlNDZWxs U3RhdGVWYWx1ZSlzZWxlY3Rpb25IYXNTdHlsZTooRE9NQ1NTU3R5bGVEZWNsYXJhdGlvbiAqKXN0 eWxlCiB7CiAgICAgaWYgKCFtX2ZyYW1lKQogICAgICAgICByZXR1cm4gTlNPZmZTdGF0ZTsKLSAg ICBzd2l0Y2ggKG1fZnJhbWUtPnNlbGVjdGlvbkhhc1N0eWxlKFtzdHlsZSBfc3R5bGVEZWNsYXJh dGlvbl0pKSB7CisgICAgc3dpdGNoIChtX2ZyYW1lLT5zZWxlY3Rpb25IYXNTdHlsZShbc3R5bGUg X0NTU1N0eWxlRGVjbGFyYXRpb25dKSkgewogICAgICAgICBjYXNlIEZyYW1lOjpmYWxzZVRyaVN0 YXRlOgogICAgICAgICAgICAgcmV0dXJuIE5TT2ZmU3RhdGU7CiAgICAgICAgIGNhc2UgRnJhbWU6 OnRydWVUcmlTdGF0ZToK