From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Keith David Bershatsky Newsgroups: gmane.emacs.devel Subject: Re: buffer.c/buffer.h: How to add new buffer-local variables? Date: Sat, 06 Apr 2019 19:50:14 -0700 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Multipart_Sat_Apr__6_19:50:14_2019-1" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="215338"; mail-complaints-to="usenet@blaine.gmane.org" Cc: Paul Eggert , emacs-devel@gnu.org, Andreas Schwab , Stefan Monnier , Alan Mackenzie , Daniel Colascione To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 07 04:50:40 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hCxtH-000ttA-I5 for ged-emacs-devel@m.gmane.org; Sun, 07 Apr 2019 04:50:40 +0200 Original-Received: from localhost ([127.0.0.1]:33463 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hCxtG-0005jG-GT for ged-emacs-devel@m.gmane.org; Sat, 06 Apr 2019 22:50:38 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:50625) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hCxt8-0005j1-2t for emacs-devel@gnu.org; Sat, 06 Apr 2019 22:50:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hCxt6-0007aU-Uq for emacs-devel@gnu.org; Sat, 06 Apr 2019 22:50:30 -0400 Original-Received: from gateway34.websitewelcome.com ([192.185.149.13]:19438) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hCxt6-0007Ug-Bz for emacs-devel@gnu.org; Sat, 06 Apr 2019 22:50:28 -0400 Original-Received: from cm14.websitewelcome.com (cm14.websitewelcome.com [100.42.49.7]) by gateway34.websitewelcome.com (Postfix) with ESMTP id A974749C93 for ; Sat, 6 Apr 2019 21:50:16 -0500 (CDT) Original-Received: from gator3053.hostgator.com ([50.87.144.69]) by cmsmtp with SMTP id CxsuhMxNi2qH7CxsuhkhXi; Sat, 06 Apr 2019 21:50:16 -0500 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lawlist.com ; s=default; h=Content-Type:MIME-Version:Subject:Cc:To:From:Message-ID:Date: Sender:Reply-To:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=DCFXB8S2lg/yBKholCf/q4A1kcfIrGgDSmx72iEeP0k=; b=XRhp4allIOr1qzTqIrT/RzN29Q v9Ar5TNzd5vqprSiDMsJexrjo6/qFu9ppuKKr/hswlmNZKekGAOTHvfdheVc2WzwUbz0ii+aRcrOR +kxA3KPwi3goqdzsHawU0sbxUx5ZYlwCBtvN/0YX9+6iAVjl+R30mgwgFFyEArriyrw9hNFL1Xj5E DlNOGo77hbz7jjalSMKD5+NGCI7qd4bzYAO46l8fqfw+a3+msteab78+n+w+eJf0CUYXscoXwwsO4 zW/S54IRpa2o0P4D8abt+A4+ze3Www7LmM659QMO7K9bbm5IfN1S26HTPyeaSkMRmFzL2QtaDltbZ x+NvY7TQ==; Original-Received: from cpe-45-48-239-195.socal.res.rr.com ([45.48.239.195]:54807 helo=server.local) by gator3053.hostgator.com with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.91) (envelope-from ) id 1hCxst-002gw8-G5; Sat, 06 Apr 2019 21:50:15 -0500 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator3053.hostgator.com X-AntiAbuse: Original Domain - gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - lawlist.com X-BWhitelist: no X-Source-IP: 45.48.239.195 X-Source-L: No X-Exim-ID: 1hCxst-002gw8-G5 X-Source-Sender: cpe-45-48-239-195.socal.res.rr.com (server.local) [45.48.239.195]:54807 X-Source-Auth: lawlist X-Email-Count: 6 X-Source-Cap: bGF3bGlzdDtsYXdsaXN0O2dhdG9yMzA1My5ob3N0Z2F0b3IuY29t X-Local-Domain: yes X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 192.185.149.13 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:235054 Archived-At: --Multipart_Sat_Apr__6_19:50:14_2019-1 Content-Type: text/plain; charset=US-ASCII Using an unsophisticated method of going back in time and building various versions of Emacs on the w32 platform, I tracked down the inability to add a few new buffer-local variables in buffer.c/buffer.h to a commit that occurred on 01/31/2019: 05d2fc7170fb66a87601b1c76ddae2c1b7b4b934. Steps to reproduce the issue: 1. git reset --hard 05d2fc7170fb66a87601b1c76ddae2c1b7b4b934 2. Apply the attached patch that adds a few new buffer local variables. 3. Build a w32 version of Emacs [I use MinGW_32 and ezwinports downloaded a couple of years ago, on a Windows XP SP-3 box]: CFLAGS='-O0 -g3' ./configure \ --prefix=/c/docume~1/admini~1/desktop/trunk \ --enable-checking='yes,glyphs' \ --enable-check-lisp-object-type \ --without-compress-install \ --without-makeinfo \ --with-gnutls=no \ --with-mailutils \ --without-makeinfo 4. The build terminates abnormally at the following location: This application has requested the Runtime to terminate it in an unusual way. Please contact the application's support team for more information. make[2]: *** [emacs-lisp/macroexp.elc] Error 3 make[2]: Leaving directory `/c/docume~1/admini~1/desktop/.0.2019_01_31__05d2fc7170fb66a87601b1c76ddae2c1b7b4b934/lisp' make[1]: *** [bootstrap-emacs.pdmp] Error 2 make[1]: Leaving directory `/c/docume~1/admini~1/desktop/.0.2019_01_31__05d2fc7170fb66a87601b1c76ddae2c1b7b4b934/src' make: *** [src] Error 2 Beyond pinpointing the exact commit where the Emacs build goes awry, I would be pleased to help further towards resolving this issue -- however, some pointers would be greatly appreciated. Perhaps there is something that may stand out (to a trained programmer) in the 01/31/2019 commit .... Keith --Multipart_Sat_Apr__6_19:50:14_2019-1 Content-Type: application/diff; type=patch Content-Disposition: attachment; filename="2019_04_06__19_33_22_280.diff" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL3NyYy9idWZmZXIuYyBiL3NyYy9idWZmZXIuYwppbmRleCBlNWNjNWYzLi5j M2UzZmY0IDEwMDY0NAotLS0gYS9zcmMvYnVmZmVyLmMKKysrIGIvc3JjL2J1ZmZlci5jCkBAIC0x MzIsNiArMTMyLDY5IEBAIENIRUNLX09WRVJMQVkgKExpc3BfT2JqZWN0IHgpCiAKIC8qIFRoZXNl IHNldHRlcnMgYXJlIHVzZWQgb25seSBpbiB0aGlzIGZpbGUsIHNvIHRoZXkgY2FuIGJlIHByaXZh dGUuCiAgICBUaGUgcHVibGljIHNldHRlcnMgYXJlIGlubGluZSBmdW5jdGlvbnMgZGVmaW5lZCBp biBidWZmZXIuaC4gICovCisKKworLyogKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqICovCisvKiBiZWdpbiBN VUxUSVBMRS1DVVJTT1JTICovCisKK3N0YXRpYyB2b2lkCitic2V0X21jX3JlYWxfZmFrZV9jdXJz b3IgKHN0cnVjdCBidWZmZXIgKmIsIExpc3BfT2JqZWN0IHZhbCkKK3sKKyAgYi0+bWNfcmVhbF9m YWtlX2N1cnNvcl8gPSB2YWw7Cit9CisKK3N0YXRpYyB2b2lkCitic2V0X21jX2NvbmYgKHN0cnVj dCBidWZmZXIgKmIsIExpc3BfT2JqZWN0IHZhbCkKK3sKKyAgYi0+bWNfY29uZl8gPSB2YWw7Cit9 CisKK3N0YXRpYyB2b2lkCitic2V0X21jX2luYWN0aXZlX3dpbmRvd3MgKHN0cnVjdCBidWZmZXIg KmIsIExpc3BfT2JqZWN0IHZhbCkKK3sKKyAgYi0+bWNfaW5hY3RpdmVfd2luZG93c18gPSB2YWw7 Cit9CisKK3N0YXRpYyB2b2lkCitic2V0X2Nyb3NzaGFpcnMgKHN0cnVjdCBidWZmZXIgKmIsIExp c3BfT2JqZWN0IHZhbCkKK3sKKyAgYi0+Y3Jvc3NoYWlyc18gPSB2YWw7Cit9CisKK3N0YXRpYyB2 b2lkCitic2V0X2NoX2hvcml6b250YWxfcnVsZXIgKHN0cnVjdCBidWZmZXIgKmIsIExpc3BfT2Jq ZWN0IHZhbCkKK3sKKyAgYi0+Y2hfaG9yaXpvbnRhbF9ydWxlcl8gPSB2YWw7Cit9CisKK3N0YXRp YyB2b2lkCitic2V0X2NoX3ZlcnRpY2FsX3J1bGVyIChzdHJ1Y3QgYnVmZmVyICpiLCBMaXNwX09i amVjdCB2YWwpCit7CisgIGItPmNoX3ZlcnRpY2FsX3J1bGVyXyA9IHZhbDsKK30KKworc3RhdGlj IHZvaWQKK2JzZXRfY2hfaW5hY3RpdmVfd2luZG93cyAoc3RydWN0IGJ1ZmZlciAqYiwgTGlzcF9P YmplY3QgdmFsKQoreworICBiLT5jaF9pbmFjdGl2ZV93aW5kb3dzXyA9IHZhbDsKK30KKworc3Rh dGljIHZvaWQKK2JzZXRfZmNfdmlzaWJsZSAoc3RydWN0IGJ1ZmZlciAqYiwgTGlzcF9PYmplY3Qg dmFsKQoreworICBiLT5mY192aXNpYmxlXyA9IHZhbDsKK30KKworc3RhdGljIHZvaWQKK2JzZXRf ZmNfaW5hY3RpdmVfd2luZG93cyAoc3RydWN0IGJ1ZmZlciAqYiwgTGlzcF9PYmplY3QgdmFsKQor eworICBiLT5mY19pbmFjdGl2ZV93aW5kb3dzXyA9IHZhbDsKK30KKworLyogZW5kIE1VTFRJUExF LUNVUlNPUlMgKi8KKy8qICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiAqLworCisKIHN0YXRpYyB2b2lkCiBi c2V0X2FiYnJldl9tb2RlIChzdHJ1Y3QgYnVmZmVyICpiLCBMaXNwX09iamVjdCB2YWwpCiB7CkBA IC01MTMyLDYgKzUxOTUsMjQgQEAgaW5pdF9idWZmZXJfb25jZSAodm9pZCkKICAgYnNldF9sYXN0 X3NlbGVjdGVkX3dpbmRvdyAoJmJ1ZmZlcl9sb2NhbF9mbGFncywgbWFrZV9maXhudW0gKDApKTsK IAogICBpZHggPSAxOworCisKKy8qICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiAqLworLyogTVVMVElQTEUt Q1VSU09SUyAqLworCisgIFhTRVRGQVNUSU5UIChCVkFSICgmYnVmZmVyX2xvY2FsX2ZsYWdzLCBt Y19yZWFsX2Zha2VfY3Vyc29yKSwgaWR4KTsgKytpZHg7CisgIFhTRVRGQVNUSU5UIChCVkFSICgm YnVmZmVyX2xvY2FsX2ZsYWdzLCBtY19jb25mKSwgaWR4KTsgKytpZHg7CisgIFhTRVRGQVNUSU5U IChCVkFSICgmYnVmZmVyX2xvY2FsX2ZsYWdzLCBtY19pbmFjdGl2ZV93aW5kb3dzKSwgaWR4KTsg KytpZHg7CisgIFhTRVRGQVNUSU5UIChCVkFSICgmYnVmZmVyX2xvY2FsX2ZsYWdzLCBjcm9zc2hh aXJzKSwgaWR4KTsgKytpZHg7CisgIFhTRVRGQVNUSU5UIChCVkFSICgmYnVmZmVyX2xvY2FsX2Zs YWdzLCBjaF9ob3Jpem9udGFsX3J1bGVyKSwgaWR4KTsgKytpZHg7CisgIFhTRVRGQVNUSU5UIChC VkFSICgmYnVmZmVyX2xvY2FsX2ZsYWdzLCBjaF92ZXJ0aWNhbF9ydWxlciksIGlkeCk7ICsraWR4 OworICBYU0VURkFTVElOVCAoQlZBUiAoJmJ1ZmZlcl9sb2NhbF9mbGFncywgY2hfaW5hY3RpdmVf d2luZG93cyksIGlkeCk7ICsraWR4OworICBYU0VURkFTVElOVCAoQlZBUiAoJmJ1ZmZlcl9sb2Nh bF9mbGFncywgZmNfdmlzaWJsZSksIGlkeCk7ICsraWR4OworICBYU0VURkFTVElOVCAoQlZBUiAo JmJ1ZmZlcl9sb2NhbF9mbGFncywgZmNfaW5hY3RpdmVfd2luZG93cyksIGlkeCk7ICsraWR4Owor CisvKiAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKiogKi8KKworCiAgIFhTRVRGQVNUSU5UIChCVkFSICgmYnVm ZmVyX2xvY2FsX2ZsYWdzLCBtb2RlX2xpbmVfZm9ybWF0KSwgaWR4KTsgKytpZHg7CiAgIFhTRVRG QVNUSU5UIChCVkFSICgmYnVmZmVyX2xvY2FsX2ZsYWdzLCBhYmJyZXZfbW9kZSksIGlkeCk7ICsr aWR4OwogICBYU0VURkFTVElOVCAoQlZBUiAoJmJ1ZmZlcl9sb2NhbF9mbGFncywgb3ZlcndyaXRl X21vZGUpLCBpZHgpOyArK2lkeDsKQEAgLTUyMTgsNiArNTI5OSwyNCBAQCBpbml0X2J1ZmZlcl9v bmNlICh2b2lkKQogICAvKiBNdXN0IGRvIHRoZXNlIGJlZm9yZSBtYWtpbmcgdGhlIGZpcnN0IGJ1 ZmZlciEgKi8KIAogICAvKiByZWFsIHNldHVwIGlzIGRvbmUgaW4gYmluZGluZ3MuZWwgKi8KKwor CisvKiAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKiogKi8KKy8qIE1VTFRJUExFLUNVUlNPUlMgKi8KKworICBi c2V0X21jX3JlYWxfZmFrZV9jdXJzb3IgKCZidWZmZXJfZGVmYXVsdHMsIFF0KTsKKyAgYnNldF9t Y19jb25mICgmYnVmZmVyX2RlZmF1bHRzLCBRbmlsKTsKKyAgYnNldF9tY19pbmFjdGl2ZV93aW5k b3dzICgmYnVmZmVyX2RlZmF1bHRzLCBRdCk7CisgIGJzZXRfY3Jvc3NoYWlycyAoJmJ1ZmZlcl9k ZWZhdWx0cywgUW5pbCk7CisgIGJzZXRfY2hfaG9yaXpvbnRhbF9ydWxlciAoJmJ1ZmZlcl9kZWZh dWx0cywgUXQpOworICBic2V0X2NoX3ZlcnRpY2FsX3J1bGVyICgmYnVmZmVyX2RlZmF1bHRzLCBR dCk7CisgIGJzZXRfY2hfaW5hY3RpdmVfd2luZG93cyAoJmJ1ZmZlcl9kZWZhdWx0cywgUXQpOwor ICBic2V0X2ZjX3Zpc2libGUgKCZidWZmZXJfZGVmYXVsdHMsIFFuaWwpOworICBic2V0X2ZjX2lu YWN0aXZlX3dpbmRvd3MgKCZidWZmZXJfZGVmYXVsdHMsIFF0KTsKKworLyogKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqICovCisKKwogICBic2V0X21vZGVfbGluZV9mb3JtYXQgKCZidWZmZXJfZGVmYXVsdHMs IGJ1aWxkX3B1cmVfY19zdHJpbmcgKCIlLSIpKTsKICAgYnNldF9oZWFkZXJfbGluZV9mb3JtYXQg KCZidWZmZXJfZGVmYXVsdHMsIFFuaWwpOwogICBic2V0X2FiYnJldl9tb2RlICgmYnVmZmVyX2Rl ZmF1bHRzLCBRbmlsKTsKQEAgLTU0NTQsNiArNTU1MywyMyBAQCBzeW1zX29mX2J1ZmZlciAodm9p ZCkKICAgc3RhdGljcHJvICgmUVNGdW5kYW1lbnRhbCk7CiAgIHN0YXRpY3BybyAoJlZidWZmZXJf YWxpc3QpOwogCisKKy8qICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiAqLworLyogTVVMVElQTEUtQ1VSU09S UyAqLworCisgIERFRlNZTSAoUW1jX3JlYWxfZmFrZV9jdXJzb3IsICJtYy1yZWFsLWZha2UtY3Vy c29yIik7CisgIERFRlNZTSAoUW1jX2NvbmYsICJtYy1jb25mIik7CisgIERFRlNZTSAoUW1jX2lu YWN0aXZlX3dpbmRvd3MsICJtYy1pbmFjdGl2ZS13aW5kb3dzIik7CisgIERFRlNZTSAoUWNyb3Nz aGFpcnMsICJjcm9zc2hhaXJzIik7CisgIERFRlNZTSAoUWNoX2hvcml6b250YWxfcnVsZXIsICJj aC1ob3Jpem9udGFsLXJ1bGVyIik7CisgIERFRlNZTSAoUWNoX3ZlcnRpY2FsX3J1bGVyLCAiY2gt dmVydGljYWwtcnVsZXIiKTsKKyAgREVGU1lNIChRY2hfaW5hY3RpdmVfd2luZG93cywgImNoLWlu YWN0aXZlLXdpbmRvd3MiKTsKKyAgREVGU1lNIChRZmNfdmlzaWJsZSwgImZjLXZpc2libGUiKTsK KyAgREVGU1lNIChRZmNfdmlzaWJsZV9pbmFjdGl2ZV93aW5kb3csICJmYy1pbmFjdGl2ZS13aW5k b3ciKTsKKworLyogKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqICovCisKKwogICBERUZTWU0gKFFjaG9pY2Us ICJjaG9pY2UiKTsKICAgREVGU1lNIChRbGVmdCwgImxlZnQiKTsKICAgREVGU1lNIChRcmlnaHQs ICJyaWdodCIpOwpAQCAtNTQ5MSw2ICs1NjA3LDQxIEBAIHN5bXNfb2ZfYnVmZmVyICh2b2lkKQog ICBGcHV0IChRcHJvdGVjdGVkX2ZpZWxkLCBRZXJyb3JfbWVzc2FnZSwKIAlidWlsZF9wdXJlX2Nf c3RyaW5nICgiQXR0ZW1wdCB0byBtb2RpZnkgYSBwcm90ZWN0ZWQgZmllbGQiKSk7CiAKKworLyog KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqICovCisvKiBNVUxUSVBMRS1DVVJTT1JTICovCisKKyAgREVGVkFS X1BFUl9CVUZGRVIgKCJtYy1yZWFsLWZha2UtY3Vyc29yIiwgJkJWQVIgKGN1cnJlbnRfYnVmZmVy LCBtY19yZWFsX2Zha2VfY3Vyc29yKSwgUW5pbCwKKyAgICBkb2M6IC8qIEEgYnVmZXItbG9jYWwg dmFyaWFibGUgdG8gc2V0IHRoZSBjdXJzb3IgdHlwZSBvZiB0aGUgcmVhbCBmYWtlIGN1cnNvci4g Ki8pOworCisgIERFRlZBUl9QRVJfQlVGRkVSICgibWMtY29uZiIsICZCVkFSIChjdXJyZW50X2J1 ZmZlciwgbWNfY29uZiksIFFuaWwsCisgICAgZG9jOiAvKiBBIGJ1ZmVyLWxvY2FsIHZhcmlhYmxl IHRvIHN0b3JlIHRoZSB2YWx1ZSBvZiB0aGUgbXVsdGlwbGUgY3Vyc29ycyB0byBiZSBkaXNwbGF5 ZWQKK2R1cmluZyB0aGUgbmV4dCByZWRpc3BsYXkuICovKTsKKworICBERUZWQVJfUEVSX0JVRkZF UiAoIm1jLWluYWN0aXZlLXdpbmRvd3MiLCAmQlZBUiAoY3VycmVudF9idWZmZXIsIG1jX2luYWN0 aXZlX3dpbmRvd3MpLCBRbmlsLAorICAgIGRvYzogLyogV2hlbiBub24tbmlsLCBkcmF3IG11bHRp cGxlIGN1cnNvcnMgaW4gaW5hY3RpdmUgd2luZG93cy4gKi8pOworCisgIERFRlZBUl9QRVJfQlVG RkVSICgiY3Jvc3NoYWlycyIsICZCVkFSIChjdXJyZW50X2J1ZmZlciwgY3Jvc3NoYWlycyksIFFu aWwsCisgICAgZG9jOiAvKiBBIGJ1ZmVyLWxvY2FsIHZhcmlhYmxlIHRvIGFjdGl2YXRlL2RlYWN0 aXZhdGUgY3Jvc3NoYWlycy4gKi8pOworCisgIERFRlZBUl9QRVJfQlVGRkVSICgiY2gtaG9yaXpv bnRhbC1ydWxlciIsICZCVkFSIChjdXJyZW50X2J1ZmZlciwgY2hfaG9yaXpvbnRhbF9ydWxlciks IFFuaWwsCisgICAgZG9jOiAvKiBBIGJ1ZmVyLWxvY2FsIHZhcmlhYmxlIHRvIGFjdGl2YXRlL2Rl YWN0aXZhdGUgdGhlIGNyb3NzaGFpcnMgaG9yaXpvbnRhbCBydWxlci4gKi8pOworCisgIERFRlZB Ul9QRVJfQlVGRkVSICgiY2gtdmVydGljYWwtcnVsZXIiLCAmQlZBUiAoY3VycmVudF9idWZmZXIs IGNoX3ZlcnRpY2FsX3J1bGVyKSwgUW5pbCwKKyAgICBkb2M6IC8qIEEgYnVmZXItbG9jYWwgdmFy aWFibGUgdG8gYWN0aXZhdGUvZGVhY3RpdmF0ZSB0aGUgY3Jvc3NoYWlycyB2ZXJ0aWNhbCBydWxl ci4gKi8pOworCisgIERFRlZBUl9QRVJfQlVGRkVSICgiY2gtaW5hY3RpdmUtd2luZG93cyIsICZC VkFSIChjdXJyZW50X2J1ZmZlciwgY2hfaW5hY3RpdmVfd2luZG93cyksIFFuaWwsCisgICAgZG9j OiAvKiBXaGVuIG5vbi1uaWwsIGRyYXcgY3Jvc3NoYWlycyBpbiBpbmFjdGl2ZSB3aW5kb3dzLiAq Lyk7CisKKyAgREVGVkFSX1BFUl9CVUZGRVIgKCJmYy12aXNpYmxlIiwgJkJWQVIgKGN1cnJlbnRf YnVmZmVyLCBmY192aXNpYmxlKSwgUW5pbCwKKyAgICBkb2M6IC8qIEEgYnVmZXItbG9jYWwgdmFy aWFibGUgdG8gdHVybiBvbi9vZmYgdGhlIG11bHRpcGxlIGN1cnNvcnMgZmlsbCBjb2x1bW4uICov KTsKKworICBERUZWQVJfUEVSX0JVRkZFUiAoImZjLWluYWN0aXZlLXdpbmRvd3MiLCAmQlZBUiAo Y3VycmVudF9idWZmZXIsIGZjX2luYWN0aXZlX3dpbmRvd3MpLCBRbmlsLAorICAgIGRvYzogLyog V2hlbiBub24tbmlsLCBkcmF3IG11bHRpcGxlIGN1cnNvcnMgZmlsbCBjb2x1bW4gaW4gaW5hY3Rp dmUgd2luZG93cy4gKi8pOworCisvKiAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiogKi8KKworCiAgIERFRlZB Ul9QRVJfQlVGRkVSICgiaGVhZGVyLWxpbmUtZm9ybWF0IiwKIAkJICAgICAmQlZBUiAoY3VycmVu dF9idWZmZXIsIGhlYWRlcl9saW5lX2Zvcm1hdCksCiAJCSAgICAgUW5pbCwKZGlmZiAtLWdpdCBh L3NyYy9idWZmZXIuaCBiL3NyYy9idWZmZXIuaAppbmRleCBkMzUyOGFjLi5lMWQ2NmNmIDEwMDY0 NAotLS0gYS9zcmMvYnVmZmVyLmgKKysrIGIvc3JjL2J1ZmZlci5oCkBAIC02MzYsNiArNjM2LDQw IEBAIHN0cnVjdCBidWZmZXIKICAgICAgY2FjaGUgYXJlIGVuYWJsZWQuICBTZWUgc2VhcmNoLmMs IGluZGVudC5jIGFuZCBiaWRpLmMgZm9yIGRldGFpbHMuICAqLwogICBMaXNwX09iamVjdCBjYWNo ZV9sb25nX3NjYW5zXzsKIAorCisvKiAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiogKi8KKy8qIE1VTFRJUExF LUNVUlNPUlMgKi8KKworICAvKiBUaGUgY3Vyc29yIHR5cGUgb2YgdGhlIHJlYWwgZmFrZSBjdXJz b3IuICovCisgIExpc3BfT2JqZWN0IG1jX3JlYWxfZmFrZV9jdXJzb3JfOworCisgIC8qIFRoZSBu YW1lIG9mIGxpc3QgdXNlZCBieSBtdWx0aXBsZSBjdXJzb3JzIGZvciBuZXh0IHJlZGlzcGxheS4g Ki8KKyAgTGlzcF9PYmplY3QgbWNfY29uZl87CisKKyAgLyogV2hldGhlciB0byBkcmF3IG11bHRp cGxlIGN1cnNvcnMgaW4gaW5hY3RpdmUgd2luZG93cy4gKi8KKyAgTGlzcF9PYmplY3QgbWNfaW5h Y3RpdmVfd2luZG93c187CisKKyAgLyogVGhlIG5hbWUgb2YgdGhlIGJ1ZmZlci1sb2NhbCB2YXJp YWJsZS4gKi8KKyAgTGlzcF9PYmplY3QgY3Jvc3NoYWlyc187CisKKyAgLyogVGhlIG5hbWUgb2Yg dGhlIGNyb3NzaGFpcnMgaG9yaXpvbnRhbCBydWxlci4gKi8KKyAgTGlzcF9PYmplY3QgY2hfaG9y aXpvbnRhbF9ydWxlcl87CisKKyAgLyogVGhlIG5hbWUgb2YgdGhlIGNyb3NzaGFpcnMgdmVydGlj YWwgcnVsZXIuICovCisgIExpc3BfT2JqZWN0IGNoX3ZlcnRpY2FsX3J1bGVyXzsKKworICAvKiBX aGV0aGVyIHRvIGRyYXcgY3Jvc3NoYWlycyBpbiBpbmFjdGl2ZSB3aW5kb3dzLiAqLworICBMaXNw X09iamVjdCBjaF9pbmFjdGl2ZV93aW5kb3dzXzsKKworICAvKiBUaGUgbmFtZSBvZiB0aGUgYnVm ZmVyLWxvY2FsIHZhcmlhYmxlLiAqLworICBMaXNwX09iamVjdCBmY192aXNpYmxlXzsKKworICAv KiBXaGV0aGVyIHRvIGRyYXcgbXVsdGlwbGUgY3Vyc29ycyBmaWxsIGNvbHVtbiBpbiBpbmFjdGl2 ZSB3aW5kb3dzLiAqLworICBMaXNwX09iamVjdCBmY19pbmFjdGl2ZV93aW5kb3dzXzsKKworLyog KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqICovCisKKwogICAvKiBJZiB0aGUgd2lkdGggcnVuIGNhY2hlIGlz IGVuYWJsZWQsIHRoaXMgdGFibGUgY29udGFpbnMgdGhlCiAgICAgIGNoYXJhY3RlciB3aWR0aHMg d2lkdGhfcnVuX2NhY2hlIChzZWUgYWJvdmUpIGFzc3VtZXMuICBXaGVuIHdlCiAgICAgIGRvIGEg dGhvcm91Z2ggcmVkaXNwbGF5LCB3ZSBjb21wYXJlIHRoaXMgYWdhaW5zdCB0aGUgYnVmZmVyJ3MK QEAgLTc4NywxNCArODIxLDIxIEBAIHN0cnVjdCBidWZmZXIKICAgICAgYW4gaW5kaXJlY3QgYnVm ZmVyIHNpbmNlIGl0IGNvdW50cyBhcyBpdHMgYmFzZSBidWZmZXIuICAqLwogICBpbnQgd2luZG93 X2NvdW50OwogCisKKy8qICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiAqLworLyogTVVMVElQTEUtQ1VSU09S UyAqLworCiAgIC8qIEEgbm9uLXplcm8gdmFsdWUgaW4gc2xvdCBJRFggbWVhbnMgdGhhdCBwZXIt YnVmZmVyIHZhcmlhYmxlCiAgICAgIHdpdGggaW5kZXggSURYIGhhcyBhIGxvY2FsIHZhbHVlIGlu IHRoaXMgYnVmZmVyLiAgVGhlIGluZGV4IElEWAogICAgICBmb3IgYSBidWZmZXItbG9jYWwgdmFy aWFibGUgaXMgc3RvcmVkIGluIHRoYXQgdmFyaWFibGUncyBzbG90CiAgICAgIGluIGJ1ZmZlcl9s b2NhbF9mbGFncyBhcyBhIExpc3AgaW50ZWdlci4gIElmIHRoZSBpbmRleCBpcyAtMSwKICAgICAg dGhpcyBtZWFucyB0aGUgdmFyaWFibGUgaXMgYWx3YXlzIGxvY2FsIGluIGFsbCBidWZmZXJzLiAg Ki8KLSNkZWZpbmUgTUFYX1BFUl9CVUZGRVJfVkFSUyA1MAorI2RlZmluZSBNQVhfUEVSX0JVRkZF Ul9WQVJTIDYwCiAgIGNoYXIgbG9jYWxfZmxhZ3NbTUFYX1BFUl9CVUZGRVJfVkFSU107CiAKKy8q ICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKiAqLworCisKICAgLyogU2V0IHRvIHRoZSBtb2R0aW1lIG9mIHRo ZSB2aXNpdGVkIGZpbGUgd2hlbiByZWFkIG9yIHdyaXR0ZW4uCiAgICAgIG1vZHRpbWUudHZfbnNl YyA9PSBOT05FWElTVEVOVF9NT0RUSU1FX05TRUNTIG1lYW5zCiAgICAgIHZpc2l0ZWQgZmlsZSB3 YXMgbm9uZXhpc3RlbnQuICBtb2R0aW1lLnR2X25zZWMgPT0KQEAgLTg5Niw2ICs5MzcsNjkgQEAg WEJVRkZFUiAoTGlzcF9PYmplY3QgYSkKIC8qIE1vc3QgY29kZSBzaG91bGQgdXNlIHRoZXNlIGZ1 bmN0aW9ucyB0byBzZXQgTGlzcCBmaWVsZHMgaW4gc3RydWN0CiAgICBidWZmZXIuICAoU29tZSBz ZXR0ZXJzIHRoYXQgYXJlIHByaXZhdGUgdG8gYSBzaW5nbGUgLmMgZmlsZSBhcmUKICAgIGRlZmlu ZWQgYXMgc3RhdGljIGluIHRob3NlIGZpbGVzLikgICovCisKKworLyogKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqICovCisvKiBiZWdpbiBNVUxUSVBMRS1DVVJTT1JTICovCisKK0lOTElORSB2b2lkCitic2V0 X2Jsdl9tY19yZWFsX2Zha2VfY3Vyc29yIChzdHJ1Y3QgYnVmZmVyICpiLCBMaXNwX09iamVjdCB2 YWwpCit7CisgIGItPm1jX3JlYWxfZmFrZV9jdXJzb3JfID0gdmFsOworfQorCitJTkxJTkUgdm9p ZAorYnNldF9ibHZfbWNfY29uZiAoc3RydWN0IGJ1ZmZlciAqYiwgTGlzcF9PYmplY3QgdmFsKQor eworICBiLT5tY19jb25mXyA9IHZhbDsKK30KKworSU5MSU5FIHZvaWQKK2JzZXRfYmx2X21jX2lu YWN0aXZlX3dpbmRvd3MgKHN0cnVjdCBidWZmZXIgKmIsIExpc3BfT2JqZWN0IHZhbCkKK3sKKyAg Yi0+bWNfaW5hY3RpdmVfd2luZG93c18gPSB2YWw7Cit9CisKK0lOTElORSB2b2lkCitic2V0X2Js dl9jcm9zc2hhaXJzIChzdHJ1Y3QgYnVmZmVyICpiLCBMaXNwX09iamVjdCB2YWwpCit7CisgIGIt PmNyb3NzaGFpcnNfID0gdmFsOworfQorCitJTkxJTkUgdm9pZAorYnNldF9ibHZfY2hfaG9yaXpv bnRhbF9ydWxlciAoc3RydWN0IGJ1ZmZlciAqYiwgTGlzcF9PYmplY3QgdmFsKQoreworICBiLT5j aF9ob3Jpem9udGFsX3J1bGVyXyA9IHZhbDsKK30KKworSU5MSU5FIHZvaWQKK2JzZXRfYmx2X2No X3ZlcnRpY2FsX3J1bGVyIChzdHJ1Y3QgYnVmZmVyICpiLCBMaXNwX09iamVjdCB2YWwpCit7Cisg IGItPmNoX3ZlcnRpY2FsX3J1bGVyXyA9IHZhbDsKK30KKworSU5MSU5FIHZvaWQKK2JzZXRfYmx2 X2NoX2luYWN0aXZlX3dpbmRvd3MgKHN0cnVjdCBidWZmZXIgKmIsIExpc3BfT2JqZWN0IHZhbCkK K3sKKyAgYi0+Y2hfaW5hY3RpdmVfd2luZG93c18gPSB2YWw7Cit9CisKK0lOTElORSB2b2lkCiti c2V0X2Jsdl9mY192aXNpYmxlIChzdHJ1Y3QgYnVmZmVyICpiLCBMaXNwX09iamVjdCB2YWwpCit7 CisgIGItPmZjX3Zpc2libGVfID0gdmFsOworfQorCitJTkxJTkUgdm9pZAorYnNldF9ibHZfZmNf aW5hY3RpdmVfd2luZG93cyAoc3RydWN0IGJ1ZmZlciAqYiwgTGlzcF9PYmplY3QgdmFsKQorewor ICBiLT5mY19pbmFjdGl2ZV93aW5kb3dzXyA9IHZhbDsKK30KKworLyogZW5kIE1VTFRJUExFLUNV UlNPUlMgKi8KKy8qICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiAqLworCisKIElOTElORSB2b2lkCiBic2V0 X2JpZGlfcGFyYWdyYXBoX2RpcmVjdGlvbiAoc3RydWN0IGJ1ZmZlciAqYiwgTGlzcF9PYmplY3Qg dmFsKQogewpkaWZmIC0tZ2l0IGEvc3JjL3BkdW1wZXIuYyBiL3NyYy9wZHVtcGVyLmMKaW5kZXgg ZDRmYmM0Yi4uZGU2N2JjYSAxMDA2NDQKLS0tIGEvc3JjL3BkdW1wZXIuYworKysgYi9zcmMvcGR1 bXBlci5jCkBAIC0yNzk3LDcgKzI3OTcsNyBAQCBkdW1wX2hhc2hfdGFibGUgKHN0cnVjdCBkdW1w X2NvbnRleHQgKmN0eCwKIHN0YXRpYyBkdW1wX29mZgogZHVtcF9idWZmZXIgKHN0cnVjdCBkdW1w X2NvbnRleHQgKmN0eCwgY29uc3Qgc3RydWN0IGJ1ZmZlciAqaW5fYnVmZmVyKQogewotI2lmIENI RUNLX1NUUlVDVFMgJiYgIWRlZmluZWQgSEFTSF9idWZmZXJfQUUyQzhDRTM1NworI2lmIENIRUNL X1NUUlVDVFMgJiYgIWRlZmluZWQgSEFTSF9idWZmZXJfQjczMEZGMUJCQQogIyBlcnJvciAiYnVm ZmVyIGNoYW5nZWQuIFNlZSBDSEVDS19TVFJVQ1RTIGNvbW1lbnQuIgogI2VuZGlmCiAgIHN0cnVj dCBidWZmZXIgbXVuZ2VkX2J1ZmZlciA9ICppbl9idWZmZXI7Cg== --Multipart_Sat_Apr__6_19:50:14_2019-1--