98889 2012-10-10 05:45:11 -0700 [EFL][WK2] Add APIs for cache model 2012-10-15 22:56:57 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Other Linux RESOLVED FIXED P2 Normal --- 0 js45.yang webkit-unassigned cdumez gyuyoung.kim kangil.han kihong.kwon lucas.de.marchi rakuco ryuan.choi webkit.review.bot oldest_to_newest 738870 0 js45.yang 2012-10-10 05:45:11 -0700 Add ewk APIs for WKContextSetCacheModel, WKContextGetCacheModel. The patch will be uploaded soon. 740682 1 168372 js45.yang 2012-10-12 00:32:41 -0700 Created attachment 168372 Patch 741742 2 168624 js45.yang 2012-10-14 22:17:23 -0700 Created attachment 168624 Patch 741755 3 168624 cdumez 2012-10-14 22:50:46 -0700 Comment on attachment 168624 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=168624&action=review > Source/WebKit2/UIProcess/API/efl/ewk_context.cpp:323 > + switch (cacheModel) { How about using COMPILE_ASSERT_MATCHING_ENUM() from ewk_private so that we can use casting instead of a switch? > Source/WebKit2/UIProcess/API/efl/ewk_context.h:58 > + EWK_CACHE_MODEL_DOCUMENT_VIEWER, Missing documentation for each enum value. > Source/WebKit2/UIProcess/API/efl/ewk_context.h:282 > + */ Missing documentation for return value. > Source/WebKit2/UIProcess/API/efl/ewk_context.h:292 > +EAPI Ewk_Cache_Model ewk_context_cache_model_get(Ewk_Context *context); Argument should be const. > Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context.cpp:180 > + ASSERT_TRUE(ewk_context_cache_model_set(context, EWK_CACHE_MODEL_DOCUMENT_VIEWER)); Please add a test for the default value as well. 741854 4 168650 js45.yang 2012-10-15 01:53:00 -0700 Created attachment 168650 Patch 741857 5 js45.yang 2012-10-15 01:54:04 -0700 (In reply to comment #3) > (From update of attachment 168624 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=168624&action=review > > > Source/WebKit2/UIProcess/API/efl/ewk_context.cpp:323 > > + switch (cacheModel) { > > How about using COMPILE_ASSERT_MATCHING_ENUM() from ewk_private so that we can use casting instead of a switch? > > > Source/WebKit2/UIProcess/API/efl/ewk_context.h:58 > > + EWK_CACHE_MODEL_DOCUMENT_VIEWER, > > Missing documentation for each enum value. > > > Source/WebKit2/UIProcess/API/efl/ewk_context.h:282 > > + */ > > Missing documentation for return value. > > > Source/WebKit2/UIProcess/API/efl/ewk_context.h:292 > > +EAPI Ewk_Cache_Model ewk_context_cache_model_get(Ewk_Context *context); > > Argument should be const. > > > Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context.cpp:180 > > + ASSERT_TRUE(ewk_context_cache_model_set(context, EWK_CACHE_MODEL_DOCUMENT_VIEWER)); > > Please add a test for the default value as well. Thank you for your review. I uploaded the new patch. Could you please check it? 741860 6 168650 cdumez 2012-10-15 02:00:08 -0700 Comment on attachment 168650 Patch LGTM. 742306 7 168650 webkit.review.bot 2012-10-15 12:45:33 -0700 Comment on attachment 168650 Patch Rejecting attachment 168650 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: mit-queue/Source/WebKit/chromium/third_party/skia/gyp --revision 5907 --non-interactive --force --accept theirs-conflict --ignore-externals' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' 43>At revision 5907. ________ running '/usr/bin/python tools/clang/scripts/update.py --mac-only' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' ________ running '/usr/bin/python gyp_webkit' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' Updating webkit projects from gyp files... Full output: http://queues.webkit.org/results/14290739 742713 8 168838 js45.yang 2012-10-15 19:08:12 -0700 Created attachment 168838 Patch 742714 9 js45.yang 2012-10-15 19:08:53 -0700 I rebased this patch. 742735 10 168841 js45.yang 2012-10-15 19:53:49 -0700 Created attachment 168841 Patch 742750 11 168841 webkit.review.bot 2012-10-15 20:25:11 -0700 Comment on attachment 168841 Patch Clearing flags on attachment: 168841 Committed r131401: <http://trac.webkit.org/changeset/131401> 742751 12 webkit.review.bot 2012-10-15 20:25:15 -0700 All reviewed patches have been landed. Closing bug. 742818 13 cdumez 2012-10-15 22:56:05 -0700 The new unit test is failing on the bots: /home/buildslave-1/webkit-buildslave/efl-linux-64-debug-wk2/build/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context.cpp:188: Failure Value of: ewk_context_cache_model_get(context) Actual: 0 Expected: EWK_CACHE_MODEL_DOCUMENT_BROWSER Which is: 1 [ FAILED ] EWK2UnitTestBase.ewk_context_cache_model (12 ms) Can you please fix it? I'm guessing the default value is wrong so the doc may need to be updated as well. 742819 14 gyuyoung.kim 2012-10-15 22:56:57 -0700 (In reply to comment #13) > The new unit test is failing on the bots: > /home/buildslave-1/webkit-buildslave/efl-linux-64-debug-wk2/build/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context.cpp:188: Failure > Value of: ewk_context_cache_model_get(context) > Actual: 0 > Expected: EWK_CACHE_MODEL_DOCUMENT_BROWSER > Which is: 1 > [ FAILED ] EWK2UnitTestBase.ewk_context_cache_model (12 ms) > > Can you please fix it? I'm guessing the default value is wrong so the doc may need to be updated as well. I already let him know this. He is fixing this. 168372 2012-10-12 00:32:41 -0700 2012-10-14 22:17:17 -0700 Patch bug-98889-20121012163135.patch text/plain 5854 js45.yang U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwODcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNmVmOThmMzVhZTFhMjY1 M2Y2MTIzMTc0OWY4ZGRhODc3MzA0MWQ3MC4uZDdiZTYzNzExM2I3MTJiN2Q4MzNlOTA2MWFiYzFm NDA0YmVmODkyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTEwLTEwICBKb25n c2VvayBZYW5nICA8anM0NS55YW5nQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtFRkxdW1dLMl0g QWRkIEFQSXMgZm9yIGNhY2hlIG1vZGVsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD05ODg4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZCBld2tfY29udGV4dF9jYWNoZV9tb2RlbF9zZXQoKSwgZXdrX2Nv bnRleHRfY2FjaGVfbW9kZWxfZ2V0KCkuCisKKyAgICAgICAgVGhlIGNhY2hlIG1vZGVsIG1lYW5z IHRoZSBsZXZlbCBmb3IgdGhlIGNhY2hlIGNhcGFjaXR5LgorICAgICAgICBJZiBFV0tfQ0FDSEVf TU9ERUxfRE9DVU1FTlRfQlJPV1NFUiwgdGhlIGJpZ2dlc3QgY2FjaGUgY2FwYWNpdHkgd2lsbCBi ZSBzZXQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5jcHA6Cisg ICAgICAgIChld2tfY29udGV4dF9kZWZhdWx0X2dldCk6CisgICAgICAgIChld2tfY29udGV4dF9u ZXcpOgorICAgICAgICAoZXdrX2NvbnRleHRfY2FjaGVfbW9kZWxfc2V0KToKKyAgICAgICAgKGV3 a19jb250ZXh0X2NhY2hlX21vZGVsX2dldCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX2NvbnRleHQuaDoKKwogMjAxMi0xMC0wOSAgQnl1bmd3b28gTGVlICA8Ync4MC5sZWVAc2Ft c3VuZy5jb20+CiAKICAgICAgICAgW0VGTF1bV0syXSBDaGFuZ2UgcGFyYW1ldGVyIGFuZCByZXR1 cm4gdHlwZSBvZiBsb2FkVXJsU3luYygpLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwCmluZGV4IGIwZGVmMDM5MmJkZjYxZjY5M2FkODMwMmJj NzZjYjk0MjQ2ZTBiZWEuLjMxYjUzZGZjN2YwYzkyMmNiNzllYjI5OGM1ZTMzZDQ4YTkyNWY3M2Ig MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0 LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5j cHAKQEAgLTI4MiwzICsyODIsNDMgQEAgdm9pZCBld2tfY29udGV4dF92aWJyYXRpb25fY2xpZW50 X2NhbGxiYWNrc19zZXQoRXdrX0NvbnRleHQqIGV3a0NvbnRleHQsIEV3a19WaWIKICAgICBld2tD b250ZXh0LT52aWJyYXRpb25Qcm92aWRlci0+c2V0VmlicmF0aW9uQ2xpZW50Q2FsbGJhY2tzKHZp YnJhdGUsIGNhbmNlbCwgZGF0YSk7CiAjZW5kaWYKIH0KKworRWluYV9Cb29sIGV3a19jb250ZXh0 X2NhY2hlX21vZGVsX3NldChFd2tfQ29udGV4dCogZXdrQ29udGV4dCwgRXdrX0NhY2hlX01vZGVs IGNhY2hlTW9kZWwpCit7CisgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKGV3a0Nv bnRleHQsIGZhbHNlKTsKKworICAgIHN3aXRjaCAoY2FjaGVNb2RlbCkgeworICAgIGNhc2UgRVdL X0NBQ0hFX01PREVMX0RPQ1VNRU5UX1ZJRVdFUjoKKyAgICAgICAgV0tDb250ZXh0U2V0Q2FjaGVN b2RlbChld2tfY29udGV4dF9XS0NvbnRleHRfZ2V0KGV3a0NvbnRleHQpLCBrV0tDYWNoZU1vZGVs RG9jdW1lbnRWaWV3ZXIpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEVXS19DQUNIRV9NT0RF TF9ET0NVTUVOVF9CUk9XU0VSOgorICAgICAgICBXS0NvbnRleHRTZXRDYWNoZU1vZGVsKGV3a19j b250ZXh0X1dLQ29udGV4dF9nZXQoZXdrQ29udGV4dCksIGtXS0NhY2hlTW9kZWxEb2N1bWVudEJy b3dzZXIpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEVXS19DQUNIRV9NT0RFTF9QUklNQVJZ X1dFQkJST1dTRVI6CisgICAgICAgIFdLQ29udGV4dFNldENhY2hlTW9kZWwoZXdrX2NvbnRleHRf V0tDb250ZXh0X2dldChld2tDb250ZXh0KSwga1dLQ2FjaGVNb2RlbFByaW1hcnlXZWJCcm93c2Vy KTsKKyAgICAgICAgYnJlYWs7CisgICAgZGVmYXVsdDoKKyAgICAgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7CisgICAgfTsKKworICAgIHJldHVybiB0cnVlOworfQorCitFd2tfQ2FjaGVfTW9kZWwg ZXdrX2NvbnRleHRfY2FjaGVfbW9kZWxfZ2V0KEV3a19Db250ZXh0KiBld2tDb250ZXh0KQorewor ICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChld2tDb250ZXh0LCBFV0tfQ0FDSEVf TU9ERUxfRE9DVU1FTlRfVklFV0VSKTsKKyAgICBXS0NhY2hlTW9kZWwgY2FjaGVNb2RlbCA9IFdL Q29udGV4dEdldENhY2hlTW9kZWwoZXdrX2NvbnRleHRfV0tDb250ZXh0X2dldChld2tDb250ZXh0 KSk7CisKKyAgICBzd2l0Y2ggKGNhY2hlTW9kZWwpIHsKKyAgICBjYXNlIGtXS0NhY2hlTW9kZWxE b2N1bWVudFZpZXdlcjoKKyAgICAgICAgcmV0dXJuIEVXS19DQUNIRV9NT0RFTF9ET0NVTUVOVF9W SUVXRVI7CisgICAgY2FzZSBrV0tDYWNoZU1vZGVsRG9jdW1lbnRCcm93c2VyOgorICAgICAgICBy ZXR1cm4gRVdLX0NBQ0hFX01PREVMX0RPQ1VNRU5UX0JST1dTRVI7CisgICAgY2FzZSBrV0tDYWNo ZU1vZGVsUHJpbWFyeVdlYkJyb3dzZXI6CisgICAgICAgIHJldHVybiBFV0tfQ0FDSEVfTU9ERUxf UFJJTUFSWV9XRUJCUk9XU0VSOworICAgIH0KKworICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwor ICAgIHJldHVybiBFV0tfQ0FDSEVfTU9ERUxfRE9DVU1FTlRfVklFV0VSOworfQorCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5oIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuaAppbmRleCBiZjgyN2Nk ZjRlNDgyYTEwYjBiYjUwM2IxOGYxMjc4ZWNhNGI5OGYzLi42ZTZiZmY0ZjU1YzI0YmY1N2NkYzBm MDFmNTVjZjkyY2M4Y2ZiZGU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfY29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a19jb250ZXh0LmgKQEAgLTQ5LDYgKzQ5LDIwIEBAIGV4dGVybiAiQyIgewogdHlwZWRl ZiBzdHJ1Y3QgX0V3a19Db250ZXh0IEV3a19Db250ZXh0OwogCiAvKioKKyAqIFxlbnVtICAgIF9F d2tfQ2FjaGVfTW9kZWwKKyAqCisgKiBAYnJpZWYgICBDb250YWlucyBvcHRpb24gZm9yIGNhY2hl IG1vZGVsCisgKi8KK2VudW0gX0V3a19DYWNoZV9Nb2RlbCB7CisgICAgRVdLX0NBQ0hFX01PREVM X0RPQ1VNRU5UX1ZJRVdFUiwKKyAgICBFV0tfQ0FDSEVfTU9ERUxfRE9DVU1FTlRfQlJPV1NFUiwK KyAgICBFV0tfQ0FDSEVfTU9ERUxfUFJJTUFSWV9XRUJCUk9XU0VSCit9OworCisvLy8gQ3JlYXRl cyBhIHR5cGUgbmFtZSBmb3IgdGhlIF9Fd2tfQ2FjaGVfTW9kZWwuCit0eXBlZGVmIGVudW0gX0V3 a19DYWNoZV9Nb2RlbCBFd2tfQ2FjaGVfTW9kZWw7CisKKy8qKgogICogQHR5cGVkZWYgRXdrX1Vy bF9TY2hlbWVfUmVxdWVzdF9DYiBFd2tfVXJsX1NjaGVtZV9SZXF1ZXN0X0NiCiAgKiBAYnJpZWYg Q2FsbGJhY2sgdHlwZSBmb3IgdXNlIHdpdGggZXdrX2NvbnRleHRfdXJsX3NjaGVtZV9yZWdpc3Rl cigpLgogICovCkBAIC0xOTAsNiArMjA0LDI1IEBAIEVBUEkgRWluYV9Cb29sIGV3a19jb250ZXh0 X3VybF9zY2hlbWVfcmVnaXN0ZXIoRXdrX0NvbnRleHQgKmNvbnRleHQsIGNvbnN0IGNoYXIKICAq LwogRUFQSSB2b2lkIGV3a19jb250ZXh0X3ZpYnJhdGlvbl9jbGllbnRfY2FsbGJhY2tzX3NldChF d2tfQ29udGV4dCAqY29udGV4dCwgRXdrX1ZpYnJhdGlvbl9DbGllbnRfVmlicmF0ZV9DYiB2aWJy YXRlLCBFd2tfVmlicmF0aW9uX0NsaWVudF9WaWJyYXRpb25fQ2FuY2VsX0NiIGNhbmNlbCwgdm9p ZCAqZGF0YSk7CiAKKy8qKgorICogU2V0IEBhIGNhY2hlX21vZGVsIGFzIHRoZSBjYWNoZSBtb2Rl bCBmb3IgQGEgY29udGV4dC4KKyAqCisgKiBCeSBkZWZhdWx0LCBpdCBpcyBFV0tfQ0FDSEVfTU9E RUxfRE9DVU1FTlRfQlJPV1NFUi4KKyAqCisgKiBAcGFyYW0gY29udGV4dCBjb250ZXh0IG9iamVj dCB0byB1cGRhdGUuCisgKiBAcGFyYW0gY2FjaGVfbW9kZWwgYSAjRXdrX0NhY2hlX01vZGVsCisg Ki8KK0VBUEkgRWluYV9Cb29sIGV3a19jb250ZXh0X2NhY2hlX21vZGVsX3NldChFd2tfQ29udGV4 dCogY29udGV4dCwgRXdrX0NhY2hlX01vZGVsIGNhY2hlX21vZGVsKTsKKworLyoqCisgKiBHZXRz IHRoZSBjYWNoZSBtb2RlbCBmb3IgQGEgY29udGV4dC4KKyAqCisgKiBAcGFyYW0gY29udGV4dCBj b250ZXh0IG9iamVjdCB0byBxdWVyeS4KKyAqCisgKiBAcmV0dXJuIHRoZSBjYWNoZSBtb2RlbCBm b3IgdGhlIEBhIGNvbnRleHQuCisgKi8KK0VBUEkgRXdrX0NhY2hlX01vZGVsIGV3a19jb250ZXh0 X2NhY2hlX21vZGVsX2dldChFd2tfQ29udGV4dCogZXdrQ29udGV4dCk7CisKICNpZmRlZiBfX2Nw bHVzcGx1cwogfQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dC5jcHAKaW5kZXggZGZmNDg1MzQ4 NWFiMDA3MjMwOGQ4OTQ2NWJjNWE2MWFiOGI0OWFmZi4uYjllN2ZmNzE5NjkzNGJiNDQ1YzBjMmFh NmZjYzdmMTM5NDg5MGY4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvdGVzdHMvdGVzdF9ld2syX2NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9jb250ZXh0LmNwcApAQCAtMTcyLDMgKzE3 MiwxNyBAQCBURVNUX0YoRVdLMlVuaXRUZXN0QmFzZSwgZXdrX2NvbnRleHRfcmVmKQogICAgIGV3 a19jb250ZXh0X3VucmVmKGNvbnRleHQpOwogICAgIGV3a19jb250ZXh0X3VucmVmKGNvbnRleHQp OwogfQorCitURVNUX0YoRVdLMlVuaXRUZXN0QmFzZSwgZXdrX2NvbnRleHRfY2FjaGVfbW9kZWwp Cit7CisgICAgRXdrX0NvbnRleHQqIGNvbnRleHQgPSBld2tfdmlld19jb250ZXh0X2dldCh3ZWJW aWV3KCkpOworCisgICAgQVNTRVJUX1RSVUUoZXdrX2NvbnRleHRfY2FjaGVfbW9kZWxfc2V0KGNv bnRleHQsIEVXS19DQUNIRV9NT0RFTF9ET0NVTUVOVF9WSUVXRVIpKTsKKyAgICBBU1NFUlRfRVEo RVdLX0NBQ0hFX01PREVMX0RPQ1VNRU5UX1ZJRVdFUiwgZXdrX2NvbnRleHRfY2FjaGVfbW9kZWxf Z2V0KGNvbnRleHQpKTsKKworICAgIEFTU0VSVF9UUlVFKGV3a19jb250ZXh0X2NhY2hlX21vZGVs X3NldChjb250ZXh0LCBFV0tfQ0FDSEVfTU9ERUxfRE9DVU1FTlRfQlJPV1NFUikpOworICAgIEFT U0VSVF9FUShFV0tfQ0FDSEVfTU9ERUxfRE9DVU1FTlRfQlJPV1NFUiwgZXdrX2NvbnRleHRfY2Fj aGVfbW9kZWxfZ2V0KGNvbnRleHQpKTsKKworICAgIEFTU0VSVF9UUlVFKGV3a19jb250ZXh0X2Nh Y2hlX21vZGVsX3NldChjb250ZXh0LCBFV0tfQ0FDSEVfTU9ERUxfUFJJTUFSWV9XRUJCUk9XU0VS KSk7CisgICAgQVNTRVJUX0VRKEVXS19DQUNIRV9NT0RFTF9QUklNQVJZX1dFQkJST1dTRVIsIGV3 a19jb250ZXh0X2NhY2hlX21vZGVsX2dldChjb250ZXh0KSk7Cit9Cg== 168624 2012-10-14 22:17:23 -0700 2012-10-15 01:52:54 -0700 Patch bug-98889-20121015141614.patch text/plain 5777 js45.yang U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxMjg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTY0YzYwMjczZTI2OGEx YmE4YmU3NDkyYzQ2OTY4NjQ4NzIxOWVkYi4uOWI5Yzk0ZjFjMTkyN2I5MjYyM2JmMTc3NDZhOWNl YzM1NDU4YTZjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTEwLTE1ICBKb25n c2VvayBZYW5nICA8anM0NS55YW5nQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtFRkxdW1dLMl0g QWRkIEFQSXMgZm9yIGNhY2hlIG1vZGVsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD05ODg4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZCBld2tfY29udGV4dF9jYWNoZV9tb2RlbF9zZXQoKSwgZXdrX2Nv bnRleHRfY2FjaGVfbW9kZWxfZ2V0KCkuCisKKyAgICAgICAgVGhlIGNhY2hlIG1vZGVsIG1lYW5z IHRoZSBsZXZlbCBmb3IgdGhlIGNhY2hlIGNhcGFjaXR5LgorICAgICAgICBJZiBFV0tfQ0FDSEVf TU9ERUxfRE9DVU1FTlRfQlJPV1NFUiwgdGhlIGJpZ2dlc3QgY2FjaGUgY2FwYWNpdHkgd2lsbCBi ZSBzZXQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5jcHA6Cisg ICAgICAgIChld2tfY29udGV4dF9kZWZhdWx0X2dldCk6CisgICAgICAgIChld2tfY29udGV4dF9u ZXcpOgorICAgICAgICAoZXdrX2NvbnRleHRfY2FjaGVfbW9kZWxfc2V0KToKKyAgICAgICAgKGV3 a19jb250ZXh0X2NhY2hlX21vZGVsX2dldCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX2NvbnRleHQuaDoKKwogMjAxMi0xMC0xNCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FA YXBwbGUuY29tPgogCiAgICAgICAgIEZpeCB0aGUgd29ybGQuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5jcHAKaW5kZXggMDJlZGRiNDJkMGRkMjlm MWVjMGZhNTliZDdlOTY5MzE2OTVjZTdkOS4uMmZkNzJjOGU4ZmI0Yjg4ZjkwZGFjMzQzMDJiNGJi ODYzNWY4YTY1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX2NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a19jb250ZXh0LmNwcApAQCAtMzE1LDMgKzMxNSw0MyBAQCB2b2lkIGV3a19jb250ZXh0X3Zpc2l0 ZWRfbGlua19hZGQoRXdrX0NvbnRleHQqIGV3a0NvbnRleHQsIGNvbnN0IGNoYXIqIHZpc2l0ZWRV UgogICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiB3a1Zpc2l0ZWRVUkwoQWRvcHRXSywgV0tT dHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcodmlzaXRlZFVSTCkpOwogICAgIFdLQ29udGV4dEFk ZFZpc2l0ZWRMaW5rKGV3a0NvbnRleHQtPmNvbnRleHQuZ2V0KCksIHdrVmlzaXRlZFVSTC5nZXQo KSk7CiB9CisKK0VpbmFfQm9vbCBld2tfY29udGV4dF9jYWNoZV9tb2RlbF9zZXQoRXdrX0NvbnRl eHQqIGV3a0NvbnRleHQsIEV3a19DYWNoZV9Nb2RlbCBjYWNoZU1vZGVsKQoreworICAgIEVJTkFf U0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChld2tDb250ZXh0LCBmYWxzZSk7CisKKyAgICBzd2l0 Y2ggKGNhY2hlTW9kZWwpIHsKKyAgICBjYXNlIEVXS19DQUNIRV9NT0RFTF9ET0NVTUVOVF9WSUVX RVI6CisgICAgICAgIFdLQ29udGV4dFNldENhY2hlTW9kZWwoZXdrX2NvbnRleHRfV0tDb250ZXh0 X2dldChld2tDb250ZXh0KSwga1dLQ2FjaGVNb2RlbERvY3VtZW50Vmlld2VyKTsKKyAgICAgICAg YnJlYWs7CisgICAgY2FzZSBFV0tfQ0FDSEVfTU9ERUxfRE9DVU1FTlRfQlJPV1NFUjoKKyAgICAg ICAgV0tDb250ZXh0U2V0Q2FjaGVNb2RlbChld2tfY29udGV4dF9XS0NvbnRleHRfZ2V0KGV3a0Nv bnRleHQpLCBrV0tDYWNoZU1vZGVsRG9jdW1lbnRCcm93c2VyKTsKKyAgICAgICAgYnJlYWs7Cisg ICAgY2FzZSBFV0tfQ0FDSEVfTU9ERUxfUFJJTUFSWV9XRUJCUk9XU0VSOgorICAgICAgICBXS0Nv bnRleHRTZXRDYWNoZU1vZGVsKGV3a19jb250ZXh0X1dLQ29udGV4dF9nZXQoZXdrQ29udGV4dCks IGtXS0NhY2hlTW9kZWxQcmltYXJ5V2ViQnJvd3Nlcik7CisgICAgICAgIGJyZWFrOworICAgIGRl ZmF1bHQ6CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIH07CisKKyAgICByZXR1 cm4gdHJ1ZTsKK30KKworRXdrX0NhY2hlX01vZGVsIGV3a19jb250ZXh0X2NhY2hlX21vZGVsX2dl dChFd2tfQ29udGV4dCogZXdrQ29udGV4dCkKK3sKKyAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JF VFVSTl9WQUwoZXdrQ29udGV4dCwgRVdLX0NBQ0hFX01PREVMX0RPQ1VNRU5UX1ZJRVdFUik7Cisg ICAgV0tDYWNoZU1vZGVsIGNhY2hlTW9kZWwgPSBXS0NvbnRleHRHZXRDYWNoZU1vZGVsKGV3a19j b250ZXh0X1dLQ29udGV4dF9nZXQoZXdrQ29udGV4dCkpOworCisgICAgc3dpdGNoIChjYWNoZU1v ZGVsKSB7CisgICAgY2FzZSBrV0tDYWNoZU1vZGVsRG9jdW1lbnRWaWV3ZXI6CisgICAgICAgIHJl dHVybiBFV0tfQ0FDSEVfTU9ERUxfRE9DVU1FTlRfVklFV0VSOworICAgIGNhc2Uga1dLQ2FjaGVN b2RlbERvY3VtZW50QnJvd3NlcjoKKyAgICAgICAgcmV0dXJuIEVXS19DQUNIRV9NT0RFTF9ET0NV TUVOVF9CUk9XU0VSOworICAgIGNhc2Uga1dLQ2FjaGVNb2RlbFByaW1hcnlXZWJCcm93c2VyOgor ICAgICAgICByZXR1cm4gRVdLX0NBQ0hFX01PREVMX1BSSU1BUllfV0VCQlJPV1NFUjsKKyAgICB9 CisKKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4gRVdLX0NBQ0hFX01PREVM X0RPQ1VNRU5UX1ZJRVdFUjsKK30KKwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a19jb250ZXh0LmgKaW5kZXggM2Y0NmQ0NjBlMDA4YTVkMGRlYmJmYjMwZjM1ZTQzZmZl OGYwZmE3ZS4uZDRmMzU4ZGY0ZTA3ZTBhODRmYWZjZGVmOGMyZTUzZGZkMzU0MDllNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5oCkBAIC01MCw2 ICs1MCwyMCBAQCBleHRlcm4gIkMiIHsKIHR5cGVkZWYgc3RydWN0IF9Fd2tfQ29udGV4dCBFd2tf Q29udGV4dDsKIAogLyoqCisgKiBcZW51bSAgICBfRXdrX0NhY2hlX01vZGVsCisgKgorICogQGJy aWVmICAgQ29udGFpbnMgb3B0aW9uIGZvciBjYWNoZSBtb2RlbAorICovCitlbnVtIF9Fd2tfQ2Fj aGVfTW9kZWwgeworICAgIEVXS19DQUNIRV9NT0RFTF9ET0NVTUVOVF9WSUVXRVIsCisgICAgRVdL X0NBQ0hFX01PREVMX0RPQ1VNRU5UX0JST1dTRVIsCisgICAgRVdLX0NBQ0hFX01PREVMX1BSSU1B UllfV0VCQlJPV1NFUgorfTsKKworLy8vIENyZWF0ZXMgYSB0eXBlIG5hbWUgZm9yIHRoZSBfRXdr X0NhY2hlX01vZGVsLgordHlwZWRlZiBlbnVtIF9Fd2tfQ2FjaGVfTW9kZWwgRXdrX0NhY2hlX01v ZGVsOworCisvKioKICAqIEB0eXBlZGVmIEV3a19VcmxfU2NoZW1lX1JlcXVlc3RfQ2IgRXdrX1Vy bF9TY2hlbWVfUmVxdWVzdF9DYgogICogQGJyaWVmIENhbGxiYWNrIHR5cGUgZm9yIHVzZSB3aXRo IGV3a19jb250ZXh0X3VybF9zY2hlbWVfcmVnaXN0ZXIoKS4KICAqLwpAQCAtMjU4LDYgKzI3Miwy NSBAQCBFQVBJIHZvaWQgZXdrX2NvbnRleHRfaGlzdG9yeV9jYWxsYmFja3Nfc2V0KEV3a19Db250 ZXh0ICpjb250ZXh0LAogICovCiBFQVBJIHZvaWQgZXdrX2NvbnRleHRfdmlzaXRlZF9saW5rX2Fk ZChFd2tfQ29udGV4dCAqY29udGV4dCwgY29uc3QgY2hhciAqdmlzaXRlZF91cmwpOwogCisvKioK KyAqIFNldCBAYSBjYWNoZV9tb2RlbCBhcyB0aGUgY2FjaGUgbW9kZWwgZm9yIEBhIGNvbnRleHQu CisgKgorICogQnkgZGVmYXVsdCwgaXQgaXMgRVdLX0NBQ0hFX01PREVMX0RPQ1VNRU5UX0JST1dT RVIuCisgKgorICogQHBhcmFtIGNvbnRleHQgY29udGV4dCBvYmplY3QgdG8gdXBkYXRlLgorICog QHBhcmFtIGNhY2hlX21vZGVsIGEgI0V3a19DYWNoZV9Nb2RlbAorICovCitFQVBJIEVpbmFfQm9v bCBld2tfY29udGV4dF9jYWNoZV9tb2RlbF9zZXQoRXdrX0NvbnRleHQgKmNvbnRleHQsIEV3a19D YWNoZV9Nb2RlbCBjYWNoZV9tb2RlbCk7CisKKy8qKgorICogR2V0cyB0aGUgY2FjaGUgbW9kZWwg Zm9yIEBhIGNvbnRleHQuCisgKgorICogQHBhcmFtIGNvbnRleHQgY29udGV4dCBvYmplY3QgdG8g cXVlcnkuCisgKgorICogQHJldHVybiB0aGUgY2FjaGUgbW9kZWwgZm9yIHRoZSBAYSBjb250ZXh0 LgorICovCitFQVBJIEV3a19DYWNoZV9Nb2RlbCBld2tfY29udGV4dF9jYWNoZV9tb2RlbF9nZXQo RXdrX0NvbnRleHQgKmNvbnRleHQpOworCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0KICNlbmRpZgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9l d2syX2NvbnRleHQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMv dGVzdF9ld2syX2NvbnRleHQuY3BwCmluZGV4IGRmZjQ4NTM0ODVhYjAwNzIzMDhkODk0NjViYzVh NjFhYjhiNDlhZmYuLmI5ZTdmZjcxOTY5MzRiYjQ0NWMwYzJhYTZmY2M3ZjEzOTQ4OTBmODggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdr Ml9jb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0 cy90ZXN0X2V3azJfY29udGV4dC5jcHAKQEAgLTE3MiwzICsxNzIsMTcgQEAgVEVTVF9GKEVXSzJV bml0VGVzdEJhc2UsIGV3a19jb250ZXh0X3JlZikKICAgICBld2tfY29udGV4dF91bnJlZihjb250 ZXh0KTsKICAgICBld2tfY29udGV4dF91bnJlZihjb250ZXh0KTsKIH0KKworVEVTVF9GKEVXSzJV bml0VGVzdEJhc2UsIGV3a19jb250ZXh0X2NhY2hlX21vZGVsKQoreworICAgIEV3a19Db250ZXh0 KiBjb250ZXh0ID0gZXdrX3ZpZXdfY29udGV4dF9nZXQod2ViVmlldygpKTsKKworICAgIEFTU0VS VF9UUlVFKGV3a19jb250ZXh0X2NhY2hlX21vZGVsX3NldChjb250ZXh0LCBFV0tfQ0FDSEVfTU9E RUxfRE9DVU1FTlRfVklFV0VSKSk7CisgICAgQVNTRVJUX0VRKEVXS19DQUNIRV9NT0RFTF9ET0NV TUVOVF9WSUVXRVIsIGV3a19jb250ZXh0X2NhY2hlX21vZGVsX2dldChjb250ZXh0KSk7CisKKyAg ICBBU1NFUlRfVFJVRShld2tfY29udGV4dF9jYWNoZV9tb2RlbF9zZXQoY29udGV4dCwgRVdLX0NB Q0hFX01PREVMX0RPQ1VNRU5UX0JST1dTRVIpKTsKKyAgICBBU1NFUlRfRVEoRVdLX0NBQ0hFX01P REVMX0RPQ1VNRU5UX0JST1dTRVIsIGV3a19jb250ZXh0X2NhY2hlX21vZGVsX2dldChjb250ZXh0 KSk7CisKKyAgICBBU1NFUlRfVFJVRShld2tfY29udGV4dF9jYWNoZV9tb2RlbF9zZXQoY29udGV4 dCwgRVdLX0NBQ0hFX01PREVMX1BSSU1BUllfV0VCQlJPV1NFUikpOworICAgIEFTU0VSVF9FUShF V0tfQ0FDSEVfTU9ERUxfUFJJTUFSWV9XRUJCUk9XU0VSLCBld2tfY29udGV4dF9jYWNoZV9tb2Rl bF9nZXQoY29udGV4dCkpOworfQo= 168650 2012-10-15 01:53:00 -0700 2012-10-15 19:08:06 -0700 Patch bug-98889-20121015175151.patch text/plain 5899 js45.yang U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxMjg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTY0YzYwMjczZTI2OGEx YmE4YmU3NDkyYzQ2OTY4NjQ4NzIxOWVkYi4uYTFlMzNlZTAwYmZiZTdlZDZhMTE1ZmUyNWFkYzU2 OTJkNWFjYjRlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTEwLTE1ICBKb25n c2VvayBZYW5nICA8anM0NS55YW5nQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtFRkxdW1dLMl0g QWRkIEFQSXMgZm9yIGNhY2hlIG1vZGVsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD05ODg4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZCBld2tfY29udGV4dF9jYWNoZV9tb2RlbF9zZXQoKSwgZXdrX2Nv bnRleHRfY2FjaGVfbW9kZWxfZ2V0KCkuCisKKyAgICAgICAgVGhlIGNhY2hlIG1vZGVsIG1lYW5z IHRoZSBsZXZlbCBmb3IgdGhlIGNhY2hlIGNhcGFjaXR5LgorICAgICAgICBJZiBFV0tfQ0FDSEVf TU9ERUxfRE9DVU1FTlRfQlJPV1NFUiwgdGhlIGJpZ2dlc3QgY2FjaGUgY2FwYWNpdHkgd2lsbCBi ZSBzZXQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5jcHA6Cisg ICAgICAgIChld2tfY29udGV4dF9jYWNoZV9tb2RlbF9zZXQpOgorICAgICAgICAoZXdrX2NvbnRl eHRfY2FjaGVfbW9kZWxfZ2V0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29u dGV4dC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9jb250 ZXh0LmNwcDoKKyAgICAgICAgKFRFU1RfRik6CisKIDIwMTItMTAtMTQgIEFuZGVycyBDYXJsc3Nv biAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggdGhlIHdvcmxkLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwCmluZGV4IDAy ZWRkYjQyZDBkZDI5ZjFlYzBmYTU5YmQ3ZTk2OTMxNjk1Y2U3ZDkuLjBjYTRkODg0OTU4Nzg4NTJm NzY3YzNhZjAwMzQ1NjVkZGU2N2JjMTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC9ld2tfY29udGV4dC5jcHAKQEAgLTM3LDYgKzM3LDcgQEAKICNpbmNsdWRlICJl d2tfY29va2llX21hbmFnZXJfcHJpdmF0ZS5oIgogI2luY2x1ZGUgImV3a19kb3dubG9hZF9qb2Iu aCIKICNpbmNsdWRlICJld2tfZG93bmxvYWRfam9iX3ByaXZhdGUuaCIKKyNpbmNsdWRlICJld2tf cHJpdmF0ZS5oIgogI2luY2x1ZGUgPFdlYkNvcmUvRmlsZVN5c3RlbS5oPgogI2luY2x1ZGUgPHd0 Zi9IYXNoTWFwLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CkBAIC0zMTUsMyAr MzE2LDIzIEBAIHZvaWQgZXdrX2NvbnRleHRfdmlzaXRlZF9saW5rX2FkZChFd2tfQ29udGV4dCog ZXdrQ29udGV4dCwgY29uc3QgY2hhciogdmlzaXRlZFVSCiAgICAgV0tSZXRhaW5QdHI8V0tTdHJp bmdSZWY+IHdrVmlzaXRlZFVSTChBZG9wdFdLLCBXS1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmlu Zyh2aXNpdGVkVVJMKSk7CiAgICAgV0tDb250ZXh0QWRkVmlzaXRlZExpbmsoZXdrQ29udGV4dC0+ Y29udGV4dC5nZXQoKSwgd2tWaXNpdGVkVVJMLmdldCgpKTsKIH0KKworLy8gRXdrX0NhY2hlX01v ZGVsIGVudW0gdmFsaWRhdGlvbgorQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShFV0tfQ0FD SEVfTU9ERUxfRE9DVU1FTlRfVklFV0VSLCBrV0tDYWNoZU1vZGVsRG9jdW1lbnRWaWV3ZXIpOwor Q09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShFV0tfQ0FDSEVfTU9ERUxfRE9DVU1FTlRfQlJP V1NFUiwga1dLQ2FjaGVNb2RlbERvY3VtZW50QnJvd3Nlcik7CitDT01QSUxFX0FTU0VSVF9NQVRD SElOR19FTlVNKEVXS19DQUNIRV9NT0RFTF9QUklNQVJZX1dFQkJST1dTRVIsIGtXS0NhY2hlTW9k ZWxQcmltYXJ5V2ViQnJvd3Nlcik7CisKK0VpbmFfQm9vbCBld2tfY29udGV4dF9jYWNoZV9tb2Rl bF9zZXQoRXdrX0NvbnRleHQqIGV3a0NvbnRleHQsIEV3a19DYWNoZV9Nb2RlbCBjYWNoZU1vZGVs KQoreworICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChld2tDb250ZXh0LCBmYWxz ZSk7CisgICAgV0tDb250ZXh0U2V0Q2FjaGVNb2RlbChld2tfY29udGV4dF9XS0NvbnRleHRfZ2V0 KGV3a0NvbnRleHQpLCBzdGF0aWNfY2FzdDxFd2tfQ2FjaGVfTW9kZWw+KGNhY2hlTW9kZWwpKTsK KyAgICByZXR1cm4gdHJ1ZTsKK30KKworRXdrX0NhY2hlX01vZGVsIGV3a19jb250ZXh0X2NhY2hl X21vZGVsX2dldChjb25zdCBFd2tfQ29udGV4dCogZXdrQ29udGV4dCkKK3sKKyAgICBFSU5BX1NB RkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoZXdrQ29udGV4dCwgRVdLX0NBQ0hFX01PREVMX0RPQ1VN RU5UX1ZJRVdFUik7CisgICAgV0tDYWNoZU1vZGVsIGNhY2hlTW9kZWwgPSBXS0NvbnRleHRHZXRD YWNoZU1vZGVsKGV3a19jb250ZXh0X1dLQ29udGV4dF9nZXQoZXdrQ29udGV4dCkpOworICAgIHJl dHVybiBzdGF0aWNfY2FzdDxFd2tfQ2FjaGVfTW9kZWw+KGNhY2hlTW9kZWwpOworfQorCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5oIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuaAppbmRleCAzZjQ2 ZDQ2MGUwMDhhNWQwZGViYmZiMzBmMzVlNDNmZmU4ZjBmYTdlLi45YjZlMjJjNTMzMTJlOGM2MTY1 MGM5ZGMzY2I4ZWY1YTFjMGE4MzdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC9ld2tfY29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL2V3a19jb250ZXh0LmgKQEAgLTUwLDYgKzUwLDIzIEBAIGV4dGVybiAiQyIgewogdHlw ZWRlZiBzdHJ1Y3QgX0V3a19Db250ZXh0IEV3a19Db250ZXh0OwogCiAvKioKKyAqIFxlbnVtICAg IF9Fd2tfQ2FjaGVfTW9kZWwKKyAqCisgKiBAYnJpZWYgICBDb250YWlucyBvcHRpb24gZm9yIGNh Y2hlIG1vZGVsCisgKi8KK2VudW0gX0V3a19DYWNoZV9Nb2RlbCB7CisgICAgLy8vIFVzZSB0aGUg c21hbGxlc3QgY2FjaGUgY2FwYWNpdHkuCisgICAgRVdLX0NBQ0hFX01PREVMX0RPQ1VNRU5UX1ZJ RVdFUiwKKyAgICAvLy8gVXNlIGJpZ2dlciBjYWNoZSBjYXBhY2l0eSB0aGFuIEVXS19DQUNIRV9N T0RFTF9ET0NVTUVOVF9WSUVXRVIuCisgICAgRVdLX0NBQ0hFX01PREVMX0RPQ1VNRU5UX0JST1dT RVIsCisgICAgLy8vIFVzZSB0aGUgYmlnZ2VzdCBjYWNoZSBjYXBhY2l0eS4KKyAgICBFV0tfQ0FD SEVfTU9ERUxfUFJJTUFSWV9XRUJCUk9XU0VSCit9OworCisvLy8gQ3JlYXRlcyBhIHR5cGUgbmFt ZSBmb3IgdGhlIF9Fd2tfQ2FjaGVfTW9kZWwuCit0eXBlZGVmIGVudW0gX0V3a19DYWNoZV9Nb2Rl bCBFd2tfQ2FjaGVfTW9kZWw7CisKKy8qKgogICogQHR5cGVkZWYgRXdrX1VybF9TY2hlbWVfUmVx dWVzdF9DYiBFd2tfVXJsX1NjaGVtZV9SZXF1ZXN0X0NiCiAgKiBAYnJpZWYgQ2FsbGJhY2sgdHlw ZSBmb3IgdXNlIHdpdGggZXdrX2NvbnRleHRfdXJsX3NjaGVtZV9yZWdpc3RlcigpLgogICovCkBA IC0yNTgsNiArMjc1LDI3IEBAIEVBUEkgdm9pZCBld2tfY29udGV4dF9oaXN0b3J5X2NhbGxiYWNr c19zZXQoRXdrX0NvbnRleHQgKmNvbnRleHQsCiAgKi8KIEVBUEkgdm9pZCBld2tfY29udGV4dF92 aXNpdGVkX2xpbmtfYWRkKEV3a19Db250ZXh0ICpjb250ZXh0LCBjb25zdCBjaGFyICp2aXNpdGVk X3VybCk7CiAKKy8qKgorICogU2V0IEBhIGNhY2hlX21vZGVsIGFzIHRoZSBjYWNoZSBtb2RlbCBm b3IgQGEgY29udGV4dC4KKyAqCisgKiBCeSBkZWZhdWx0LCBpdCBpcyBFV0tfQ0FDSEVfTU9ERUxf RE9DVU1FTlRfQlJPV1NFUi4KKyAqCisgKiBAcGFyYW0gY29udGV4dCBjb250ZXh0IG9iamVjdCB0 byB1cGRhdGUuCisgKiBAcGFyYW0gY2FjaGVfbW9kZWwgYSAjRXdrX0NhY2hlX01vZGVsLgorICoK KyAqIEByZXR1cm4gQGMgRUlOQV9UUlVFIG9uIHN1Y2Nlc3Mgb3IgQGMgRUlOQV9GQUxTRSBvbiBm YWlsdXJlCisgKi8KK0VBUEkgRWluYV9Cb29sIGV3a19jb250ZXh0X2NhY2hlX21vZGVsX3NldChF d2tfQ29udGV4dCAqY29udGV4dCwgRXdrX0NhY2hlX01vZGVsIGNhY2hlX21vZGVsKTsKKworLyoq CisgKiBHZXRzIHRoZSBjYWNoZSBtb2RlbCBmb3IgQGEgY29udGV4dC4KKyAqCisgKiBAcGFyYW0g Y29udGV4dCBjb250ZXh0IG9iamVjdCB0byBxdWVyeS4KKyAqCisgKiBAcmV0dXJuIHRoZSBjYWNo ZSBtb2RlbCBmb3IgdGhlIEBhIGNvbnRleHQuCisgKi8KK0VBUEkgRXdrX0NhY2hlX01vZGVsIGV3 a19jb250ZXh0X2NhY2hlX21vZGVsX2dldChjb25zdCBFd2tfQ29udGV4dCAqY29udGV4dCk7CisK ICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dC5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dC5jcHAKaW5k ZXggZGZmNDg1MzQ4NWFiMDA3MjMwOGQ4OTQ2NWJjNWE2MWFiOGI0OWFmZi4uNzIxNGZkNjc2OWZk MzIwOWIzMTRlMjE4ZGE4MzUwYzNjNTBkNTVmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2NvbnRleHQuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9jb250ZXh0LmNwcApA QCAtMTcyLDMgKzE3MiwxOSBAQCBURVNUX0YoRVdLMlVuaXRUZXN0QmFzZSwgZXdrX2NvbnRleHRf cmVmKQogICAgIGV3a19jb250ZXh0X3VucmVmKGNvbnRleHQpOwogICAgIGV3a19jb250ZXh0X3Vu cmVmKGNvbnRleHQpOwogfQorCitURVNUX0YoRVdLMlVuaXRUZXN0QmFzZSwgZXdrX2NvbnRleHRf Y2FjaGVfbW9kZWwpCit7CisgICAgRXdrX0NvbnRleHQqIGNvbnRleHQgPSBld2tfdmlld19jb250 ZXh0X2dldCh3ZWJWaWV3KCkpOworCisgICAgQVNTRVJUX0VRKEVXS19DQUNIRV9NT0RFTF9ET0NV TUVOVF9CUk9XU0VSLCBld2tfY29udGV4dF9jYWNoZV9tb2RlbF9nZXQoY29udGV4dCkpOworCisg ICAgQVNTRVJUX1RSVUUoZXdrX2NvbnRleHRfY2FjaGVfbW9kZWxfc2V0KGNvbnRleHQsIEVXS19D QUNIRV9NT0RFTF9ET0NVTUVOVF9WSUVXRVIpKTsKKyAgICBBU1NFUlRfRVEoRVdLX0NBQ0hFX01P REVMX0RPQ1VNRU5UX1ZJRVdFUiwgZXdrX2NvbnRleHRfY2FjaGVfbW9kZWxfZ2V0KGNvbnRleHQp KTsKKworICAgIEFTU0VSVF9UUlVFKGV3a19jb250ZXh0X2NhY2hlX21vZGVsX3NldChjb250ZXh0 LCBFV0tfQ0FDSEVfTU9ERUxfRE9DVU1FTlRfQlJPV1NFUikpOworICAgIEFTU0VSVF9FUShFV0tf Q0FDSEVfTU9ERUxfRE9DVU1FTlRfQlJPV1NFUiwgZXdrX2NvbnRleHRfY2FjaGVfbW9kZWxfZ2V0 KGNvbnRleHQpKTsKKworICAgIEFTU0VSVF9UUlVFKGV3a19jb250ZXh0X2NhY2hlX21vZGVsX3Nl dChjb250ZXh0LCBFV0tfQ0FDSEVfTU9ERUxfUFJJTUFSWV9XRUJCUk9XU0VSKSk7CisgICAgQVNT RVJUX0VRKEVXS19DQUNIRV9NT0RFTF9QUklNQVJZX1dFQkJST1dTRVIsIGV3a19jb250ZXh0X2Nh Y2hlX21vZGVsX2dldChjb250ZXh0KSk7Cit9Cg== 168838 2012-10-15 19:08:12 -0700 2012-10-15 19:53:43 -0700 Patch bug-98889-20121016110701.patch text/plain 5988 js45.yang U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxMzk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYTVhYTEyOTY1ZGY3OWY0 YTI5MTY3Mzg5OTAzNTc4Yzg3MWE0YmEzNS4uNTlmZTlkNjgwYzY0MjU5MzdlMzMyY2QxZDQ5Yzcy ZDMzYjY0ZGY5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTEwLTE1ICBKb25n c2VvayBZYW5nICA8anM0NS55YW5nQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtFRkxdW1dLMl0g QWRkIEFQSXMgZm9yIGNhY2hlIG1vZGVsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD05ODg4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZCBld2tfY29udGV4dF9jYWNoZV9tb2RlbF9zZXQoKSwgZXdrX2Nv bnRleHRfY2FjaGVfbW9kZWxfZ2V0KCkuCisKKyAgICAgICAgVGhlIGNhY2hlIG1vZGVsIG1lYW5z IHRoZSBsZXZlbCBmb3IgdGhlIGNhY2hlIGNhcGFjaXR5LgorICAgICAgICBJZiBFV0tfQ0FDSEVf TU9ERUxfRE9DVU1FTlRfQlJPV1NFUiwgdGhlIGJpZ2dlc3QgY2FjaGUgY2FwYWNpdHkgd2lsbCBi ZSBzZXQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5jcHA6Cisg ICAgICAgIChld2tfY29udGV4dF9jYWNoZV9tb2RlbF9zZXQpOgorICAgICAgICAoZXdrX2NvbnRl eHRfY2FjaGVfbW9kZWxfZ2V0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29u dGV4dC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9jb250 ZXh0LmNwcDoKKyAgICAgICAgKFRFU1RfRik6CisKIDIwMTItMTAtMTUgIERhbiBCZXJuc3RlaW4g IDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWJLaXQyIHBhcnQgb2YgPHJkYXI6Ly9wcm9i bGVtLzEyNDcwNjgwPiBGb2504oCZcyBmYXN0IGNvZGUgcGF0aCBkb2VzbuKAmXQgc3VwcG9ydCBr ZXJuaW5nIGFuZCBsaWdhdHVyZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZWZsL2V3a19jb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a19jb250ZXh0LmNwcAppbmRleCBjMjI1MTQ2MjVhNmJlN2IyNzQwNjc1ODBhOTc2ZmE1 YmI1NjgyZWYyLi5kYjE4NzhiMWQ3YTJlODM0MDA1YmU5M2Y0NzhiMDhjZGM5NmI2N2Q2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwCkBA IC0zOCw2ICszOCw3IEBACiAjaW5jbHVkZSAiZXdrX2Rvd25sb2FkX2pvYi5oIgogI2luY2x1ZGUg ImV3a19kb3dubG9hZF9qb2JfcHJpdmF0ZS5oIgogI2luY2x1ZGUgImV3a19mYXZpY29uX2RhdGFi YXNlX3ByaXZhdGUuaCIKKyNpbmNsdWRlICJld2tfcHJpdmF0ZS5oIgogI2luY2x1ZGUgPFdlYkNv cmUvRmlsZVN5c3RlbS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvSWNvbkRhdGFiYXNlLmg+CiAjaW5j bHVkZSA8d3RmL0hhc2hNYXAuaD4KQEAgLTMzOCwzICszMzksMjMgQEAgdm9pZCBld2tfY29udGV4 dF92aXNpdGVkX2xpbmtfYWRkKEV3a19Db250ZXh0KiBld2tDb250ZXh0LCBjb25zdCBjaGFyKiB2 aXNpdGVkVVIKICAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gd2tWaXNpdGVkVVJMKEFkb3B0 V0ssIFdLU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKHZpc2l0ZWRVUkwpKTsKICAgICBXS0Nv bnRleHRBZGRWaXNpdGVkTGluayhld2tDb250ZXh0LT5jb250ZXh0LmdldCgpLCB3a1Zpc2l0ZWRV UkwuZ2V0KCkpOwogfQorCisvLyBFd2tfQ2FjaGVfTW9kZWwgZW51bSB2YWxpZGF0aW9uCitDT01Q SUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKEVXS19DQUNIRV9NT0RFTF9ET0NVTUVOVF9WSUVXRVIs IGtXS0NhY2hlTW9kZWxEb2N1bWVudFZpZXdlcik7CitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19F TlVNKEVXS19DQUNIRV9NT0RFTF9ET0NVTUVOVF9CUk9XU0VSLCBrV0tDYWNoZU1vZGVsRG9jdW1l bnRCcm93c2VyKTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oRVdLX0NBQ0hFX01PREVM X1BSSU1BUllfV0VCQlJPV1NFUiwga1dLQ2FjaGVNb2RlbFByaW1hcnlXZWJCcm93c2VyKTsKKwor RWluYV9Cb29sIGV3a19jb250ZXh0X2NhY2hlX21vZGVsX3NldChFd2tfQ29udGV4dCogZXdrQ29u dGV4dCwgRXdrX0NhY2hlX01vZGVsIGNhY2hlTW9kZWwpCit7CisgICAgRUlOQV9TQUZFVFlfT05f TlVMTF9SRVRVUk5fVkFMKGV3a0NvbnRleHQsIGZhbHNlKTsKKyAgICBXS0NvbnRleHRTZXRDYWNo ZU1vZGVsKGV3a19jb250ZXh0X1dLQ29udGV4dF9nZXQoZXdrQ29udGV4dCksIHN0YXRpY19jYXN0 PEV3a19DYWNoZV9Nb2RlbD4oY2FjaGVNb2RlbCkpOworICAgIHJldHVybiB0cnVlOworfQorCitF d2tfQ2FjaGVfTW9kZWwgZXdrX2NvbnRleHRfY2FjaGVfbW9kZWxfZ2V0KGNvbnN0IEV3a19Db250 ZXh0KiBld2tDb250ZXh0KQoreworICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChl d2tDb250ZXh0LCBFV0tfQ0FDSEVfTU9ERUxfRE9DVU1FTlRfVklFV0VSKTsKKyAgICBXS0NhY2hl TW9kZWwgY2FjaGVNb2RlbCA9IFdLQ29udGV4dEdldENhY2hlTW9kZWwoZXdrX2NvbnRleHRfV0tD b250ZXh0X2dldChld2tDb250ZXh0KSk7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PEV3a19DYWNo ZV9Nb2RlbD4oY2FjaGVNb2RlbCk7Cit9CisKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfY29udGV4dC5oCmluZGV4IDhjMGY2MjhlNmRjNDQ0ZDEyZDBlM2M5OTk1ZWZm NzliOGM3ZDdiOGIuLmRhOGNmYWFhZjI2OTg4NjE2NzZhYjkwNGIxMzQyOTM2YTU0N2RiNGMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0LmgK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuaApAQCAt NTEsNiArNTEsMjMgQEAgZXh0ZXJuICJDIiB7CiB0eXBlZGVmIHN0cnVjdCBfRXdrX0NvbnRleHQg RXdrX0NvbnRleHQ7CiAKIC8qKgorICogXGVudW0gICAgX0V3a19DYWNoZV9Nb2RlbAorICoKKyAq IEBicmllZiAgIENvbnRhaW5zIG9wdGlvbiBmb3IgY2FjaGUgbW9kZWwKKyAqLworZW51bSBfRXdr X0NhY2hlX01vZGVsIHsKKyAgICAvLy8gVXNlIHRoZSBzbWFsbGVzdCBjYWNoZSBjYXBhY2l0eS4K KyAgICBFV0tfQ0FDSEVfTU9ERUxfRE9DVU1FTlRfVklFV0VSLAorICAgIC8vLyBVc2UgYmlnZ2Vy IGNhY2hlIGNhcGFjaXR5IHRoYW4gRVdLX0NBQ0hFX01PREVMX0RPQ1VNRU5UX1ZJRVdFUi4KKyAg ICBFV0tfQ0FDSEVfTU9ERUxfRE9DVU1FTlRfQlJPV1NFUiwKKyAgICAvLy8gVXNlIHRoZSBiaWdn ZXN0IGNhY2hlIGNhcGFjaXR5LgorICAgIEVXS19DQUNIRV9NT0RFTF9QUklNQVJZX1dFQkJST1dT RVIKK307CisKKy8vLyBDcmVhdGVzIGEgdHlwZSBuYW1lIGZvciB0aGUgX0V3a19DYWNoZV9Nb2Rl bC4KK3R5cGVkZWYgZW51bSBfRXdrX0NhY2hlX01vZGVsIEV3a19DYWNoZV9Nb2RlbDsKKworLyoq CiAgKiBAdHlwZWRlZiBFd2tfVXJsX1NjaGVtZV9SZXF1ZXN0X0NiIEV3a19VcmxfU2NoZW1lX1Jl cXVlc3RfQ2IKICAqIEBicmllZiBDYWxsYmFjayB0eXBlIGZvciB1c2Ugd2l0aCBld2tfY29udGV4 dF91cmxfc2NoZW1lX3JlZ2lzdGVyKCkuCiAgKi8KQEAgLTI2OCw2ICsyODUsMjcgQEAgRUFQSSB2 b2lkIGV3a19jb250ZXh0X2hpc3RvcnlfY2FsbGJhY2tzX3NldChFd2tfQ29udGV4dCAqY29udGV4 dCwKICAqLwogRUFQSSB2b2lkIGV3a19jb250ZXh0X3Zpc2l0ZWRfbGlua19hZGQoRXdrX0NvbnRl eHQgKmNvbnRleHQsIGNvbnN0IGNoYXIgKnZpc2l0ZWRfdXJsKTsKIAorLyoqCisgKiBTZXQgQGEg Y2FjaGVfbW9kZWwgYXMgdGhlIGNhY2hlIG1vZGVsIGZvciBAYSBjb250ZXh0LgorICoKKyAqIEJ5 IGRlZmF1bHQsIGl0IGlzIEVXS19DQUNIRV9NT0RFTF9ET0NVTUVOVF9CUk9XU0VSLgorICoKKyAq IEBwYXJhbSBjb250ZXh0IGNvbnRleHQgb2JqZWN0IHRvIHVwZGF0ZS4KKyAqIEBwYXJhbSBjYWNo ZV9tb2RlbCBhICNFd2tfQ2FjaGVfTW9kZWwuCisgKgorICogQHJldHVybiBAYyBFSU5BX1RSVUUg b24gc3VjY2VzcyBvciBAYyBFSU5BX0ZBTFNFIG9uIGZhaWx1cmUKKyAqLworRUFQSSBFaW5hX0Jv b2wgZXdrX2NvbnRleHRfY2FjaGVfbW9kZWxfc2V0KEV3a19Db250ZXh0ICpjb250ZXh0LCBFd2tf Q2FjaGVfTW9kZWwgY2FjaGVfbW9kZWwpOworCisvKioKKyAqIEdldHMgdGhlIGNhY2hlIG1vZGVs IGZvciBAYSBjb250ZXh0LgorICoKKyAqIEBwYXJhbSBjb250ZXh0IGNvbnRleHQgb2JqZWN0IHRv IHF1ZXJ5LgorICoKKyAqIEByZXR1cm4gdGhlIGNhY2hlIG1vZGVsIGZvciB0aGUgQGEgY29udGV4 dC4KKyAqLworRUFQSSBFd2tfQ2FjaGVfTW9kZWwgZXdrX2NvbnRleHRfY2FjaGVfbW9kZWxfZ2V0 KGNvbnN0IEV3a19Db250ZXh0ICpjb250ZXh0KTsKKwogI2lmZGVmIF9fY3BsdXNwbHVzCiB9CiAj ZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3Rz L3Rlc3RfZXdrMl9jb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L3Rlc3RzL3Rlc3RfZXdrMl9jb250ZXh0LmNwcAppbmRleCAzZGY1NzVjYjRjMWRiMmE0OGRiY2Nm OTEwYTI5MzBiNTlkNTViOTYwLi45OTcyNjhkZTI5YjBiNDExMjFjYTBlNDRhNDhmYTZjZWFkZTNl ZWJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90 ZXN0X2V3azJfY29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvdGVzdHMvdGVzdF9ld2syX2NvbnRleHQuY3BwCkBAIC0xODAsMyArMTgwLDE5IEBAIFRFU1Rf RihFV0syVW5pdFRlc3RCYXNlLCBld2tfY29udGV4dF9yZWYpCiAgICAgZXdrX2NvbnRleHRfdW5y ZWYoY29udGV4dCk7CiAgICAgZXdrX2NvbnRleHRfdW5yZWYoY29udGV4dCk7CiB9CisKK1RFU1Rf RihFV0syVW5pdFRlc3RCYXNlLCBld2tfY29udGV4dF9jYWNoZV9tb2RlbCkKK3sKKyAgICBFd2tf Q29udGV4dCogY29udGV4dCA9IGV3a192aWV3X2NvbnRleHRfZ2V0KHdlYlZpZXcoKSk7CisKKyAg ICBBU1NFUlRfRVEoRVdLX0NBQ0hFX01PREVMX0RPQ1VNRU5UX0JST1dTRVIsIGV3a19jb250ZXh0 X2NhY2hlX21vZGVsX2dldChjb250ZXh0KSk7CisKKyAgICBBU1NFUlRfVFJVRShld2tfY29udGV4 dF9jYWNoZV9tb2RlbF9zZXQoY29udGV4dCwgRVdLX0NBQ0hFX01PREVMX0RPQ1VNRU5UX1ZJRVdF UikpOworICAgIEFTU0VSVF9FUShFV0tfQ0FDSEVfTU9ERUxfRE9DVU1FTlRfVklFV0VSLCBld2tf Y29udGV4dF9jYWNoZV9tb2RlbF9nZXQoY29udGV4dCkpOworCisgICAgQVNTRVJUX1RSVUUoZXdr X2NvbnRleHRfY2FjaGVfbW9kZWxfc2V0KGNvbnRleHQsIEVXS19DQUNIRV9NT0RFTF9ET0NVTUVO VF9CUk9XU0VSKSk7CisgICAgQVNTRVJUX0VRKEVXS19DQUNIRV9NT0RFTF9ET0NVTUVOVF9CUk9X U0VSLCBld2tfY29udGV4dF9jYWNoZV9tb2RlbF9nZXQoY29udGV4dCkpOworCisgICAgQVNTRVJU X1RSVUUoZXdrX2NvbnRleHRfY2FjaGVfbW9kZWxfc2V0KGNvbnRleHQsIEVXS19DQUNIRV9NT0RF TF9QUklNQVJZX1dFQkJST1dTRVIpKTsKKyAgICBBU1NFUlRfRVEoRVdLX0NBQ0hFX01PREVMX1BS SU1BUllfV0VCQlJPV1NFUiwgZXdrX2NvbnRleHRfY2FjaGVfbW9kZWxfZ2V0KGNvbnRleHQpKTsK K30K 168841 2012-10-15 19:53:49 -0700 2012-10-15 20:25:10 -0700 Patch bug-98889-20121016115239.patch text/plain 5986 js45.yang U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxMzk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYTVhYTEyOTY1ZGY3OWY0 YTI5MTY3Mzg5OTAzNTc4Yzg3MWE0YmEzNS4uNTBhNGQzOTUxYjUzMWM2OTAxNTE1ZGVhZWIxOTU5 NjNiY2MzOGM5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTEwLTE1ICBKb25n c2VvayBZYW5nICA8anM0NS55YW5nQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtFRkxdW1dLMl0g QWRkIEFQSXMgZm9yIGNhY2hlIG1vZGVsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD05ODg4OQorCisgICAgICAgIFJldmlld2VkIGJ5IEd5dXlvdW5nIEtp bS4KKworICAgICAgICBBZGQgZXdrX2NvbnRleHRfY2FjaGVfbW9kZWxfc2V0KCksIGV3a19jb250 ZXh0X2NhY2hlX21vZGVsX2dldCgpLgorCisgICAgICAgIFRoZSBjYWNoZSBtb2RlbCBtZWFucyB0 aGUgbGV2ZWwgZm9yIHRoZSBjYWNoZSBjYXBhY2l0eS4KKyAgICAgICAgSWYgRVdLX0NBQ0hFX01P REVMX0RPQ1VNRU5UX0JST1dTRVIsIHRoZSBiaWdnZXN0IGNhY2hlIGNhcGFjaXR5IHdpbGwgYmUg c2V0LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwOgorICAg ICAgICAoZXdrX2NvbnRleHRfY2FjaGVfbW9kZWxfc2V0KToKKyAgICAgICAgKGV3a19jb250ZXh0 X2NhY2hlX21vZGVsX2dldCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRl eHQuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4 dC5jcHA6CisgICAgICAgIChURVNUX0YpOgorCiAyMDEyLTEwLTE1ICBEYW4gQmVybnN0ZWluICA8 bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViS2l0MiBwYXJ0IG9mIDxyZGFyOi8vcHJvYmxl bS8xMjQ3MDY4MD4gRm9udOKAmXMgZmFzdCBjb2RlIHBhdGggZG9lc27igJl0IHN1cHBvcnQga2Vy bmluZyBhbmQgbGlnYXR1cmVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfY29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9ld2tfY29udGV4dC5jcHAKaW5kZXggYzIyNTE0NjI1YTZiZTdiMjc0MDY3NTgwYTk3NmZhNWJi NTY4MmVmMi4uZGIxODc4YjFkN2EyZTgzNDAwNWJlOTNmNDc4YjA4Y2RjOTZiNjdkNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0LmNwcApAQCAt MzgsNiArMzgsNyBAQAogI2luY2x1ZGUgImV3a19kb3dubG9hZF9qb2IuaCIKICNpbmNsdWRlICJl d2tfZG93bmxvYWRfam9iX3ByaXZhdGUuaCIKICNpbmNsdWRlICJld2tfZmF2aWNvbl9kYXRhYmFz ZV9wcml2YXRlLmgiCisjaW5jbHVkZSAiZXdrX3ByaXZhdGUuaCIKICNpbmNsdWRlIDxXZWJDb3Jl L0ZpbGVTeXN0ZW0uaD4KICNpbmNsdWRlIDxXZWJDb3JlL0ljb25EYXRhYmFzZS5oPgogI2luY2x1 ZGUgPHd0Zi9IYXNoTWFwLmg+CkBAIC0zMzgsMyArMzM5LDIzIEBAIHZvaWQgZXdrX2NvbnRleHRf dmlzaXRlZF9saW5rX2FkZChFd2tfQ29udGV4dCogZXdrQ29udGV4dCwgY29uc3QgY2hhciogdmlz aXRlZFVSCiAgICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IHdrVmlzaXRlZFVSTChBZG9wdFdL LCBXS1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZyh2aXNpdGVkVVJMKSk7CiAgICAgV0tDb250 ZXh0QWRkVmlzaXRlZExpbmsoZXdrQ29udGV4dC0+Y29udGV4dC5nZXQoKSwgd2tWaXNpdGVkVVJM LmdldCgpKTsKIH0KKworLy8gRXdrX0NhY2hlX01vZGVsIGVudW0gdmFsaWRhdGlvbgorQ09NUElM RV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShFV0tfQ0FDSEVfTU9ERUxfRE9DVU1FTlRfVklFV0VSLCBr V0tDYWNoZU1vZGVsRG9jdW1lbnRWaWV3ZXIpOworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5V TShFV0tfQ0FDSEVfTU9ERUxfRE9DVU1FTlRfQlJPV1NFUiwga1dLQ2FjaGVNb2RlbERvY3VtZW50 QnJvd3Nlcik7CitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKEVXS19DQUNIRV9NT0RFTF9Q UklNQVJZX1dFQkJST1dTRVIsIGtXS0NhY2hlTW9kZWxQcmltYXJ5V2ViQnJvd3Nlcik7CisKK0Vp bmFfQm9vbCBld2tfY29udGV4dF9jYWNoZV9tb2RlbF9zZXQoRXdrX0NvbnRleHQqIGV3a0NvbnRl eHQsIEV3a19DYWNoZV9Nb2RlbCBjYWNoZU1vZGVsKQoreworICAgIEVJTkFfU0FGRVRZX09OX05V TExfUkVUVVJOX1ZBTChld2tDb250ZXh0LCBmYWxzZSk7CisgICAgV0tDb250ZXh0U2V0Q2FjaGVN b2RlbChld2tfY29udGV4dF9XS0NvbnRleHRfZ2V0KGV3a0NvbnRleHQpLCBzdGF0aWNfY2FzdDxF d2tfQ2FjaGVfTW9kZWw+KGNhY2hlTW9kZWwpKTsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKworRXdr X0NhY2hlX01vZGVsIGV3a19jb250ZXh0X2NhY2hlX21vZGVsX2dldChjb25zdCBFd2tfQ29udGV4 dCogZXdrQ29udGV4dCkKK3sKKyAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoZXdr Q29udGV4dCwgRVdLX0NBQ0hFX01PREVMX0RPQ1VNRU5UX1ZJRVdFUik7CisgICAgV0tDYWNoZU1v ZGVsIGNhY2hlTW9kZWwgPSBXS0NvbnRleHRHZXRDYWNoZU1vZGVsKGV3a19jb250ZXh0X1dLQ29u dGV4dF9nZXQoZXdrQ29udGV4dCkpOworICAgIHJldHVybiBzdGF0aWNfY2FzdDxFd2tfQ2FjaGVf TW9kZWw+KGNhY2hlTW9kZWwpOworfQorCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX2NvbnRleHQuaAppbmRleCA4YzBmNjI4ZTZkYzQ0NGQxMmQwZTNjOTk5NWVmZjc5 YjhjN2Q3YjhiLi5kYThjZmFhYWYyNjk4ODYxNjc2YWI5MDRiMTM0MjkzNmE1NDdkYjRjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5oCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0LmgKQEAgLTUx LDYgKzUxLDIzIEBAIGV4dGVybiAiQyIgewogdHlwZWRlZiBzdHJ1Y3QgX0V3a19Db250ZXh0IEV3 a19Db250ZXh0OwogCiAvKioKKyAqIFxlbnVtICAgIF9Fd2tfQ2FjaGVfTW9kZWwKKyAqCisgKiBA YnJpZWYgICBDb250YWlucyBvcHRpb24gZm9yIGNhY2hlIG1vZGVsCisgKi8KK2VudW0gX0V3a19D YWNoZV9Nb2RlbCB7CisgICAgLy8vIFVzZSB0aGUgc21hbGxlc3QgY2FjaGUgY2FwYWNpdHkuCisg ICAgRVdLX0NBQ0hFX01PREVMX0RPQ1VNRU5UX1ZJRVdFUiwKKyAgICAvLy8gVXNlIGJpZ2dlciBj YWNoZSBjYXBhY2l0eSB0aGFuIEVXS19DQUNIRV9NT0RFTF9ET0NVTUVOVF9WSUVXRVIuCisgICAg RVdLX0NBQ0hFX01PREVMX0RPQ1VNRU5UX0JST1dTRVIsCisgICAgLy8vIFVzZSB0aGUgYmlnZ2Vz dCBjYWNoZSBjYXBhY2l0eS4KKyAgICBFV0tfQ0FDSEVfTU9ERUxfUFJJTUFSWV9XRUJCUk9XU0VS Cit9OworCisvLy8gQ3JlYXRlcyBhIHR5cGUgbmFtZSBmb3IgdGhlIF9Fd2tfQ2FjaGVfTW9kZWwu Cit0eXBlZGVmIGVudW0gX0V3a19DYWNoZV9Nb2RlbCBFd2tfQ2FjaGVfTW9kZWw7CisKKy8qKgog ICogQHR5cGVkZWYgRXdrX1VybF9TY2hlbWVfUmVxdWVzdF9DYiBFd2tfVXJsX1NjaGVtZV9SZXF1 ZXN0X0NiCiAgKiBAYnJpZWYgQ2FsbGJhY2sgdHlwZSBmb3IgdXNlIHdpdGggZXdrX2NvbnRleHRf dXJsX3NjaGVtZV9yZWdpc3RlcigpLgogICovCkBAIC0yNjgsNiArMjg1LDI3IEBAIEVBUEkgdm9p ZCBld2tfY29udGV4dF9oaXN0b3J5X2NhbGxiYWNrc19zZXQoRXdrX0NvbnRleHQgKmNvbnRleHQs CiAgKi8KIEVBUEkgdm9pZCBld2tfY29udGV4dF92aXNpdGVkX2xpbmtfYWRkKEV3a19Db250ZXh0 ICpjb250ZXh0LCBjb25zdCBjaGFyICp2aXNpdGVkX3VybCk7CiAKKy8qKgorICogU2V0IEBhIGNh Y2hlX21vZGVsIGFzIHRoZSBjYWNoZSBtb2RlbCBmb3IgQGEgY29udGV4dC4KKyAqCisgKiBCeSBk ZWZhdWx0LCBpdCBpcyBFV0tfQ0FDSEVfTU9ERUxfRE9DVU1FTlRfQlJPV1NFUi4KKyAqCisgKiBA cGFyYW0gY29udGV4dCBjb250ZXh0IG9iamVjdCB0byB1cGRhdGUuCisgKiBAcGFyYW0gY2FjaGVf bW9kZWwgYSAjRXdrX0NhY2hlX01vZGVsLgorICoKKyAqIEByZXR1cm4gQGMgRUlOQV9UUlVFIG9u IHN1Y2Nlc3Mgb3IgQGMgRUlOQV9GQUxTRSBvbiBmYWlsdXJlCisgKi8KK0VBUEkgRWluYV9Cb29s IGV3a19jb250ZXh0X2NhY2hlX21vZGVsX3NldChFd2tfQ29udGV4dCAqY29udGV4dCwgRXdrX0Nh Y2hlX01vZGVsIGNhY2hlX21vZGVsKTsKKworLyoqCisgKiBHZXRzIHRoZSBjYWNoZSBtb2RlbCBm b3IgQGEgY29udGV4dC4KKyAqCisgKiBAcGFyYW0gY29udGV4dCBjb250ZXh0IG9iamVjdCB0byBx dWVyeS4KKyAqCisgKiBAcmV0dXJuIHRoZSBjYWNoZSBtb2RlbCBmb3IgdGhlIEBhIGNvbnRleHQu CisgKi8KK0VBUEkgRXdrX0NhY2hlX01vZGVsIGV3a19jb250ZXh0X2NhY2hlX21vZGVsX2dldChj b25zdCBFd2tfQ29udGV4dCAqY29udGV4dCk7CisKICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2Vu ZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90 ZXN0X2V3azJfY29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90 ZXN0cy90ZXN0X2V3azJfY29udGV4dC5jcHAKaW5kZXggM2RmNTc1Y2I0YzFkYjJhNDhkYmNjZjkx MGEyOTMwYjU5ZDU1Yjk2MC4uOTk3MjY4ZGUyOWIwYjQxMTIxY2EwZTQ0YTQ4ZmE2Y2VhZGUzZWVi YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVz dF9ld2syX2NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L3Rlc3RzL3Rlc3RfZXdrMl9jb250ZXh0LmNwcApAQCAtMTgwLDMgKzE4MCwxOSBAQCBURVNUX0Yo RVdLMlVuaXRUZXN0QmFzZSwgZXdrX2NvbnRleHRfcmVmKQogICAgIGV3a19jb250ZXh0X3VucmVm KGNvbnRleHQpOwogICAgIGV3a19jb250ZXh0X3VucmVmKGNvbnRleHQpOwogfQorCitURVNUX0Yo RVdLMlVuaXRUZXN0QmFzZSwgZXdrX2NvbnRleHRfY2FjaGVfbW9kZWwpCit7CisgICAgRXdrX0Nv bnRleHQqIGNvbnRleHQgPSBld2tfdmlld19jb250ZXh0X2dldCh3ZWJWaWV3KCkpOworCisgICAg QVNTRVJUX0VRKEVXS19DQUNIRV9NT0RFTF9ET0NVTUVOVF9CUk9XU0VSLCBld2tfY29udGV4dF9j YWNoZV9tb2RlbF9nZXQoY29udGV4dCkpOworCisgICAgQVNTRVJUX1RSVUUoZXdrX2NvbnRleHRf Y2FjaGVfbW9kZWxfc2V0KGNvbnRleHQsIEVXS19DQUNIRV9NT0RFTF9ET0NVTUVOVF9WSUVXRVIp KTsKKyAgICBBU1NFUlRfRVEoRVdLX0NBQ0hFX01PREVMX0RPQ1VNRU5UX1ZJRVdFUiwgZXdrX2Nv bnRleHRfY2FjaGVfbW9kZWxfZ2V0KGNvbnRleHQpKTsKKworICAgIEFTU0VSVF9UUlVFKGV3a19j b250ZXh0X2NhY2hlX21vZGVsX3NldChjb250ZXh0LCBFV0tfQ0FDSEVfTU9ERUxfRE9DVU1FTlRf QlJPV1NFUikpOworICAgIEFTU0VSVF9FUShFV0tfQ0FDSEVfTU9ERUxfRE9DVU1FTlRfQlJPV1NF UiwgZXdrX2NvbnRleHRfY2FjaGVfbW9kZWxfZ2V0KGNvbnRleHQpKTsKKworICAgIEFTU0VSVF9U UlVFKGV3a19jb250ZXh0X2NhY2hlX21vZGVsX3NldChjb250ZXh0LCBFV0tfQ0FDSEVfTU9ERUxf UFJJTUFSWV9XRUJCUk9XU0VSKSk7CisgICAgQVNTRVJUX0VRKEVXS19DQUNIRV9NT0RFTF9QUklN QVJZX1dFQkJST1dTRVIsIGV3a19jb250ZXh0X2NhY2hlX21vZGVsX2dldChjb250ZXh0KSk7Cit9 Cg==