18346 2008-04-07 11:24:24 -0700 [GTK] Remove build warnings 2008-09-05 21:11:59 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Trivial --- 1 lethalman88 webkit-unassigned alp gustavo oldest_to_newest 76530 0 lethalman88 2008-04-07 11:24:24 -0700 A list of warnings from the gtk trunk buildbot: WebKit/gtk/webkit/webkitwebview.cpp:1134: warning: passing 'double' for argument 1 to 'void WebCore::Settings::setDefaultFontSize(int)' WebKit/gtk/webkit/webkitwebview.cpp:1135: warning: passing 'double' for argument 1 to 'void WebCore::Settings::setDefaultFixedFontSize(int)' WebKit/gtk/webkit/webkitwebview.cpp:1136: warning: passing 'double' for argument 1 to 'void WebCore::Settings::setMinimumFontSize(int)' WebKit/gtk/webkit/webkitwebview.cpp:1137: warning: passing 'double' for argument 1 to 'void WebCore::Settings::setMinimumLogicalFontSize(int)' WebCore/platform/gtk/RenderThemeGtk.cpp:165: warning: converting to 'gint' from 'double' WebCore/platform/gtk/RenderThemeGtk.cpp:166: warning: converting to 'gint' from 'double' WebCore/platform/gtk/RenderThemeGtk.cpp:167: warning: passing 'double' for argument 1 to 'WebCore::IntPoint::IntPoint(int, int)' WebCore/platform/gtk/RenderThemeGtk.cpp:167: warning: passing 'double' for argument 2 to 'WebCore::IntPoint::IntPoint(int, int)' WebCore/platform/gtk/ScrollViewGtk.cpp:523: warning: passing 'float' for argument 1 to 'void WebCore::ScrollView::scrollBy(int, int)' WebCore/platform/gtk/ScrollViewGtk.cpp:523: warning: passing 'float' for argument 2 to 'void WebCore::ScrollView::scrollBy(int, int)' WebCore/platform/gtk/gtk2drawing.c:1613: warning: unused variable 'shadow_type' WebCore/platform/gtk/gtk2drawing.c:1828: warning: passing argument 7 of 'gtk_paint_extension' discards qualifiers from pointer target type WebCore/platform/gtk/gtk2drawing.c:1894: warning: passing argument 7 of 'gtk_paint_extension' discards qualifiers from pointer target type WebCore/platform/gtk/gtk2drawing.c:1910: warning: passing argument 7 of 'gtk_paint_box_gap' discards qualifiers from pointer target type WebCore/platform/gtk/gtk2drawing.c:1919: warning: passing argument 7 of 'gtk_paint_extension' discards qualifiers from pointer target type WebCore/platform/gtk/gtk2drawing.c:1935: warning: passing argument 7 of 'gtk_paint_box_gap' discards qualifiers from pointer target type WebCore/platform/gtk/gtk2drawing.c:1962: warning: passing argument 7 of 'gtk_paint_box_gap' discards qualifiers from pointer target type WebCore/platform/gtk/gtk2drawing.c:1972: warning: unused variable 'shadow_type' WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp:884: warning: passing 'double' for argument 1 to 'WebCore::IntPoint::IntPoint(int, int)' WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp:884: warning: passing 'double' for argument 2 to 'WebCore::IntPoint::IntPoint(int, int)' WebCore/platform/graphics/gtk/SimpleFontDataGtk.cpp:98: warning: comparison between signed and unsigned integer expressions WebCore/plugins/gtk/PluginDatabaseGtk.cpp:50: warning: missing sentinel in function call WebCore/plugins/gtk/PluginDatabaseGtk.cpp:61: warning: unused variable 'directory' WebCore/platform/network/curl/ResourceHandleCurl.cpp:81: warning: 'WTF::HashSet<WebCore::String, WebCore::StringHash, WTF::HashTraits<WebCore::String> >& WebCore::allowsAnyHTTPSCertificateHosts()' defined but not used WebCore/platform/network/curl/ResourceHandleManager.cpp:322: warning: unused variable 'err' 82091 1 elle.uca 2008-06-02 01:22:23 -0700 Also add warnings in bug #19353 and #19354 82092 2 elle.uca 2008-06-02 01:23:24 -0700 New warning in gtkk2drawing.c WebCore/platform/gtk/gtk2drawing.c: In function ‘moz_gtk_toolbar_paint’: WebCore/platform/gtk/gtk2drawing.c:1613: warning: unused variable ‘shadow_type’ WebCore/platform/gtk/gtk2drawing.c: In function ‘moz_gtk_menu_bar_paint’: WebCore/platform/gtk/gtk2drawing.c:1972: warning: unused variable ‘shadow_type’ 82093 3 elle.uca 2008-06-02 01:25:58 -0700 Warnings from PNGImageDecoder.cpp Decoder.cpp' || echo './'`WebCore/platform/image-decoders/png/PNGImageDecoder.cpp WebCore/platform/image-decoders/png/PNGImageDecoder.cpp: In member function ‘void WebCore::PNGImageDecoder::headerAvailable()’: WebCore/platform/image-decoders/png/PNGImageDecoder.cpp:235: warning: comparison between signed and unsigned integer expressions WebCore/platform/image-decoders/png/PNGImageDecoder.cpp:235: warning: comparison between signed and unsigned integer expressions 82094 4 elle.uca 2008-06-02 01:27:01 -0700 Warning in SimpleFontDataGtk.cpp WebCore/platform/graphics/gtk/SimpleFontDataGtk.cpp: In member function ‘virtual bool WebCore::SimpleFontData::containsCharacters(const UChar*, int) const’: WebCore/platform/graphics/gtk/SimpleFontDataGtk.cpp:98: warning: comparison between signed and unsigned integer expressions 82095 5 elle.uca 2008-06-02 01:28:02 -0700 Warnings in VideoSinkGstreamer.cpp WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp:43: warning: deprecated conversion from string constant to ‘gchar*’ WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp:43: warning: deprecated conversion from string constant to ‘gchar*’ WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp:43: warning: deprecated conversion from string constant to ‘gchar*’ WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp:43: warning: deprecated conversion from string constant to ‘gchar*’ WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp: In function ‘gboolean webkit_video_sink_set_caps(GstBaseSink*, GstCaps*)’: WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp:184: warning: comparison between signed and unsigned integer expressions WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp: In function ‘void webkit_video_sink_finalize(GObject*)’: WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp:211: warning: unused variable ‘sink’ 90314 6 gustavo 2008-09-05 15:19:42 -0700 I'm not sure this bug report helps a lot; some of these build warnings are history now. Still, I was going to open a bug report to post my patch that does remove some warnings, and thought I'd use this one. 90317 7 23204 gustavo 2008-09-05 15:24:14 -0700 Created attachment 23204 removing some build warnings to make the build prettier some work in cleaning build warnings for GTK+-related stuff 90337 8 23204 alp 2008-09-05 19:19:07 -0700 Comment on attachment 23204 removing some build warnings to make the build prettier >--- a/WebCore/page/gtk/AccessibilityObjectWrapperAtk.cpp >+++ b/WebCore/page/gtk/AccessibilityObjectWrapperAtk.cpp >@@ -143,7 +143,7 @@ static AtkObject* webkit_accessible_ref_child(AtkObject* object, gint index) > AccessibilityObject* coreObject = core(object); > > g_return_val_if_fail(index >= 0, NULL); >- g_return_val_if_fail(index < coreObject->children().size(), NULL); >+ g_return_val_if_fail(((size_t)index) < coreObject->children().size(), NULL); > > AccessibilityObject* coreChild = coreObject->children().at(index).get(); > This cast can just be "(size_t)index" without the extra parentheses (or a C++-style cast, even better). >diff --git a/WebCore/platform/graphics/gtk/SimpleFontDataPango.cpp b/WebCore/platform/graphics/gtk/SimpleFontDataPango.cpp >index 37bb734..2832074 100644 >--- a/WebCore/platform/graphics/gtk/SimpleFontDataPango.cpp >+++ b/WebCore/platform/graphics/gtk/SimpleFontDataPango.cpp >@@ -103,7 +103,7 @@ bool SimpleFontData::containsCharacters(const UChar* characters, int length) con > PangoCoverage* available = pango_font_get_coverage(m_font.m_font, pango_language_get_default()); > pango_coverage_max(requested, available); > >- for (unsigned i = 0; i < length; i++) { >+ for (unsigned i = 0; i < (unsigned)length; i++) { > if (PANGO_COVERAGE_NONE == pango_coverage_get(requested, i)) { > result = false; > break; This can just be for (int i = 0; i < length; i++) since length is an int. >diff --git a/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp b/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp >index 8888f2b..00b3057 100644 >--- a/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp >+++ b/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp >@@ -86,7 +86,7 @@ static const GtkUnicodeMenuEntry bidi_menu_entries[] = { > > static void insertControlCharacter(GtkWidget* widget) > { >- GtkUnicodeMenuEntry* entry = (GtkUnicodeMenuEntry*)g_object_get_data(G_OBJECT(widget), "gtk-unicode-menu-entry"); >+ // GtkUnicodeMenuEntry* entry = (GtkUnicodeMenuEntry*)g_object_get_data(G_OBJECT(widget), "gtk-unicode-menu-entry"); > notImplemented(); > } > Normally we try to avoid commented-out code but in this case it's the only hint as to what's going on and what the author intended, so I'm OK with your change here to fix the warning. Looks good to land after suggested changes. 90340 9 gustavo 2008-09-05 20:13:28 -0700 (In reply to comment #8) > >diff --git a/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp b/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp > >index 8888f2b..00b3057 100644 > >--- a/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp > >+++ b/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp > >@@ -86,7 +86,7 @@ static const GtkUnicodeMenuEntry bidi_menu_entries[] = { > > > > static void insertControlCharacter(GtkWidget* widget) > > { > >- GtkUnicodeMenuEntry* entry = (GtkUnicodeMenuEntry*)g_object_get_data(G_OBJECT(widget), "gtk-unicode-menu-entry"); > >+ // GtkUnicodeMenuEntry* entry = (GtkUnicodeMenuEntry*)g_object_get_data(G_OBJECT(widget), "gtk-unicode-menu-entry"); > > notImplemented(); > > } > > > > Normally we try to avoid commented-out code but in this case it's the only hint > as to what's going on and what the author intended, so I'm OK with your change > here to fix the warning. Yeah, that's why I decided to leave it. I also left some static functions which are generating warnings untouched, as they will probably still be called when the missing implementation comes into place. > Looks good to land after suggested changes. Just building webkit again to test that they are correct and will upload a new patch. Thanks for the quick review! 90342 10 23210 gustavo 2008-09-05 20:27:55 -0700 Created attachment 23210 reworked patch 90344 11 23210 alp 2008-09-05 21:00:41 -0700 Comment on attachment 23210 reworked patch Thanks for the cleanup. 90345 12 alp 2008-09-05 21:11:59 -0700 Landed in r36123. I'd rather look closely at the double/int cast warnings than simply silencing them, so going ahead and closing this bug to clear pending-commit. 23204 2008-09-05 15:24:14 -0700 2008-09-05 20:27:55 -0700 removing some build warnings to make the build prettier janitorial.diff text/plain 6525 gustavo ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZGYwY2FlOS4uYjlmMzNmMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAwOC0wOS0wNSAgR3VzdGF2byBOb3Jv bmhhIFNpbHZhICA8Z25zQGdub21lLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBcHBsaWVkIHNvbWUgY2FzdHMsIGFuZCByZW1vdmVkIGFuIHVu dXNlZCB0eXBlZGVmIHRvIG1ha2UgdGhlCisgICAgICAgIGNvbXBpbGVyIGhhcHB5LCBwcmludGlu ZyBsZXNzIHdhcm5pbmdzIHdoZW4gYnVpbGRpbmcuCisgICAgICAgIAorICAgICAgICAqIHBhZ2Uv Z3RrL0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQXRrLmNwcDoKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9ndGsvU2ltcGxlRm9udERhdGFQYW5nby5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpTaW1wbGVGb250RGF0YTo6Y29udGFpbnNDaGFyYWN0ZXJzKToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9ndGsvVmlkZW9TaW5rR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKHdlYmtpdF92 aWRlb19zaW5rX3NldF9jYXBzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVz b3VyY2VIYW5kbGVTb3VwLmNwcDoKKwogMjAwOC0wOS0wNSAgRGlyayBTY2h1bHplICA8dmJzODVA Z214LmRlPgogCiAgICAgICAgIEd0ayBidWlsZCBmaXgKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFn ZS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJBdGsuY3BwIGIvV2ViQ29yZS9wYWdlL2d0 ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHAKaW5kZXggZTAwOTc0MC4uMWViNjZh ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl ckF0ay5jcHAKKysrIGIvV2ViQ29yZS9wYWdlL2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl ckF0ay5jcHAKQEAgLTE0Myw3ICsxNDMsNyBAQCBzdGF0aWMgQXRrT2JqZWN0KiB3ZWJraXRfYWNj ZXNzaWJsZV9yZWZfY2hpbGQoQXRrT2JqZWN0KiBvYmplY3QsIGdpbnQgaW5kZXgpCiAgICAgQWNj ZXNzaWJpbGl0eU9iamVjdCogY29yZU9iamVjdCA9IGNvcmUob2JqZWN0KTsKIAogICAgIGdfcmV0 dXJuX3ZhbF9pZl9mYWlsKGluZGV4ID49IDAsIE5VTEwpOwotICAgIGdfcmV0dXJuX3ZhbF9pZl9m YWlsKGluZGV4IDwgY29yZU9iamVjdC0+Y2hpbGRyZW4oKS5zaXplKCksIE5VTEwpOworICAgIGdf cmV0dXJuX3ZhbF9pZl9mYWlsKCgoc2l6ZV90KWluZGV4KSA8IGNvcmVPYmplY3QtPmNoaWxkcmVu KCkuc2l6ZSgpLCBOVUxMKTsKIAogICAgIEFjY2Vzc2liaWxpdHlPYmplY3QqIGNvcmVDaGlsZCA9 IGNvcmVPYmplY3QtPmNoaWxkcmVuKCkuYXQoaW5kZXgpLmdldCgpOwogCmRpZmYgLS1naXQgYS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9TaW1wbGVGb250RGF0YVBhbmdvLmNwcCBiL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL1NpbXBsZUZvbnREYXRhUGFuZ28uY3BwCmluZGV4 IDM3YmI3MzQuLjI4MzIwNzQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3RrL1NpbXBsZUZvbnREYXRhUGFuZ28uY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3RrL1NpbXBsZUZvbnREYXRhUGFuZ28uY3BwCkBAIC0xMDMsNyArMTAzLDcgQEAgYm9vbCBT aW1wbGVGb250RGF0YTo6Y29udGFpbnNDaGFyYWN0ZXJzKGNvbnN0IFVDaGFyKiBjaGFyYWN0ZXJz LCBpbnQgbGVuZ3RoKSBjb24KICAgICBQYW5nb0NvdmVyYWdlKiBhdmFpbGFibGUgPSBwYW5nb19m b250X2dldF9jb3ZlcmFnZShtX2ZvbnQubV9mb250LCBwYW5nb19sYW5ndWFnZV9nZXRfZGVmYXVs dCgpKTsKICAgICBwYW5nb19jb3ZlcmFnZV9tYXgocmVxdWVzdGVkLCBhdmFpbGFibGUpOwogCi0g ICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxlbmd0aDsgaSsrKSB7CisgICAgZm9yICh1bnNp Z25lZCBpID0gMDsgaSA8ICh1bnNpZ25lZClsZW5ndGg7IGkrKykgewogICAgICAgICBpZiAoUEFO R09fQ09WRVJBR0VfTk9ORSA9PSBwYW5nb19jb3ZlcmFnZV9nZXQocmVxdWVzdGVkLCBpKSkgewog ICAgICAgICAgICAgcmVzdWx0ID0gZmFsc2U7CiAgICAgICAgICAgICBicmVhazsKZGlmZiAtLWdp dCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL1ZpZGVvU2lua0dTdHJlYW1lci5jcHAg Yi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9WaWRlb1NpbmtHU3RyZWFtZXIuY3BwCmlu ZGV4IDdlOTc2ODguLjhjNWJjZWUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3RrL1ZpZGVvU2lua0dTdHJlYW1lci5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9ndGsvVmlkZW9TaW5rR1N0cmVhbWVyLmNwcApAQCAtNDAsMTAgKzQwLDEwIEBAIEdTVF9E RUJVR19DQVRFR09SWV9TVEFUSUMod2Via2l0X3ZpZGVvX3NpbmtfZGVidWcpOwogI2RlZmluZSBH U1RfQ0FUX0RFRkFVTFQgd2Via2l0X3ZpZGVvX3NpbmtfZGVidWcKIAogc3RhdGljIEdzdEVsZW1l bnREZXRhaWxzIHdlYmtpdF92aWRlb19zaW5rX2RldGFpbHMgPQotICAgIEdTVF9FTEVNRU5UX0RF VEFJTFMoIldlYktpdCB2aWRlbyBzaW5rIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICJTaW5r L1ZpZGVvIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICJTZW5kcyB2aWRlbyBkYXRhIGZyb20g YSBHU3RyZWFtZXIgcGlwZWxpbmUgdG8gYSBDYWlybyBzdXJmYWNlIiwKLSAgICAgICAgICAgICAg ICAgICAgICAgICJBbHAgVG9rZXIgPGFscEBhdG9rZXIuY29tPiIpOworICBHU1RfRUxFTUVOVF9E RVRBSUxTKChnY2hhciopICJXZWJLaXQgdmlkZW8gc2luayIsCisgICAgICAgICAgICAgICAgICAg ICAgKGdjaGFyKikgIlNpbmsvVmlkZW8iLAorICAgICAgICAgICAgICAgICAgICAgIChnY2hhciop ICJTZW5kcyB2aWRlbyBkYXRhIGZyb20gYSBHU3RyZWFtZXIgcGlwZWxpbmUgdG8gYSBDYWlybyBz dXJmYWNlIiwKKyAgICAgICAgICAgICAgICAgICAgICAoZ2NoYXIqKSAiQWxwIFRva2VyIDxhbHBA YXRva2VyLmNvbT4iKTsKIAogZW51bSB7CiAgICAgUFJPUF8wLApAQCAtMTgxLDcgKzE4MSw3IEBA IHdlYmtpdF92aWRlb19zaW5rX3NldF9jYXBzKEdzdEJhc2VTaW5rKiBic2luaywgR3N0Q2Fwcyog Y2FwcykKICAgICAgICAgcHJpdi0+cGFyX24gPSBwcml2LT5wYXJfZCA9IDE7CiAKICAgICBnc3Rf c3RydWN0dXJlX2dldF9pbnQoc3RydWN0dXJlLCAicmVkX21hc2siLCAmcmVkX21hc2spOwotICAg IHByaXYtPnJnYl9vcmRlcmluZyA9IChyZWRfbWFzayA9PSAweGZmMDAwMDAwKTsKKyAgICBwcml2 LT5yZ2Jfb3JkZXJpbmcgPSAocmVkX21hc2sgPT0gKChpbnQpMHhmZjAwMDAwMCkpOwogCiAgICAg cmV0dXJuIFRSVUU7CiB9CkBAIC0yMDgsOCArMjA4LDYgQEAgd2Via2l0X3ZpZGVvX3NpbmtfZGlz cG9zZShHT2JqZWN0KiBvYmplY3QpCiBzdGF0aWMgdm9pZAogd2Via2l0X3ZpZGVvX3NpbmtfZmlu YWxpemUoR09iamVjdCogb2JqZWN0KQogewotICAgIFdlYktpdFZpZGVvU2luayogc2luayA9IFdF QktJVF9WSURFT19TSU5LKG9iamVjdCk7Ci0KICAgICBHX09CSkVDVF9DTEFTUyhwYXJlbnRfY2xh c3MpLT5maW5hbGl6ZShvYmplY3QpOwogfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcAppbmRleCAxY2RmNmZjLi4yZTM5M2E2 IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRs ZVNvdXAuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFu ZGxlU291cC5jcHAKQEAgLTQyLDcgKzQyLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBzdGF0 aWMgU291cFNlc3Npb24qIHNlc3Npb24gPSAwOwogCi10eXBlZGVmIGVudW0KK2VudW0KIHsKICAg ICBFUlJPUl9UUkFOU1BPUlQsCiAgICAgRVJST1JfVU5LTk9XTl9QUk9UT0NPTCwKZGlmZiAtLWdp dCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggMTk5 ZjRiOC4uNmY0N2RjZCAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvV2Vi S2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAwOC0wOS0wNSAgR3VzdGF2byBO b3JvbmhhIFNpbHZhICA8Z25zQGdub21lLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmVkL2NvbW1lbnRlZCBjb2RlIHRoYXQgaXMgbm90 ICh5ZXQpIHVzZWQsIGFuZCByZW9yZGVyZWQKKyAgICAgICAgbWVtYmVyIHZhcmlhYmxlcyBpbml0 aWFsaXphdGlvbiBmb3IgRnJhbWVMb2FkZXJDbGllbnQsIHNvIHRoYXQgdGhlCisgICAgICAgIGNv bXBpbGVyIGlzIGhhcHB5IGFuZCBwcmludHMgbGVzcyB3YXJuaW5ncyB3aGVuIGJ1aWxkaW5nLgor ICAgICAgICAKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9Db250ZXh0TWVudUNsaWVudEd0ay5j cHA6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwOgor ICAgICAgICAoV2ViS2l0OjpGcmFtZUxvYWRlckNsaWVudDo6RnJhbWVMb2FkZXJDbGllbnQpOgor CiAyMDA4LTA5LTAzICBBbHAgVG9rZXIgIDxhbHBAbnVhbnRpLmNvbT4KIAogICAgICAgICBCdWls ZCBmaXggZm9sbG93aW5nIHIzNjA3My4gSW5jbHVkZSBjb25maWcuaCB3aGVyZSBuZWNlc3Nhcnku CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0NvbnRleHRNZW51Q2xpZW50 R3RrLmNwcCBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQ29udGV4dE1lbnVDbGllbnRHdGsu Y3BwCmluZGV4IDg4ODhmMmIuLjAwYjMwNTcgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvV2ViQ29y ZVN1cHBvcnQvQ29udGV4dE1lbnVDbGllbnRHdGsuY3BwCisrKyBiL1dlYktpdC9ndGsvV2ViQ29y ZVN1cHBvcnQvQ29udGV4dE1lbnVDbGllbnRHdGsuY3BwCkBAIC04Niw3ICs4Niw3IEBAIHN0YXRp YyBjb25zdCBHdGtVbmljb2RlTWVudUVudHJ5IGJpZGlfbWVudV9lbnRyaWVzW10gPSB7CiAKIHN0 YXRpYyB2b2lkIGluc2VydENvbnRyb2xDaGFyYWN0ZXIoR3RrV2lkZ2V0KiB3aWRnZXQpCiB7Ci0g ICAgR3RrVW5pY29kZU1lbnVFbnRyeSogZW50cnkgPSAoR3RrVW5pY29kZU1lbnVFbnRyeSopZ19v YmplY3RfZ2V0X2RhdGEoR19PQkpFQ1Qod2lkZ2V0KSwgImd0ay11bmljb2RlLW1lbnUtZW50cnki KTsKKyAgICAvLyBHdGtVbmljb2RlTWVudUVudHJ5KiBlbnRyeSA9IChHdGtVbmljb2RlTWVudUVu dHJ5KilnX29iamVjdF9nZXRfZGF0YShHX09CSkVDVCh3aWRnZXQpLCAiZ3RrLXVuaWNvZGUtbWVu dS1lbnRyeSIpOwogICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAKZGlmZiAtLWdpdCBhL1dlYktp dC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwIGIvV2ViS2l0L2d0 ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHAKaW5kZXggZWNhMjg1My4u MDM3NTQyOCAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRl ckNsaWVudEd0ay5jcHAKKysrIGIvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRl ckNsaWVudEd0ay5jcHAKQEAgLTU4LDkgKzU4LDkgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIEZy YW1lTG9hZGVyQ2xpZW50OjpGcmFtZUxvYWRlckNsaWVudChXZWJLaXRXZWJGcmFtZSogZnJhbWUp CiAgICAgOiBtX2ZyYW1lKGZyYW1lKQorICAgICwgbV91c2VyQWdlbnQoIiIpCiAgICAgLCBtX3Bs dWdpblZpZXcoMCkKICAgICAsIG1faGFzU2VudFJlc3BvbnNlVG9QbHVnaW4oZmFsc2UpCi0gICAg LCBtX3VzZXJBZ2VudCgiIikKIHsKICAgICBBU1NFUlQobV9mcmFtZSk7CiB9CkBAIC0xNjQsOCAr MTY0LDYgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hXaWxsU3VibWl0Rm9ybShG cmFtZVBvbGljeUZ1bmN0aW9uIHBvbGljeUZ1bmN0aW8KIAogdm9pZCBGcmFtZUxvYWRlckNsaWVu dDo6Y29tbWl0dGVkTG9hZChEb2N1bWVudExvYWRlciogbG9hZGVyLCBjb25zdCBjaGFyKiBkYXRh LCBpbnQgbGVuZ3RoKQogewotICAgIGNvbnN0IFN0cmluZyYgdGV4dEVuY29kaW5nID0gbG9hZGVy LT5yZXNwb25zZSgpLnRleHRFbmNvZGluZ05hbWUoKTsKLQogICAgIGlmICghbV9wbHVnaW5WaWV3 KSB7CiAgICAgICAgIEFTU0VSVChsb2FkZXItPmZyYW1lKCkpOwogICAgICAgICAvLyBTZXR0aW5n IHRoZSBlbmNvZGluZyBvbiB0aGUgZnJhbWUgbG9hZGVyIGlzIG91ciB3YXkgdG8gZ2V0IHdvcmsg ZG9uZSB0aGF0IGlzIG5vcm1hbGx5IGRvbmUK 23210 2008-09-05 20:27:55 -0700 2008-09-05 21:00:41 -0700 reworked patch janitorial.diff text/plain 6532 gustavo ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZGYwY2FlOS4uYjlmMzNmMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAwOC0wOS0wNSAgR3VzdGF2byBOb3Jv bmhhIFNpbHZhICA8Z25zQGdub21lLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBcHBsaWVkIHNvbWUgY2FzdHMsIGFuZCByZW1vdmVkIGFuIHVu dXNlZCB0eXBlZGVmIHRvIG1ha2UgdGhlCisgICAgICAgIGNvbXBpbGVyIGhhcHB5LCBwcmludGlu ZyBsZXNzIHdhcm5pbmdzIHdoZW4gYnVpbGRpbmcuCisgICAgICAgIAorICAgICAgICAqIHBhZ2Uv Z3RrL0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQXRrLmNwcDoKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9ndGsvU2ltcGxlRm9udERhdGFQYW5nby5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpTaW1wbGVGb250RGF0YTo6Y29udGFpbnNDaGFyYWN0ZXJzKToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9ndGsvVmlkZW9TaW5rR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKHdlYmtpdF92 aWRlb19zaW5rX3NldF9jYXBzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVz b3VyY2VIYW5kbGVTb3VwLmNwcDoKKwogMjAwOC0wOS0wNSAgRGlyayBTY2h1bHplICA8dmJzODVA Z214LmRlPgogCiAgICAgICAgIEd0ayBidWlsZCBmaXgKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFn ZS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJBdGsuY3BwIGIvV2ViQ29yZS9wYWdlL2d0 ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHAKaW5kZXggZTAwOTc0MC4uYjQ2ZmI2 MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl ckF0ay5jcHAKKysrIGIvV2ViQ29yZS9wYWdlL2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl ckF0ay5jcHAKQEAgLTE0Myw3ICsxNDMsNyBAQCBzdGF0aWMgQXRrT2JqZWN0KiB3ZWJraXRfYWNj ZXNzaWJsZV9yZWZfY2hpbGQoQXRrT2JqZWN0KiBvYmplY3QsIGdpbnQgaW5kZXgpCiAgICAgQWNj ZXNzaWJpbGl0eU9iamVjdCogY29yZU9iamVjdCA9IGNvcmUob2JqZWN0KTsKIAogICAgIGdfcmV0 dXJuX3ZhbF9pZl9mYWlsKGluZGV4ID49IDAsIE5VTEwpOwotICAgIGdfcmV0dXJuX3ZhbF9pZl9m YWlsKGluZGV4IDwgY29yZU9iamVjdC0+Y2hpbGRyZW4oKS5zaXplKCksIE5VTEwpOworICAgIGdf cmV0dXJuX3ZhbF9pZl9mYWlsKHN0YXRpY19jYXN0PHNpemVfdD4oaW5kZXgpIDwgY29yZU9iamVj dC0+Y2hpbGRyZW4oKS5zaXplKCksIE5VTEwpOwogCiAgICAgQWNjZXNzaWJpbGl0eU9iamVjdCog Y29yZUNoaWxkID0gY29yZU9iamVjdC0+Y2hpbGRyZW4oKS5hdChpbmRleCkuZ2V0KCk7CiAKZGlm ZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL1NpbXBsZUZvbnREYXRhUGFu Z28uY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvU2ltcGxlRm9udERhdGFQYW5n by5jcHAKaW5kZXggMzdiYjczNC4uM2VkMWNjMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9ndGsvU2ltcGxlRm9udERhdGFQYW5nby5jcHAKKysrIGIvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9ndGsvU2ltcGxlRm9udERhdGFQYW5nby5jcHAKQEAgLTEwMyw3ICsxMDMs NyBAQCBib29sIFNpbXBsZUZvbnREYXRhOjpjb250YWluc0NoYXJhY3RlcnMoY29uc3QgVUNoYXIq IGNoYXJhY3RlcnMsIGludCBsZW5ndGgpIGNvbgogICAgIFBhbmdvQ292ZXJhZ2UqIGF2YWlsYWJs ZSA9IHBhbmdvX2ZvbnRfZ2V0X2NvdmVyYWdlKG1fZm9udC5tX2ZvbnQsIHBhbmdvX2xhbmd1YWdl X2dldF9kZWZhdWx0KCkpOwogICAgIHBhbmdvX2NvdmVyYWdlX21heChyZXF1ZXN0ZWQsIGF2YWls YWJsZSk7CiAKLSAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbGVuZ3RoOyBpKyspIHsKKyAg ICBmb3IgKGludCBpID0gMDsgaSA8IGxlbmd0aDsgaSsrKSB7CiAgICAgICAgIGlmIChQQU5HT19D T1ZFUkFHRV9OT05FID09IHBhbmdvX2NvdmVyYWdlX2dldChyZXF1ZXN0ZWQsIGkpKSB7CiAgICAg ICAgICAgICByZXN1bHQgPSBmYWxzZTsKICAgICAgICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvVmlkZW9TaW5rR1N0cmVhbWVyLmNwcCBiL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL1ZpZGVvU2lua0dTdHJlYW1lci5jcHAKaW5kZXgg N2U5NzY4OC4uMDRkZjdhYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n dGsvVmlkZW9TaW5rR1N0cmVhbWVyLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2d0ay9WaWRlb1NpbmtHU3RyZWFtZXIuY3BwCkBAIC00MCwxMCArNDAsMTAgQEAgR1NUX0RFQlVH X0NBVEVHT1JZX1NUQVRJQyh3ZWJraXRfdmlkZW9fc2lua19kZWJ1Zyk7CiAjZGVmaW5lIEdTVF9D QVRfREVGQVVMVCB3ZWJraXRfdmlkZW9fc2lua19kZWJ1ZwogCiBzdGF0aWMgR3N0RWxlbWVudERl dGFpbHMgd2Via2l0X3ZpZGVvX3NpbmtfZGV0YWlscyA9Ci0gICAgR1NUX0VMRU1FTlRfREVUQUlM UygiV2ViS2l0IHZpZGVvIHNpbmsiLAotICAgICAgICAgICAgICAgICAgICAgICAgIlNpbmsvVmlk ZW8iLAotICAgICAgICAgICAgICAgICAgICAgICAgIlNlbmRzIHZpZGVvIGRhdGEgZnJvbSBhIEdT dHJlYW1lciBwaXBlbGluZSB0byBhIENhaXJvIHN1cmZhY2UiLAotICAgICAgICAgICAgICAgICAg ICAgICAgIkFscCBUb2tlciA8YWxwQGF0b2tlci5jb20+Iik7CisgIEdTVF9FTEVNRU5UX0RFVEFJ TFMoKGdjaGFyKikgIldlYktpdCB2aWRlbyBzaW5rIiwKKyAgICAgICAgICAgICAgICAgICAgICAo Z2NoYXIqKSAiU2luay9WaWRlbyIsCisgICAgICAgICAgICAgICAgICAgICAgKGdjaGFyKikgIlNl bmRzIHZpZGVvIGRhdGEgZnJvbSBhIEdTdHJlYW1lciBwaXBlbGluZSB0byBhIENhaXJvIHN1cmZh Y2UiLAorICAgICAgICAgICAgICAgICAgICAgIChnY2hhciopICJBbHAgVG9rZXIgPGFscEBhdG9r ZXIuY29tPiIpOwogCiBlbnVtIHsKICAgICBQUk9QXzAsCkBAIC0xODEsNyArMTgxLDcgQEAgd2Vi a2l0X3ZpZGVvX3Npbmtfc2V0X2NhcHMoR3N0QmFzZVNpbmsqIGJzaW5rLCBHc3RDYXBzKiBjYXBz KQogICAgICAgICBwcml2LT5wYXJfbiA9IHByaXYtPnBhcl9kID0gMTsKIAogICAgIGdzdF9zdHJ1 Y3R1cmVfZ2V0X2ludChzdHJ1Y3R1cmUsICJyZWRfbWFzayIsICZyZWRfbWFzayk7Ci0gICAgcHJp di0+cmdiX29yZGVyaW5nID0gKHJlZF9tYXNrID09IDB4ZmYwMDAwMDApOworICAgIHByaXYtPnJn Yl9vcmRlcmluZyA9IChyZWRfbWFzayA9PSBzdGF0aWNfY2FzdDxpbnQ+KDB4ZmYwMDAwMDApKTsK IAogICAgIHJldHVybiBUUlVFOwogfQpAQCAtMjA4LDggKzIwOCw2IEBAIHdlYmtpdF92aWRlb19z aW5rX2Rpc3Bvc2UoR09iamVjdCogb2JqZWN0KQogc3RhdGljIHZvaWQKIHdlYmtpdF92aWRlb19z aW5rX2ZpbmFsaXplKEdPYmplY3QqIG9iamVjdCkKIHsKLSAgICBXZWJLaXRWaWRlb1NpbmsqIHNp bmsgPSBXRUJLSVRfVklERU9fU0lOSyhvYmplY3QpOwotCiAgICAgR19PQkpFQ1RfQ0xBU1MocGFy ZW50X2NsYXNzKS0+ZmluYWxpemUob2JqZWN0KTsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcCBiL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKaW5kZXggMWNkZjZmYy4u MmUzOTNhNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3Vy Y2VIYW5kbGVTb3VwLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNv dXJjZUhhbmRsZVNvdXAuY3BwCkBAIC00Miw3ICs0Miw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAogc3RhdGljIFNvdXBTZXNzaW9uKiBzZXNzaW9uID0gMDsKIAotdHlwZWRlZiBlbnVtCitlbnVt CiB7CiAgICAgRVJST1JfVFJBTlNQT1JULAogICAgIEVSUk9SX1VOS05PV05fUFJPVE9DT0wsCmRp ZmYgLS1naXQgYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1dlYktpdC9ndGsvQ2hhbmdlTG9nCmlu ZGV4IDE5OWY0YjguLjZmNDdkY2QgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nCisr KyBiL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDgtMDktMDUgIEd1 c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGduc0Bnbm9tZS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlZC9jb21tZW50ZWQgY29kZSB0aGF0 IGlzIG5vdCAoeWV0KSB1c2VkLCBhbmQgcmVvcmRlcmVkCisgICAgICAgIG1lbWJlciB2YXJpYWJs ZXMgaW5pdGlhbGl6YXRpb24gZm9yIEZyYW1lTG9hZGVyQ2xpZW50LCBzbyB0aGF0IHRoZQorICAg ICAgICBjb21waWxlciBpcyBoYXBweSBhbmQgcHJpbnRzIGxlc3Mgd2FybmluZ3Mgd2hlbiBidWls ZGluZy4KKyAgICAgICAgCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvQ29udGV4dE1lbnVDbGll bnRHdGsuY3BwOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3Rr LmNwcDoKKyAgICAgICAgKFdlYktpdDo6RnJhbWVMb2FkZXJDbGllbnQ6OkZyYW1lTG9hZGVyQ2xp ZW50KToKKwogMjAwOC0wOS0wMyAgQWxwIFRva2VyICA8YWxwQG51YW50aS5jb20+CiAKICAgICAg ICAgQnVpbGQgZml4IGZvbGxvd2luZyByMzYwNzMuIEluY2x1ZGUgY29uZmlnLmggd2hlcmUgbmVj ZXNzYXJ5LgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9Db250ZXh0TWVu dUNsaWVudEd0ay5jcHAgYi9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0NvbnRleHRNZW51Q2xp ZW50R3RrLmNwcAppbmRleCA4ODg4ZjJiLi4wMGIzMDU3IDEwMDY0NAotLS0gYS9XZWJLaXQvZ3Rr L1dlYkNvcmVTdXBwb3J0L0NvbnRleHRNZW51Q2xpZW50R3RrLmNwcAorKysgYi9XZWJLaXQvZ3Rr L1dlYkNvcmVTdXBwb3J0L0NvbnRleHRNZW51Q2xpZW50R3RrLmNwcApAQCAtODYsNyArODYsNyBA QCBzdGF0aWMgY29uc3QgR3RrVW5pY29kZU1lbnVFbnRyeSBiaWRpX21lbnVfZW50cmllc1tdID0g ewogCiBzdGF0aWMgdm9pZCBpbnNlcnRDb250cm9sQ2hhcmFjdGVyKEd0a1dpZGdldCogd2lkZ2V0 KQogewotICAgIEd0a1VuaWNvZGVNZW51RW50cnkqIGVudHJ5ID0gKEd0a1VuaWNvZGVNZW51RW50 cnkqKWdfb2JqZWN0X2dldF9kYXRhKEdfT0JKRUNUKHdpZGdldCksICJndGstdW5pY29kZS1tZW51 LWVudHJ5Iik7CisgICAgLy8gR3RrVW5pY29kZU1lbnVFbnRyeSogZW50cnkgPSAoR3RrVW5pY29k ZU1lbnVFbnRyeSopZ19vYmplY3RfZ2V0X2RhdGEoR19PQkpFQ1Qod2lkZ2V0KSwgImd0ay11bmlj b2RlLW1lbnUtZW50cnkiKTsKICAgICBub3RJbXBsZW1lbnRlZCgpOwogfQogCmRpZmYgLS1naXQg YS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcCBiL1dl YktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCmluZGV4IGVj YTI4NTMuLjAzNzU0MjggMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJh bWVMb2FkZXJDbGllbnRHdGsuY3BwCisrKyBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJh bWVMb2FkZXJDbGllbnRHdGsuY3BwCkBAIC01OCw5ICs1OCw5IEBAIG5hbWVzcGFjZSBXZWJLaXQg ewogCiBGcmFtZUxvYWRlckNsaWVudDo6RnJhbWVMb2FkZXJDbGllbnQoV2ViS2l0V2ViRnJhbWUq IGZyYW1lKQogICAgIDogbV9mcmFtZShmcmFtZSkKKyAgICAsIG1fdXNlckFnZW50KCIiKQogICAg ICwgbV9wbHVnaW5WaWV3KDApCiAgICAgLCBtX2hhc1NlbnRSZXNwb25zZVRvUGx1Z2luKGZhbHNl KQotICAgICwgbV91c2VyQWdlbnQoIiIpCiB7CiAgICAgQVNTRVJUKG1fZnJhbWUpOwogfQpAQCAt MTY0LDggKzE2NCw2IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoV2lsbFN1Ym1p dEZvcm0oRnJhbWVQb2xpY3lGdW5jdGlvbiBwb2xpY3lGdW5jdGlvCiAKIHZvaWQgRnJhbWVMb2Fk ZXJDbGllbnQ6OmNvbW1pdHRlZExvYWQoRG9jdW1lbnRMb2FkZXIqIGxvYWRlciwgY29uc3QgY2hh ciogZGF0YSwgaW50IGxlbmd0aCkKIHsKLSAgICBjb25zdCBTdHJpbmcmIHRleHRFbmNvZGluZyA9 IGxvYWRlci0+cmVzcG9uc2UoKS50ZXh0RW5jb2RpbmdOYW1lKCk7Ci0KICAgICBpZiAoIW1fcGx1 Z2luVmlldykgewogICAgICAgICBBU1NFUlQobG9hZGVyLT5mcmFtZSgpKTsKICAgICAgICAgLy8g U2V0dGluZyB0aGUgZW5jb2Rpbmcgb24gdGhlIGZyYW1lIGxvYWRlciBpcyBvdXIgd2F5IHRvIGdl dCB3b3JrIGRvbmUgdGhhdCBpcyBub3JtYWxseSBkb25lCg==