30901 2009-10-28 23:06:05 -0700 [Gtk] Need to de-lint the Atk a11y code 2009-11-11 03:17:33 -0800 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC Linux RESOLVED FIXED P5 Trivial --- 0 jdiggs webkit-unassigned commit-queue jmalonzo xan.lopez oldest_to_newest 158840 0 jdiggs 2009-10-28 23:06:05 -0700 * Remove trailing whitespace * NULL should be 0 * AXFoo should be axFoo Feel free to add to this list, as long as it's in the Atk code. :-) 161856 1 42813 jdiggs 2009-11-09 17:30:42 -0800 Created attachment 42813 proposed patch Discovered a signed/unsigned comparison warning that I was responsible for. :-/ Seemed like a good excuse to de-lint... :-) * NULL should be 0 * Caps in keeping with the style guidelines * Remove trailing whitespace * No space between the pointer type and the '*' * Remove the aforementioned signed/unsigned comparison 161990 2 42813 jmalonzo 2009-11-10 01:43:49 -0800 Comment on attachment 42813 proposed patch Thanks for the cleanup. r=me. 161994 3 42813 commit-queue 2009-11-10 01:53:42 -0800 Comment on attachment 42813 proposed patch Clearing flags on attachment: 42813 Committed r50727: <http://trac.webkit.org/changeset/50727> 161995 4 commit-queue 2009-11-10 01:53:46 -0800 All reviewed patches have been landed. Closing bug. 162331 5 jdiggs 2009-11-10 20:35:47 -0800 Reopening because I found another handful of capitalization style-guideline violations I had missed and just don't see opening a new bug. 162332 6 42921 jdiggs 2009-11-10 20:36:42 -0800 Created attachment 42921 Correct some capitalization nits 162421 7 42921 jmalonzo 2009-11-11 03:05:06 -0800 Comment on attachment 42921 Correct some capitalization nits r=me. 162425 8 42921 commit-queue 2009-11-11 03:17:29 -0800 Comment on attachment 42921 Correct some capitalization nits Clearing flags on attachment: 42921 Committed r50797: <http://trac.webkit.org/changeset/50797> 162426 9 commit-queue 2009-11-11 03:17:33 -0800 All reviewed patches have been landed. Closing bug. 42813 2009-11-09 17:30:42 -0800 2009-11-10 01:53:41 -0800 proposed patch 30901.patch text/plain 14664 jdiggs RnJvbSAxZTc5NDlmMDM4YjEzMDdhZjhjZDliMWMwODZmYzQ5YjVhMWZlNzUyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2FubWFyaWUgRGlnZ3MgPGpvYW5tYXJpZS5kaWdnc0BnbWFp bC5jb20+CkRhdGU6IE1vbiwgOSBOb3YgMjAwOSAyMDowNzozOCAtMDUwMApTdWJqZWN0OiBbUEFU Q0hdIDIwMDktMTEtMDkgIEpvYW5tYXJpZSBEaWdncyAgPGpvYW5tYXJpZS5kaWdnc0BnbWFpbC5j b20+CgogICAgICAgIFJldmlld2VkIGJ5IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzA5MDEKICAgICAg ICBbR3RrXSBOZWVkIHRvIGRlLWxpbnQgdGhlIEF0ayBhMTF5IGNvZGUKCiAgICAgICAgUmVtb3Zh bCBvZiB2YXJpb3VzIGFuZCBzdW5kcnkgc3R5bGUtdmlvbGF0aW5nIG5pdHMuCgogICAgICAgICog YWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJBdGsuY3BwOgotLS0K IFdlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAx MSArKwogLi4uL2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHAgICAgICAgICAg fCAgMTE2ICsrKysrKysrKystLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDY5IGluc2VydGlv bnMoKyksIDU4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIv V2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDc0ZGRkMC4uOWNjMGUyMSAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAor MjAwOS0xMS0wOSAgSm9hbm1hcmllIERpZ2dzICA8am9hbm1hcmllLmRpZ2dzQGdtYWlsLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzA5MDEKKyAgICAg ICAgW0d0a10gTmVlZCB0byBkZS1saW50IHRoZSBBdGsgYTExeSBjb2RlCisKKyAgICAgICAgUmVt b3ZhbCBvZiB2YXJpb3VzIGFuZCBzdW5kcnkgc3R5bGUtdmlvbGF0aW5nIG5pdHMuCisKKyAgICAg ICAgKiBhY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHA6 CisKIDIwMDktMTEtMDkgIE5vcmJlcnQgTGVzZXIgIDxub3JiZXJ0Lmxlc2VyQG5va2lhLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KZGlmZiAt LWdpdCBhL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBw ZXJBdGsuY3BwIGIvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0 V3JhcHBlckF0ay5jcHAKaW5kZXggNjdmZDI5ZC4uODZiYzM3MyAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHAKKysr IGIvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0 ay5jcHAKQEAgLTE5OSw3ICsxOTksNyBAQCBzdGF0aWMgdm9pZCBzZXRBdGtSZWxhdGlvblNldEZy b21Db3JlT2JqZWN0KEFjY2Vzc2liaWxpdHlPYmplY3QqIGNvcmVPYmplY3QsIEF0awogICAgIH0K IH0KIAotc3RhdGljIGdwb2ludGVyIHdlYmtpdF9hY2Nlc3NpYmxlX3BhcmVudF9jbGFzcyA9IE5V TEw7CitzdGF0aWMgZ3BvaW50ZXIgd2Via2l0X2FjY2Vzc2libGVfcGFyZW50X2NsYXNzID0gMDsK IAogc3RhdGljIEF0a09iamVjdCogYXRrUGFyZW50T2ZXZWJWaWV3KEF0a09iamVjdCogb2JqZWN0 KQogewpAQCAtMjQ3LDEzICsyNDcsMTMgQEAgc3RhdGljIEF0a09iamVjdCogd2Via2l0X2FjY2Vz c2libGVfcmVmX2NoaWxkKEF0a09iamVjdCogb2JqZWN0LCBnaW50IGluZGV4KQogewogICAgIEFj Y2Vzc2liaWxpdHlPYmplY3QqIGNvcmVPYmplY3QgPSBjb3JlKG9iamVjdCk7CiAgICAgQWNjZXNz aWJpbGl0eU9iamVjdDo6QWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yIGNoaWxkcmVuID0gY29y ZU9iamVjdC0+Y2hpbGRyZW4oKTsKLSAgICBpZiAoaW5kZXggPCAwIHx8IGluZGV4ID49IGNoaWxk cmVuLnNpemUoKSkKKyAgICBpZiAoaW5kZXggPCAwIHx8IHN0YXRpY19jYXN0PHVuc2lnbmVkPihp bmRleCkgPj0gY2hpbGRyZW4uc2l6ZSgpKQogICAgICAgICByZXR1cm4gMDsKIAogICAgIEFjY2Vz c2liaWxpdHlPYmplY3QqIGNvcmVDaGlsZCA9IGNoaWxkcmVuLmF0KGluZGV4KS5nZXQoKTsKIAog ICAgIGlmICghY29yZUNoaWxkKQotICAgICAgICByZXR1cm4gTlVMTDsKKyAgICAgICAgcmV0dXJu IDA7CiAKICAgICBBdGtPYmplY3QqIGNoaWxkID0gY29yZUNoaWxkLT53cmFwcGVyKCk7CiAgICAg YXRrX29iamVjdF9zZXRfcGFyZW50KGNoaWxkLCBvYmplY3QpOwpAQCAtMzA0LDcgKzMwNCw3IEBA IHN0YXRpYyBBdGtBdHRyaWJ1dGVTZXQqIGFkZEF0dHJpYnV0ZVRvU2V0KEF0a0F0dHJpYnV0ZVNl dCogYXR0cmlidXRlU2V0LCBjb25zdCBjCiAKIHN0YXRpYyBBdGtBdHRyaWJ1dGVTZXQqIHdlYmtp dF9hY2Nlc3NpYmxlX2dldF9hdHRyaWJ1dGVzKEF0a09iamVjdCogb2JqZWN0KQogewotICAgIEF0 a0F0dHJpYnV0ZVNldCogYXR0cmlidXRlU2V0ID0gTlVMTDsKKyAgICBBdGtBdHRyaWJ1dGVTZXQq IGF0dHJpYnV0ZVNldCA9IDA7CiAKICAgICBpbnQgaGVhZGluZ0xldmVsID0gY29yZShvYmplY3Qp LT5oZWFkaW5nTGV2ZWwoKTsKICAgICBpZiAoaGVhZGluZ0xldmVsKSB7CkBAIC01OTIsMTUgKzU5 MiwxNSBAQCB3ZWJraXRfYWNjZXNzaWJsZV9nZXRfdHlwZSh2b2lkKQogICAgIGlmIChnX29uY2Vf aW5pdF9lbnRlcigmdHlwZV92b2xhdGlsZSkpIHsKICAgICAgICAgc3RhdGljIGNvbnN0IEdUeXBl SW5mbyB0aW5mbyA9IHsKICAgICAgICAgICAgIHNpemVvZihXZWJLaXRBY2Nlc3NpYmxlQ2xhc3Mp LAotICAgICAgICAgICAgKEdCYXNlSW5pdEZ1bmMpTlVMTCwKLSAgICAgICAgICAgIChHQmFzZUZp bmFsaXplRnVuYylOVUxMLAotICAgICAgICAgICAgKEdDbGFzc0luaXRGdW5jKXdlYmtpdF9hY2Nl c3NpYmxlX2NsYXNzX2luaXQsCi0gICAgICAgICAgICAoR0NsYXNzRmluYWxpemVGdW5jKU5VTEws Ci0gICAgICAgICAgICBOVUxMLCAvKiBjbGFzcyBkYXRhICovCisgICAgICAgICAgICAoR0Jhc2VJ bml0RnVuYykgMCwKKyAgICAgICAgICAgIChHQmFzZUZpbmFsaXplRnVuYykgMCwKKyAgICAgICAg ICAgIChHQ2xhc3NJbml0RnVuYykgd2Via2l0X2FjY2Vzc2libGVfY2xhc3NfaW5pdCwKKyAgICAg ICAgICAgIChHQ2xhc3NGaW5hbGl6ZUZ1bmMpIDAsCisgICAgICAgICAgICAwLCAvKiBjbGFzcyBk YXRhICovCiAgICAgICAgICAgICBzaXplb2YoV2ViS2l0QWNjZXNzaWJsZSksIC8qIGluc3RhbmNl IHNpemUgKi8KICAgICAgICAgICAgIDAsIC8qIG5iIHByZWFsbG9jcyAqLwotICAgICAgICAgICAg KEdJbnN0YW5jZUluaXRGdW5jKU5VTEwsCi0gICAgICAgICAgICBOVUxMIC8qIHZhbHVlIHRhYmxl ICovCisgICAgICAgICAgICAoR0luc3RhbmNlSW5pdEZ1bmMpIDAsCisgICAgICAgICAgICAwIC8q IHZhbHVlIHRhYmxlICovCiAgICAgICAgIH07CiAKICAgICAgICAgR1R5cGUgdHlwZSA9IGdfdHlw ZV9yZWdpc3Rlcl9zdGF0aWMoQVRLX1RZUEVfT0JKRUNULApAQCAtNjI0LDcgKzYyNCw3IEBAIHN0 YXRpYyBnaW50IHdlYmtpdF9hY2Nlc3NpYmxlX2FjdGlvbl9nZXRfbl9hY3Rpb25zKEF0a0FjdGlv biogYWN0aW9uKQogCiBzdGF0aWMgY29uc3QgZ2NoYXIqIHdlYmtpdF9hY2Nlc3NpYmxlX2FjdGlv bl9nZXRfZGVzY3JpcHRpb24oQXRrQWN0aW9uKiBhY3Rpb24sIGdpbnQgaSkKIHsKLSAgICBnX3Jl dHVybl92YWxfaWZfZmFpbChpID09IDAsIE5VTEwpOworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWls KGkgPT0gMCwgMCk7CiAgICAgLy8gVE9ETzogTmVlZCBhIHdheSB0byBwcm92aWRlL2xvY2FsaXpl IGFjdGlvbiBkZXNjcmlwdGlvbnMuCiAgICAgbm90SW1wbGVtZW50ZWQoKTsKICAgICByZXR1cm4g IiI7CkBAIC02MzIsMTQgKzYzMiwxNCBAQCBzdGF0aWMgY29uc3QgZ2NoYXIqIHdlYmtpdF9hY2Nl c3NpYmxlX2FjdGlvbl9nZXRfZGVzY3JpcHRpb24oQXRrQWN0aW9uKiBhY3Rpb24sCiAKIHN0YXRp YyBjb25zdCBnY2hhciogd2Via2l0X2FjY2Vzc2libGVfYWN0aW9uX2dldF9rZXliaW5kaW5nKEF0 a0FjdGlvbiogYWN0aW9uLCBnaW50IGkpCiB7Ci0gICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoaSA9 PSAwLCBOVUxMKTsKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChpID09IDAsIDApOwogICAgIC8v IEZJWE1FOiBDb25zdHJ1Y3QgYSBwcm9wZXIga2V5YmluZGluZyBzdHJpbmcuCiAgICAgcmV0dXJu IHJldHVyblN0cmluZyhjb3JlKGFjdGlvbiktPmFjY2Vzc0tleSgpLnN0cmluZygpKTsKIH0KIAog c3RhdGljIGNvbnN0IGdjaGFyKiB3ZWJraXRfYWNjZXNzaWJsZV9hY3Rpb25fZ2V0X25hbWUoQXRr QWN0aW9uKiBhY3Rpb24sIGdpbnQgaSkKIHsKLSAgICBnX3JldHVybl92YWxfaWZfZmFpbChpID09 IDAsIE5VTEwpOworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKGkgPT0gMCwgMCk7CiAgICAgcmV0 dXJuIHJldHVyblN0cmluZyhjb3JlKGFjdGlvbiktPmFjdGlvblZlcmIoKSk7CiB9CiAKQEAgLTg0 MCwxMiArODQwLDEyIEBAIHN0YXRpYyBnY2hhciogY29udmVydFVuaUNoYXJUb1VURjgoY29uc3Qg VUNoYXIqIGNoYXJhY3RlcnMsIGdpbnQgbGVuZ3RoLCBpbnQgZnJvCiB7CiAgICAgQ1N0cmluZyBz dHJpbmdVVEY4ID0gVVRGOEVuY29kaW5nKCkuZW5jb2RlKGNoYXJhY3RlcnMsIGxlbmd0aCwgUXVl c3Rpb25NYXJrc0ZvclVuZW5jb2RhYmxlcyk7CiAgICAgZ2NoYXIqIHV0ZjhTdHJpbmcgPSB1dGY4 U3Vic3RyKHN0cmluZ1VURjguZGF0YSgpLCBmcm9tLCB0byk7Ci0gICAgaWYgKCFnX3V0ZjhfdmFs aWRhdGUodXRmOFN0cmluZywgLTEsIE5VTEwpKSB7CisgICAgaWYgKCFnX3V0ZjhfdmFsaWRhdGUo dXRmOFN0cmluZywgLTEsIDApKSB7CiAgICAgICAgIGdfZnJlZSh1dGY4U3RyaW5nKTsKICAgICAg ICAgcmV0dXJuIDA7CiAgICAgfQogICAgIGdzaXplIGxlbiA9IHN0cmxlbih1dGY4U3RyaW5nKTsK LSAgICBHU3RyaW5nKiByZXQgPSBnX3N0cmluZ19uZXdfbGVuKE5VTEwsIGxlbik7CisgICAgR1N0 cmluZyogcmV0ID0gZ19zdHJpbmdfbmV3X2xlbigwLCBsZW4pOwogICAgIGdjaGFyKiBwdHIgPSB1 dGY4U3RyaW5nOwogCiAgICAgLy8gV2ViQ29yZSBpbnRyb2R1Y2VzIGxpbmUgYnJlYWtzIGluIHRo ZSB0ZXh0IHRoYXQgZG8gbm90IHJlZmxlY3QKQEAgLTg3Niw3ICs4NzYsNyBAQCBzdGF0aWMgUGFu Z29MYXlvdXQqIGdldFBhbmdvTGF5b3V0Rm9yQXRrKEF0a1RleHQqIHRleHRPYmplY3QpCiAgICAg aWYgKCF3ZWJWaWV3KQogICAgICAgICByZXR1cm4gMDsKIAotICAgIEdTdHJpbmcqIHN0ciA9IGdf c3RyaW5nX25ldyhOVUxMKTsKKyAgICBHU3RyaW5nKiBzdHIgPSBnX3N0cmluZ19uZXcoMCk7CiAK ICAgICBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0KiBhY2NPYmplY3QgPSBzdGF0aWNfY2FzdDxB Y2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Kj4oY29yZU9iamVjdCk7CiAgICAgaWYgKCFhY2NPYmpl Y3QpCkBAIC04ODgsNyArODg4LDcgQEAgc3RhdGljIFBhbmdvTGF5b3V0KiBnZXRQYW5nb0xheW91 dEZvckF0ayhBdGtUZXh0KiB0ZXh0T2JqZWN0KQogICAgIC8vIENyZWF0ZSBhIHN0cmluZyB3aXRo IHRoZSBsYXlvdXQgYXMgaXQgYXBwZWFycyBvbiB0aGUgc2NyZWVuCiAgICAgSW5saW5lVGV4dEJv eCogYm94ID0gcmVuZGVyVGV4dC0+Zmlyc3RUZXh0Qm94KCk7CiAgICAgd2hpbGUgKGJveCkgewot ICAgICAgICBnY2hhciAqdGV4dCA9IGNvbnZlcnRVbmlDaGFyVG9VVEY4KHJlbmRlclRleHQtPmNo YXJhY3RlcnMoKSwgcmVuZGVyVGV4dC0+dGV4dExlbmd0aCgpLCBib3gtPnN0YXJ0KCksIGJveC0+ ZW5kKCkpOworICAgICAgICBnY2hhciogdGV4dCA9IGNvbnZlcnRVbmlDaGFyVG9VVEY4KHJlbmRl clRleHQtPmNoYXJhY3RlcnMoKSwgcmVuZGVyVGV4dC0+dGV4dExlbmd0aCgpLCBib3gtPnN0YXJ0 KCksIGJveC0+ZW5kKCkpOwogICAgICAgICBnX3N0cmluZ19hcHBlbmQoc3RyLCB0ZXh0KTsKICAg ICAgICAgZ19zdHJpbmdfYXBwZW5kKHN0ciwgIlxuIik7CiAgICAgICAgIGJveCA9IGJveC0+bmV4 dFRleHRCb3goKTsKQEAgLTkxNyw3ICs5MTcsNyBAQCBzdGF0aWMgZ2NoYXIqIHdlYmtpdF9hY2Nl c3NpYmxlX3RleHRfZ2V0X3RleHRfYmVmb3JlX29mZnNldChBdGtUZXh0KiB0ZXh0LCBnaW50CiBz dGF0aWMgZ3VuaWNoYXIgd2Via2l0X2FjY2Vzc2libGVfdGV4dF9nZXRfY2hhcmFjdGVyX2F0X29m ZnNldChBdGtUZXh0KiB0ZXh0LCBnaW50IG9mZnNldCkKIHsKICAgICBub3RJbXBsZW1lbnRlZCgp OwotICAgIHJldHVybiBOVUxMOworICAgIHJldHVybiAwOwogfQogCiBzdGF0aWMgZ2ludCB3ZWJr aXRfYWNjZXNzaWJsZV90ZXh0X2dldF9jYXJldF9vZmZzZXQoQXRrVGV4dCogdGV4dCkKQEAgLTky OSwxMyArOTI5LDEzIEBAIHN0YXRpYyBnaW50IHdlYmtpdF9hY2Nlc3NpYmxlX3RleHRfZ2V0X2Nh cmV0X29mZnNldChBdGtUZXh0KiB0ZXh0KQogc3RhdGljIEF0a0F0dHJpYnV0ZVNldCogd2Via2l0 X2FjY2Vzc2libGVfdGV4dF9nZXRfcnVuX2F0dHJpYnV0ZXMoQXRrVGV4dCogdGV4dCwgZ2ludCBv ZmZzZXQsIGdpbnQqIHN0YXJ0X29mZnNldCwgZ2ludCogZW5kX29mZnNldCkKIHsKICAgICBub3RJ bXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBOVUxMOworICAgIHJldHVybiAwOwogfQogCiBzdGF0 aWMgQXRrQXR0cmlidXRlU2V0KiB3ZWJraXRfYWNjZXNzaWJsZV90ZXh0X2dldF9kZWZhdWx0X2F0 dHJpYnV0ZXMoQXRrVGV4dCogdGV4dCkKIHsKICAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJl dHVybiBOVUxMOworICAgIHJldHVybiAwOwogfQogCiBzdGF0aWMgdm9pZCB3ZWJraXRfYWNjZXNz aWJsZV90ZXh0X2dldF9jaGFyYWN0ZXJfZXh0ZW50cyhBdGtUZXh0KiB0ZXh0LCBnaW50IG9mZnNl dCwgZ2ludCogeCwgZ2ludCogeSwgZ2ludCogd2lkdGgsIGdpbnQqIGhlaWdodCwgQXRrQ29vcmRU eXBlIGNvb3JkcykKQEAgLTk4MCw3ICs5ODAsNyBAQCBzdGF0aWMgZ2ludCB3ZWJraXRfYWNjZXNz aWJsZV90ZXh0X2dldF9vZmZzZXRfYXRfcG9pbnQoQXRrVGV4dCogdGV4dCwgZ2ludCB4LCBnaQog ICAgIHJldHVybiByYW5nZS5zdGFydDsKIH0KIAotc3RhdGljIGJvb2wgc2VsZWN0aW9uQmVsb25n c1RvT2JqZWN0KEFjY2Vzc2liaWxpdHlPYmplY3QgKmNvcmVPYmplY3QsIFZpc2libGVTZWxlY3Rp b24mIHNlbGVjdGlvbikKK3N0YXRpYyBib29sIHNlbGVjdGlvbkJlbG9uZ3NUb09iamVjdChBY2Nl c3NpYmlsaXR5T2JqZWN0KiBjb3JlT2JqZWN0LCBWaXNpYmxlU2VsZWN0aW9uJiBzZWxlY3Rpb24p CiB7CiAgICAgaWYgKCFjb3JlT2JqZWN0LT5pc0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QoKSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMTAxNSw3ICsxMDE1LDcgQEAgc3RhdGljIGdjaGFy KiB3ZWJraXRfYWNjZXNzaWJsZV90ZXh0X2dldF9zZWxlY3Rpb24oQXRrVGV4dCogdGV4dCwgZ2lu dCBzZWxlY3Rpb24KICAgICAvLyB0aGUgZ2xvYmFsIG9uZSAodGhlIEFQSSBpcyBhIGJpdCBjb25m dXNpbmcpCiAgICAgaWYgKHNlbGVjdGlvbl9udW0gIT0gMCB8fCAhc2VsZWN0aW9uQmVsb25nc1Rv T2JqZWN0KGNvcmVPYmplY3QsIHNlbGVjdGlvbikpIHsKICAgICAgICAgKnN0YXJ0X29mZnNldCA9 ICplbmRfb2Zmc2V0ID0gMDsKLSAgICAgICAgcmV0dXJuIE5VTEw7CisgICAgICAgIHJldHVybiAw OwogICAgIH0KIAogICAgICpzdGFydF9vZmZzZXQgPSBzZWxlY3Rpb24uc3RhcnQoKS5vZmZzZXRJ bkNvbnRhaW5lck5vZGUoKTsKQEAgLTEyMDEsNyArMTIwMSw3IEBAIHN0YXRpYyBBdGtPYmplY3Qq IHdlYmtpdF9hY2Nlc3NpYmxlX2NvbXBvbmVudF9yZWZfYWNjZXNzaWJsZV9hdF9wb2ludChBdGtD b21wb25lCiAgICAgSW50UG9pbnQgcG9zID0gYXRrVG9Db250ZW50cyhjb3JlKGNvbXBvbmVudCks IGNvb3JkVHlwZSwgeCwgeSk7CiAgICAgQWNjZXNzaWJpbGl0eU9iamVjdCogdGFyZ2V0ID0gY29y ZShjb21wb25lbnQpLT5kb0FjY2Vzc2liaWxpdHlIaXRUZXN0KHBvcyk7CiAgICAgaWYgKCF0YXJn ZXQpCi0gICAgICAgIHJldHVybiBOVUxMOworICAgICAgICByZXR1cm4gMDsKICAgICBnX29iamVj dF9yZWYodGFyZ2V0LT53cmFwcGVyKCkpOwogICAgIHJldHVybiB0YXJnZXQtPndyYXBwZXIoKTsK IH0KQEAgLTEyMTgsNyArMTIxOCw3IEBAIHN0YXRpYyBnYm9vbGVhbiB3ZWJraXRfYWNjZXNzaWJs ZV9jb21wb25lbnRfZ3JhYl9mb2N1cyhBdGtDb21wb25lbnQqIGNvbXBvbmVudCkKICAgICByZXR1 cm4gY29yZShjb21wb25lbnQpLT5pc0ZvY3VzZWQoKTsKIH0KIAotc3RhdGljIHZvaWQgYXRrX2Nv bXBvbmVudF9pbnRlcmZhY2VfaW5pdChBdGtDb21wb25lbnRJZmFjZSAqaWZhY2UpCitzdGF0aWMg dm9pZCBhdGtfY29tcG9uZW50X2ludGVyZmFjZV9pbml0KEF0a0NvbXBvbmVudElmYWNlKiBpZmFj ZSkKIHsKICAgICBpZmFjZS0+cmVmX2FjY2Vzc2libGVfYXRfcG9pbnQgPSB3ZWJraXRfYWNjZXNz aWJsZV9jb21wb25lbnRfcmVmX2FjY2Vzc2libGVfYXRfcG9pbnQ7CiAgICAgaWZhY2UtPmdldF9l eHRlbnRzID0gd2Via2l0X2FjY2Vzc2libGVfY29tcG9uZW50X2dldF9leHRlbnRzOwpAQCAtMTI2 NSwxNCArMTI2NSwxNCBAQCBzdGF0aWMgQWNjZXNzaWJpbGl0eVRhYmxlQ2VsbCogY2VsbChBdGtU YWJsZSogdGFibGUsIGd1aW50IHJvdywgZ3VpbnQgY29sdW1uKQogICAgIHJldHVybiAwOwogfQog Ci1zdGF0aWMgZ2ludCBjZWxsSW5kZXgoQWNjZXNzaWJpbGl0eVRhYmxlQ2VsbCogQVhDZWxsLCBB Y2Nlc3NpYmlsaXR5VGFibGUqIEFYVGFibGUpCitzdGF0aWMgZ2ludCBjZWxsSW5kZXgoQWNjZXNz aWJpbGl0eVRhYmxlQ2VsbCogYXhDZWxsLCBBY2Nlc3NpYmlsaXR5VGFibGUqIGF4VGFibGUpCiB7 CiAgICAgLy8gQ2FsY3VsYXRlIHRoZSBjZWxsJ3MgaW5kZXggYXMgaWYgd2UgaGFkIGEgdHJhZGl0 aW9uYWwgR3RrKyB0YWJsZSBpbgogICAgIC8vIHdoaWNoIGNlbGxzIGFyZSBhbGwgZGlyZWN0IGNo aWxkcmVuIG9mIHRoZSB0YWJsZSwgYXJyYW5nZWQgcm93LWZpcnN0LgogICAgIEFjY2Vzc2liaWxp dHlPYmplY3Q6OkFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciBhbGxDZWxsczsKLSAgICBBWFRh YmxlLT5jZWxscyhhbGxDZWxscyk7CisgICAgYXhUYWJsZS0+Y2VsbHMoYWxsQ2VsbHMpOwogICAg IEFjY2Vzc2liaWxpdHlPYmplY3Q6OkFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3Rvcjo6aXRlcmF0 b3IgcG9zaXRpb247Ci0gICAgcG9zaXRpb24gPSBzdGQ6OmZpbmQoYWxsQ2VsbHMuYmVnaW4oKSwg YWxsQ2VsbHMuZW5kKCksIEFYQ2VsbCk7CisgICAgcG9zaXRpb24gPSBzdGQ6OmZpbmQoYWxsQ2Vs bHMuYmVnaW4oKSwgYWxsQ2VsbHMuZW5kKCksIGF4Q2VsbCk7CiAgICAgaWYgKHBvc2l0aW9uID09 IGFsbENlbGxzLmVuZCgpKQogICAgICAgICByZXR1cm4gLTE7CiAgICAgcmV0dXJuIHBvc2l0aW9u IC0gYWxsQ2VsbHMuYmVnaW4oKTsKQEAgLTEyOTQsMTcgKzEyOTQsMTcgQEAgc3RhdGljIEFjY2Vz c2liaWxpdHlUYWJsZUNlbGwqIGNlbGxBdEluZGV4KEF0a1RhYmxlKiB0YWJsZSwgZ2ludCBpbmRl eCkKIAogc3RhdGljIEF0a09iamVjdCogd2Via2l0X2FjY2Vzc2libGVfdGFibGVfcmVmX2F0KEF0 a1RhYmxlKiB0YWJsZSwgZ2ludCByb3csIGdpbnQgY29sdW1uKQogewotICAgIEFjY2Vzc2liaWxp dHlUYWJsZUNlbGwqIEFYQ2VsbCA9IGNlbGwodGFibGUsIHJvdywgY29sdW1uKTsKLSAgICBpZiAo IUFYQ2VsbCkKKyAgICBBY2Nlc3NpYmlsaXR5VGFibGVDZWxsKiBheENlbGwgPSBjZWxsKHRhYmxl LCByb3csIGNvbHVtbik7CisgICAgaWYgKCFheENlbGwpCiAgICAgICAgIHJldHVybiAwOwotICAg IHJldHVybiBBWENlbGwtPndyYXBwZXIoKTsKKyAgICByZXR1cm4gYXhDZWxsLT53cmFwcGVyKCk7 CiB9CiAKIHN0YXRpYyBnaW50IHdlYmtpdF9hY2Nlc3NpYmxlX3RhYmxlX2dldF9pbmRleF9hdChB dGtUYWJsZSogdGFibGUsIGdpbnQgcm93LCBnaW50IGNvbHVtbikKIHsKLSAgICBBY2Nlc3NpYmls aXR5VGFibGVDZWxsKiBBWENlbGwgPSBjZWxsKHRhYmxlLCByb3csIGNvbHVtbik7Ci0gICAgQWNj ZXNzaWJpbGl0eVRhYmxlKiBBWFRhYmxlID0gc3RhdGljX2Nhc3Q8QWNjZXNzaWJpbGl0eVRhYmxl Kj4oY29yZSh0YWJsZSkpOwotICAgIHJldHVybiBjZWxsSW5kZXgoQVhDZWxsLCBBWFRhYmxlKTsK KyAgICBBY2Nlc3NpYmlsaXR5VGFibGVDZWxsKiBheENlbGwgPSBjZWxsKHRhYmxlLCByb3csIGNv bHVtbik7CisgICAgQWNjZXNzaWJpbGl0eVRhYmxlKiBheFRhYmxlID0gc3RhdGljX2Nhc3Q8QWNj ZXNzaWJpbGl0eVRhYmxlKj4oY29yZSh0YWJsZSkpOworICAgIHJldHVybiBjZWxsSW5kZXgoYXhD ZWxsLCBheFRhYmxlKTsKIH0KIAogc3RhdGljIGdpbnQgd2Via2l0X2FjY2Vzc2libGVfdGFibGVf Z2V0X2NvbHVtbl9hdF9pbmRleChBdGtUYWJsZSogdGFibGUsIGdpbnQgaW5kZXgpCkBAIC0xMzQ3 LDEwICsxMzQ3LDEwIEBAIHN0YXRpYyBnaW50IHdlYmtpdF9hY2Nlc3NpYmxlX3RhYmxlX2dldF9u X3Jvd3MoQXRrVGFibGUqIHRhYmxlKQogCiBzdGF0aWMgZ2ludCB3ZWJraXRfYWNjZXNzaWJsZV90 YWJsZV9nZXRfY29sdW1uX2V4dGVudF9hdChBdGtUYWJsZSogdGFibGUsIGdpbnQgcm93LCBnaW50 IGNvbHVtbikKIHsKLSAgICBBY2Nlc3NpYmlsaXR5VGFibGVDZWxsKiBBWENlbGwgPSBjZWxsKHRh YmxlLCByb3csIGNvbHVtbik7Ci0gICAgaWYgKEFYQ2VsbCkgeworICAgIEFjY2Vzc2liaWxpdHlU YWJsZUNlbGwqIGF4Q2VsbCA9IGNlbGwodGFibGUsIHJvdywgY29sdW1uKTsKKyAgICBpZiAoYXhD ZWxsKSB7CiAgICAgICAgIHBhaXI8aW50LCBpbnQ+IGNvbHVtblJhbmdlOwotICAgICAgICBBWENl bGwtPmNvbHVtbkluZGV4UmFuZ2UoY29sdW1uUmFuZ2UpOworICAgICAgICBheENlbGwtPmNvbHVt bkluZGV4UmFuZ2UoY29sdW1uUmFuZ2UpOwogICAgICAgICByZXR1cm4gY29sdW1uUmFuZ2Uuc2Vj b25kOwogICAgIH0KICAgICByZXR1cm4gMDsKQEAgLTEzNTgsMTAgKzEzNTgsMTAgQEAgc3RhdGlj IGdpbnQgd2Via2l0X2FjY2Vzc2libGVfdGFibGVfZ2V0X2NvbHVtbl9leHRlbnRfYXQoQXRrVGFi bGUqIHRhYmxlLCBnaW50IHIKIAogc3RhdGljIGdpbnQgd2Via2l0X2FjY2Vzc2libGVfdGFibGVf Z2V0X3Jvd19leHRlbnRfYXQoQXRrVGFibGUqIHRhYmxlLCBnaW50IHJvdywgZ2ludCBjb2x1bW4p CiB7Ci0gICAgQWNjZXNzaWJpbGl0eVRhYmxlQ2VsbCogQVhDZWxsID0gY2VsbCh0YWJsZSwgcm93 LCBjb2x1bW4pOwotICAgIGlmIChBWENlbGwpIHsKKyAgICBBY2Nlc3NpYmlsaXR5VGFibGVDZWxs KiBheENlbGwgPSBjZWxsKHRhYmxlLCByb3csIGNvbHVtbik7CisgICAgaWYgKGF4Q2VsbCkgewog ICAgICAgICBwYWlyPGludCwgaW50PiByb3dSYW5nZTsKLSAgICAgICAgQVhDZWxsLT5yb3dJbmRl eFJhbmdlKHJvd1JhbmdlKTsKKyAgICAgICAgYXhDZWxsLT5yb3dJbmRleFJhbmdlKHJvd1Jhbmdl KTsKICAgICAgICAgcmV0dXJuIHJvd1JhbmdlLnNlY29uZDsKICAgICB9CiAgICAgcmV0dXJuIDA7 CkBAIC0xNDk4LDIxICsxNDk4LDIxIEBAIHN0YXRpYyB2b2lkIGF0a19kb2N1bWVudF9pbnRlcmZh Y2VfaW5pdChBdGtEb2N1bWVudElmYWNlKiBpZmFjZSkKIAogc3RhdGljIGNvbnN0IEdJbnRlcmZh Y2VJbmZvIEF0a0ludGVyZmFjZXNJbml0RnVuY3Rpb25zW10gPSB7CiAgICAgeyhHSW50ZXJmYWNl SW5pdEZ1bmMpYXRrX2FjdGlvbl9pbnRlcmZhY2VfaW5pdCwKLSAgICAgKEdJbnRlcmZhY2VGaW5h bGl6ZUZ1bmMpIE5VTEwsIE5VTEx9LAorICAgICAoR0ludGVyZmFjZUZpbmFsaXplRnVuYykgMCwg MH0sCiAgICAgeyhHSW50ZXJmYWNlSW5pdEZ1bmMpYXRrX3NlbGVjdGlvbl9pbnRlcmZhY2VfaW5p dCwKLSAgICAgKEdJbnRlcmZhY2VGaW5hbGl6ZUZ1bmMpIE5VTEwsIE5VTEx9LAorICAgICAoR0lu dGVyZmFjZUZpbmFsaXplRnVuYykgMCwgMH0sCiAgICAgeyhHSW50ZXJmYWNlSW5pdEZ1bmMpYXRr X2VkaXRhYmxlX3RleHRfaW50ZXJmYWNlX2luaXQsCi0gICAgIChHSW50ZXJmYWNlRmluYWxpemVG dW5jKSBOVUxMLCBOVUxMfSwKKyAgICAgKEdJbnRlcmZhY2VGaW5hbGl6ZUZ1bmMpIDAsIDB9LAog ICAgIHsoR0ludGVyZmFjZUluaXRGdW5jKWF0a190ZXh0X2ludGVyZmFjZV9pbml0LAotICAgICAo R0ludGVyZmFjZUZpbmFsaXplRnVuYykgTlVMTCwgTlVMTH0sCisgICAgIChHSW50ZXJmYWNlRmlu YWxpemVGdW5jKSAwLCAwfSwKICAgICB7KEdJbnRlcmZhY2VJbml0RnVuYylhdGtfY29tcG9uZW50 X2ludGVyZmFjZV9pbml0LAotICAgICAoR0ludGVyZmFjZUZpbmFsaXplRnVuYykgTlVMTCwgTlVM TH0sCisgICAgIChHSW50ZXJmYWNlRmluYWxpemVGdW5jKSAwLCAwfSwKICAgICB7KEdJbnRlcmZh Y2VJbml0RnVuYylhdGtfaW1hZ2VfaW50ZXJmYWNlX2luaXQsCi0gICAgIChHSW50ZXJmYWNlRmlu YWxpemVGdW5jKSBOVUxMLCBOVUxMfSwKKyAgICAgKEdJbnRlcmZhY2VGaW5hbGl6ZUZ1bmMpIDAs IDB9LAogICAgIHsoR0ludGVyZmFjZUluaXRGdW5jKWF0a190YWJsZV9pbnRlcmZhY2VfaW5pdCwK LSAgICAgKEdJbnRlcmZhY2VGaW5hbGl6ZUZ1bmMpIE5VTEwsIE5VTEx9LAorICAgICAoR0ludGVy ZmFjZUZpbmFsaXplRnVuYykgMCwgMH0sCiAgICAgeyhHSW50ZXJmYWNlSW5pdEZ1bmMpYXRrX2Rv Y3VtZW50X2ludGVyZmFjZV9pbml0LAotICAgICAoR0ludGVyZmFjZUZpbmFsaXplRnVuYykgTlVM TCwgTlVMTH0KKyAgICAgKEdJbnRlcmZhY2VGaW5hbGl6ZUZ1bmMpIDAsIDB9CiB9OwogCiBlbnVt IFdBSVR5cGUgewpAQCAtMTU5NSwxMCArMTU5NSwxMCBAQCBzdGF0aWMgY29uc3QgY2hhciogZ2V0 VW5pcXVlQWNjZXNzaWJpbGl0eVR5cGVOYW1lKGd1aW50MTYgaW50ZXJmYWNlTWFzaykKIHsKICNk ZWZpbmUgV0FJX1RZUEVfTkFNRV9MRU4gKDMwKSAvKiBFbm91Z2ggZm9yIHByZWZpeCArIDUgaGV4 IGNoYXJhY3RlcnMgKG1heCkgKi8KICAgICBzdGF0aWMgY2hhciBuYW1lW1dBSV9UWVBFX05BTUVf TEVOICsgMV07Ci0gICAgCisKICAgICBnX3NwcmludGYobmFtZSwgIldBSVR5cGUleCIsIGludGVy ZmFjZU1hc2spOwogICAgIG5hbWVbV0FJX1RZUEVfTkFNRV9MRU5dID0gJ1wwJzsKLSAgICAKKwog ICAgIHJldHVybiBuYW1lOwogfQogCkBAIC0xNjA2LDE1ICsxNjA2LDE1IEBAIHN0YXRpYyBHVHlw ZSBnZXRBY2Nlc3NpYmlsaXR5VHlwZUZyb21PYmplY3QoQWNjZXNzaWJpbGl0eU9iamVjdCogY29y ZU9iamVjdCkKIHsKICAgICBzdGF0aWMgY29uc3QgR1R5cGVJbmZvIHR5cGVJbmZvID0gewogICAg ICAgICBzaXplb2YoV2ViS2l0QWNjZXNzaWJsZUNsYXNzKSwKLSAgICAgICAgKEdCYXNlSW5pdEZ1 bmMpIE5VTEwsCi0gICAgICAgIChHQmFzZUZpbmFsaXplRnVuYykgTlVMTCwKLSAgICAgICAgKEdD bGFzc0luaXRGdW5jKSBOVUxMLAotICAgICAgICAoR0NsYXNzRmluYWxpemVGdW5jKSBOVUxMLAot ICAgICAgICBOVUxMLCAvKiBjbGFzcyBkYXRhICovCisgICAgICAgIChHQmFzZUluaXRGdW5jKSAw LAorICAgICAgICAoR0Jhc2VGaW5hbGl6ZUZ1bmMpIDAsCisgICAgICAgIChHQ2xhc3NJbml0RnVu YykgMCwKKyAgICAgICAgKEdDbGFzc0ZpbmFsaXplRnVuYykgMCwKKyAgICAgICAgMCwgLyogY2xh c3MgZGF0YSAqLwogICAgICAgICBzaXplb2YoV2ViS2l0QWNjZXNzaWJsZSksIC8qIGluc3RhbmNl IHNpemUgKi8KICAgICAgICAgMCwgLyogbmIgcHJlYWxsb2NzICovCi0gICAgICAgIChHSW5zdGFu Y2VJbml0RnVuYykgTlVMTCwKLSAgICAgICAgTlVMTCAvKiB2YWx1ZSB0YWJsZSAqLworICAgICAg ICAoR0luc3RhbmNlSW5pdEZ1bmMpIDAsCisgICAgICAgIDAgLyogdmFsdWUgdGFibGUgKi8KICAg ICB9OwogCiAgICAgZ3VpbnQxNiBpbnRlcmZhY2VNYXNrID0gZ2V0SW50ZXJmYWNlTWFza0Zyb21P YmplY3QoY29yZU9iamVjdCk7CkBAIC0xNjM5LDcgKzE2MzksNyBAQCBzdGF0aWMgR1R5cGUgZ2V0 QWNjZXNzaWJpbGl0eVR5cGVGcm9tT2JqZWN0KEFjY2Vzc2liaWxpdHlPYmplY3QqIGNvcmVPYmpl Y3QpCiBXZWJLaXRBY2Nlc3NpYmxlKiB3ZWJraXRfYWNjZXNzaWJsZV9uZXcoQWNjZXNzaWJpbGl0 eU9iamVjdCogY29yZU9iamVjdCkKIHsKICAgICBHVHlwZSB0eXBlID0gZ2V0QWNjZXNzaWJpbGl0 eVR5cGVGcm9tT2JqZWN0KGNvcmVPYmplY3QpOwotICAgIEF0a09iamVjdCogb2JqZWN0ID0gc3Rh dGljX2Nhc3Q8QXRrT2JqZWN0Kj4oZ19vYmplY3RfbmV3KHR5cGUsIE5VTEwpKTsKKyAgICBBdGtP YmplY3QqIG9iamVjdCA9IHN0YXRpY19jYXN0PEF0a09iamVjdCo+KGdfb2JqZWN0X25ldyh0eXBl LCAwKSk7CiAKICAgICBhdGtfb2JqZWN0X2luaXRpYWxpemUob2JqZWN0LCBjb3JlT2JqZWN0KTsK IAotLSAKMS42LjMuMwoK 42921 2009-11-10 20:36:42 -0800 2009-11-11 03:17:29 -0800 Correct some capitalization nits 30901-2.patch text/plain 3256 jdiggs RnJvbSA1NzAyNDZjNmRkNDRiMDM1NmU0YmNlYjc3OTcyZGVlNDdhZDUwMGFmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2FubWFyaWUgRGlnZ3MgPGpvYW5tYXJpZS5kaWdnc0BnbWFp bC5jb20+CkRhdGU6IFR1ZSwgMTAgTm92IDIwMDkgMjM6MjQ6MzIgLTA1MDAKU3ViamVjdDogW1BB VENIXSAyMDA5LTExLTEwICBKb2FubWFyaWUgRGlnZ3MgIDxqb2FubWFyaWUuZGlnZ3NAZ21haWwu Y29tPgoKICAgICAgICBSZXZpZXdlZCBieSBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMwOTAxCiAgICAg ICAgW0d0a10gTmVlZCB0byBkZS1saW50IHRoZSBBdGsgYTExeSBjb2RlCgogICAgICAgIENsZWFu ZWQgdXAgc29tZSBtaXNzZWQgY2FwaXRhbGl6YXRpb24gc3R5bGUtZ3VpZGVsaW5lIHZpb2xhdGlv bnMuCgogICAgICAgICogYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBw ZXJBdGsuY3BwOgotLS0KIFdlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHwgICAxMSArKysrKysrKysrKwogLi4uL2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0 V3JhcHBlckF0ay5jcHAgICAgICAgICAgfCAgIDE2ICsrKysrKysrLS0tLS0tLS0KIDIgZmlsZXMg Y2hhbmdlZCwgMTkgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9X ZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDEzNjE0YjUuLmVlODVj N2UgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTQgQEAKKzIwMDktMTEtMTAgIEpvYW5tYXJpZSBEaWdncyAgPGpvYW5tYXJp ZS5kaWdnc0BnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTMwOTAxCisgICAgICAgIFtHdGtdIE5lZWQgdG8gZGUtbGludCB0aGUgQXRrIGExMXkg Y29kZQorCisgICAgICAgIENsZWFuZWQgdXAgc29tZSBtaXNzZWQgY2FwaXRhbGl6YXRpb24gc3R5 bGUtZ3VpZGVsaW5lIHZpb2xhdGlvbnMuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2d0ay9B Y2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHA6CisKIDIwMDktMTEtMTAgIEJyYWR5IEVp ZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWlu aWcuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2liaWxpdHlP YmplY3RXcmFwcGVyQXRrLmNwcCBiL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJp bGl0eU9iamVjdFdyYXBwZXJBdGsuY3BwCmluZGV4IDg2YmMzNzMuLmQ0ZjRiYTggMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJB dGsuY3BwCisrKyBiL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVj dFdyYXBwZXJBdGsuY3BwCkBAIC00MDQsMjEgKzQwNCwyMSBAQCBzdGF0aWMgQXRrUm9sZSBhdGtS b2xlKEFjY2Vzc2liaWxpdHlSb2xlIHJvbGUpCiAKIHN0YXRpYyBBdGtSb2xlIHdlYmtpdF9hY2Nl c3NpYmxlX2dldF9yb2xlKEF0a09iamVjdCogb2JqZWN0KQogewotICAgIEFjY2Vzc2liaWxpdHlP YmplY3QqIEFYT2JqZWN0ID0gY29yZShvYmplY3QpOworICAgIEFjY2Vzc2liaWxpdHlPYmplY3Qq IGF4T2JqZWN0ID0gY29yZShvYmplY3QpOwogCi0gICAgaWYgKCFBWE9iamVjdCkKKyAgICBpZiAo IWF4T2JqZWN0KQogICAgICAgICByZXR1cm4gQVRLX1JPTEVfVU5LTk9XTjsKIAogICAgIC8vIFdl YkNvcmUgZG9lcyBub3Qgc2VlbSB0byBoYXZlIGEgcm9sZSBmb3IgbGlzdCBpdGVtcwotICAgIGlm IChBWE9iamVjdC0+aXNHcm91cCgpKSB7Ci0gICAgICAgIEFjY2Vzc2liaWxpdHlPYmplY3QqIHBh cmVudCA9IEFYT2JqZWN0LT5wYXJlbnRPYmplY3RVbmlnbm9yZWQoKTsKKyAgICBpZiAoYXhPYmpl Y3QtPmlzR3JvdXAoKSkgeworICAgICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBwYXJlbnQgPSBh eE9iamVjdC0+cGFyZW50T2JqZWN0VW5pZ25vcmVkKCk7CiAgICAgICAgIGlmIChwYXJlbnQgJiYg cGFyZW50LT5pc0xpc3QoKSkKICAgICAgICAgICAgIHJldHVybiBBVEtfUk9MRV9MSVNUX0lURU07 CiAgICAgfQogCiAgICAgLy8gV2ViQ29yZSBkb2VzIG5vdCBrbm93IGFib3V0IHBhcmFncmFwaCBy b2xlLCBsYWJlbCByb2xlLCBvciBzZWN0aW9uIHJvbGUKLSAgICBpZiAoQVhPYmplY3QtPmlzQWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdCgpKSB7Ci0gICAgICAgIE5vZGUqIG5vZGUgPSBzdGF0aWNf Y2FzdDxBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Kj4oQVhPYmplY3QpLT5yZW5kZXJlcigpLT5u b2RlKCk7CisgICAgaWYgKGF4T2JqZWN0LT5pc0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QoKSkg eworICAgICAgICBOb2RlKiBub2RlID0gc3RhdGljX2Nhc3Q8QWNjZXNzaWJpbGl0eVJlbmRlck9i amVjdCo+KGF4T2JqZWN0KS0+cmVuZGVyZXIoKS0+bm9kZSgpOwogICAgICAgICBpZiAobm9kZSkg ewogICAgICAgICAgICAgaWYgKG5vZGUtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjpwVGFnKSkKICAg ICAgICAgICAgICAgICByZXR1cm4gQVRLX1JPTEVfUEFSQUdSQVBIOwpAQCAtNDMwLDEwICs0MzAs MTAgQEAgc3RhdGljIEF0a1JvbGUgd2Via2l0X2FjY2Vzc2libGVfZ2V0X3JvbGUoQXRrT2JqZWN0 KiBvYmplY3QpCiAgICAgfQogCiAgICAgLy8gTm90ZTogV2h5IGRvZXNuJ3QgV2ViQ29yZSBoYXZl IGEgcGFzc3dvcmQgZmllbGQgZm9yIHRoaXMKLSAgICBpZiAoQVhPYmplY3QtPmlzUGFzc3dvcmRG aWVsZCgpKQorICAgIGlmIChheE9iamVjdC0+aXNQYXNzd29yZEZpZWxkKCkpCiAgICAgICAgIHJl dHVybiBBVEtfUk9MRV9QQVNTV09SRF9URVhUOwogCi0gICAgcmV0dXJuIGF0a1JvbGUoQVhPYmpl Y3QtPnJvbGVWYWx1ZSgpKTsKKyAgICByZXR1cm4gYXRrUm9sZShheE9iamVjdC0+cm9sZVZhbHVl KCkpOwogfQogCiBzdGF0aWMgdm9pZCBzZXRBdGtTdGF0ZVNldEZyb21Db3JlT2JqZWN0KEFjY2Vz c2liaWxpdHlPYmplY3QqIGNvcmVPYmplY3QsIEF0a1N0YXRlU2V0KiBzdGF0ZVNldCkKLS0gCjEu Ni4zLjMKCg==