From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ken Brown Newsgroups: gmane.emacs.devel Subject: Re: [PATCH 1/4] Compilation cleanups Date: Sat, 31 Dec 2011 09:50:43 -0500 Message-ID: <4EFF2143.6010804@cornell.edu> References: <0c9938df7c6041c406017cec0d16691d46d017f8.1325166472.git.dancol@dancol.org> <4EFCA94B.9020502@cs.ucla.edu> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------060300040203070809050603" X-Trace: dough.gmane.org 1325343073 31018 80.91.229.12 (31 Dec 2011 14:51:13 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 31 Dec 2011 14:51:13 +0000 (UTC) Cc: Daniel Colascione , emacs-devel@gnu.org To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 31 15:51:07 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Rh0H4-0006ro-Q2 for ged-emacs-devel@m.gmane.org; Sat, 31 Dec 2011 15:51:07 +0100 Original-Received: from localhost ([::1]:54677 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rh0H4-0004KY-DH for ged-emacs-devel@m.gmane.org; Sat, 31 Dec 2011 09:51:06 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:34493) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rh0H1-0004KT-Tq for emacs-devel@gnu.org; Sat, 31 Dec 2011 09:51:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rh0H0-00071x-2X for emacs-devel@gnu.org; Sat, 31 Dec 2011 09:51:03 -0500 Original-Received: from granite1.mail.cornell.edu ([128.253.83.141]:33250 helo=authusersmtp.mail.cornell.edu) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rh0Gz-00071a-VV for emacs-devel@gnu.org; Sat, 31 Dec 2011 09:51:02 -0500 Original-Received: from [192.168.1.3] (cpe-67-249-194-47.twcny.res.rr.com [67.249.194.47]) (authenticated bits=0) by authusersmtp.mail.cornell.edu (8.14.4/8.12.10) with ESMTP id pBVEooL0025761 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sat, 31 Dec 2011 09:50:51 -0500 (EST) User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:8.0) Gecko/20111105 Thunderbird/8.0 In-Reply-To: <4EFCA94B.9020502@cs.ucla.edu> X-detected-operating-system: by eggs.gnu.org: Solaris 9 X-Received-From: 128.253.83.141 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:147099 Archived-At: This is a multi-part message in MIME format. --------------060300040203070809050603 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 12/29/2011 12:54 PM, Paul Eggert wrote: > On 12/29/11 06:03, Daniel Colascione wrote: > >> --- a/lib-src/update-game-score.c >> +++ b/lib-src/update-game-score.c >> @@ -48,8 +48,10 @@ along with GNU Emacs. If not, see. */ >> #include >> >> /* Needed for SunOS4, for instance. */ >> +#if !defined(CYGWIN) >> extern char *optarg; >> extern int optind, opterr; >> +#endif // !defined(CYGWIN) > > I suggest replacing those lines with "#include" instead; > that's what the other .c files do, and it's cleaner. > > >> --- a/src/gmalloc.c >> +++ b/src/gmalloc.c > ... >> - if (ptr< _heapbase) >> + if ((char*)ptr< (char*)_heapbase) > > No need to cast _heapbase as it's already a char *. > And please put a space after the ')', e.g., > "(char*) ptr< _heapbase", as that's the usual > Emacs style. And as long as we're cleaning up, why don't we get rid of all those warnings about old-style function definitions in gmalloc.c. A revision of Daniel's patch that does this is attached. --------------060300040203070809050603 Content-Type: text/plain; name="cleanup.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="cleanup.patch" PT09IG1vZGlmaWVkIGZpbGUgJ2xpYi1zcmMvdXBkYXRlLWdhbWUtc2NvcmUuYycKLS0tIGxp Yi1zcmMvdXBkYXRlLWdhbWUtc2NvcmUuYwkyMDExLTExLTE3IDA5OjA5OjIwICswMDAwCisr KyBsaWItc3JjL3VwZGF0ZS1nYW1lLXNjb3JlLmMJMjAxMS0xMi0zMSAxNDowOToyOSArMDAw MApAQCAtNDYsMTAgKzQ2LDcgQEAKICNpbmNsdWRlIDxmY250bC5oPgogI2VuZGlmCiAjaW5j bHVkZSA8c3lzL3N0YXQuaD4KLQotLyogTmVlZGVkIGZvciBTdW5PUzQsIGZvciBpbnN0YW5j ZS4gICovCi1leHRlcm4gY2hhciAqb3B0YXJnOwotZXh0ZXJuIGludCBvcHRpbmQsIG9wdGVy cjsKKyNpbmNsdWRlIDxnZXRvcHQuaD4KIAogc3RhdGljIGludCB1c2FnZSAoaW50IGVycikg Tk9fUkVUVVJOOwogCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3JjL2dtYWxsb2MuYycKLS0tIHNy Yy9nbWFsbG9jLmMJMjAxMS0wOS0wOSAwMTowNjo1MiArMDAwMAorKysgc3JjL2dtYWxsb2Mu YwkyMDExLTEyLTMxIDE0OjM2OjQ4ICswMDAwCkBAIC00NTUsOCArNDU1LDcgQEAKIC8qIEFs aWduZWQgYWxsb2NhdGlvbi4gICovCiBzdGF0aWMgX19wdHJfdCBhbGlnbiBQUCAoKF9fbWFs bG9jX3NpemVfdCkpOwogc3RhdGljIF9fcHRyX3QKLWFsaWduIChzaXplKQotICAgICBfX21h bGxvY19zaXplX3Qgc2l6ZTsKK2FsaWduIChfX21hbGxvY19zaXplX3Qgc2l6ZSkKIHsKICAg X19wdHJfdCByZXN1bHQ7CiAgIHVuc2lnbmVkIGxvbmcgaW50IGFkajsKQEAgLTQ5MCw5ICs0 ODksNyBAQAogICAgSWYgd2UgY2Fubm90IGdldCBzcGFjZSBhdCBFTkQsIGZhaWwgYW5kIHJl dHVybiAwLiAgKi8KIHN0YXRpYyBfX3B0cl90IGdldF9jb250aWd1b3VzX3NwYWNlIFBQICgo X19tYWxsb2NfcHRyZGlmZl90LCBfX3B0cl90KSk7CiBzdGF0aWMgX19wdHJfdAotZ2V0X2Nv bnRpZ3VvdXNfc3BhY2UgKHNpemUsIHBvc2l0aW9uKQotICAgICBfX21hbGxvY19wdHJkaWZm X3Qgc2l6ZTsKLSAgICAgX19wdHJfdCBwb3NpdGlvbjsKK2dldF9jb250aWd1b3VzX3NwYWNl IChfX21hbGxvY19wdHJkaWZmX3Qgc2l6ZSwgX19wdHJfdCBwb3NpdGlvbikKIHsKICAgX19w dHJfdCBiZWZvcmU7CiAgIF9fcHRyX3QgYWZ0ZXI7CkBAIC01NDgsMjEgKzU0NSwyMSBAQAog aW50IF9tYWxsb2NfdGhyZWFkX2VuYWJsZWRfcDsKIAogc3RhdGljIHZvaWQKLW1hbGxvY19h dGZvcmtfaGFuZGxlcl9wcmVwYXJlICgpCittYWxsb2NfYXRmb3JrX2hhbmRsZXJfcHJlcGFy ZSAodm9pZCkKIHsKICAgTE9DSyAoKTsKICAgTE9DS19BTElHTkVEX0JMT0NLUyAoKTsKIH0K IAogc3RhdGljIHZvaWQKLW1hbGxvY19hdGZvcmtfaGFuZGxlcl9wYXJlbnQgKCkKK21hbGxv Y19hdGZvcmtfaGFuZGxlcl9wYXJlbnQgKHZvaWQpCiB7CiAgIFVOTE9DS19BTElHTkVEX0JM T0NLUyAoKTsKICAgVU5MT0NLICgpOwogfQogCiBzdGF0aWMgdm9pZAotbWFsbG9jX2F0Zm9y a19oYW5kbGVyX2NoaWxkICgpCittYWxsb2NfYXRmb3JrX2hhbmRsZXJfY2hpbGQgKHZvaWQp CiB7CiAgIFVOTE9DS19BTElHTkVEX0JMT0NLUyAoKTsKICAgVU5MT0NLICgpOwpAQCAtNTcw LDcgKzU2Nyw3IEBACiAKIC8qIFNldCB1cCBtdXRleGVzIGFuZCBtYWtlIG1hbGxvYyBldGMu IHRocmVhZC1zYWZlLiAgKi8KIHZvaWQKLW1hbGxvY19lbmFibGVfdGhyZWFkICgpCittYWxs b2NfZW5hYmxlX3RocmVhZCAodm9pZCkKIHsKICAgaWYgKF9tYWxsb2NfdGhyZWFkX2VuYWJs ZWRfcCkKICAgICByZXR1cm47CkBAIC01ODksNyArNTg2LDcgQEAKICNlbmRpZgogCiBzdGF0 aWMgdm9pZAotbWFsbG9jX2luaXRpYWxpemVfMSAoKQorbWFsbG9jX2luaXRpYWxpemVfMSAo dm9pZCkKIHsKICNpZmRlZiBHQ19NQ0hFQ0sKICAgbWNoZWNrIChOVUxMKTsKQEAgLTYzMCw3 ICs2MjcsNyBAQAogICAgbWFpbiB3aWxsIGNhbGwgbWFsbG9jIHdoaWNoIGNhbGxzIHRoaXMg ZnVuY3Rpb24uICBUaGF0IGlzIGJlZm9yZSBhbnkgdGhyZWFkcwogICAgb3Igc2lnbmFsIGhh bmRsZXJzIGhhcyBiZWVuIHNldCB1cCwgc28gd2UgZG9uJ3QgbmVlZCB0aHJlYWQgcHJvdGVj dGlvbi4gICovCiBpbnQKLV9fbWFsbG9jX2luaXRpYWxpemUgKCkKK19fbWFsbG9jX2luaXRp YWxpemUgKHZvaWQpCiB7CiAgIGlmIChfX21hbGxvY19pbml0aWFsaXplZCkKICAgICByZXR1 cm4gMDsKQEAgLTY0Niw4ICs2NDMsNyBAQAogICAgZ3Jvd2luZyB0aGUgaGVhcCBpbmZvIHRh YmxlIGFzIG5lY2Vzc2FyeS4gKi8KIHN0YXRpYyBfX3B0cl90IG1vcmVjb3JlX25vbG9jayBQ UCAoKF9fbWFsbG9jX3NpemVfdCkpOwogc3RhdGljIF9fcHRyX3QKLW1vcmVjb3JlX25vbG9j ayAoc2l6ZSkKLSAgICAgX19tYWxsb2Nfc2l6ZV90IHNpemU7Cittb3JlY29yZV9ub2xvY2sg KF9fbWFsbG9jX3NpemVfdCBzaXplKQogewogICBfX3B0cl90IHJlc3VsdDsKICAgbWFsbG9j X2luZm8gKm5ld2luZm8sICpvbGRpbmZvOwpAQCAtNzYwLDggKzc1Niw3IEBACiAKIC8qIEFs bG9jYXRlIG1lbW9yeSBmcm9tIHRoZSBoZWFwLiAgKi8KIF9fcHRyX3QKLV9tYWxsb2NfaW50 ZXJuYWxfbm9sb2NrIChzaXplKQotICAgICBfX21hbGxvY19zaXplX3Qgc2l6ZTsKK19tYWxs b2NfaW50ZXJuYWxfbm9sb2NrIChfX21hbGxvY19zaXplX3Qgc2l6ZSkKIHsKICAgX19wdHJf dCByZXN1bHQ7CiAgIF9fbWFsbG9jX3NpemVfdCBibG9jaywgYmxvY2tzLCBsYXN0YmxvY2tz LCBzdGFydDsKQEAgLTk2MCw4ICs5NTUsNyBAQAogfQogCiBfX3B0cl90Ci1fbWFsbG9jX2lu dGVybmFsIChzaXplKQotICAgICBfX21hbGxvY19zaXplX3Qgc2l6ZTsKK19tYWxsb2NfaW50 ZXJuYWwgKF9fbWFsbG9jX3NpemVfdCBzaXplKQogewogICBfX3B0cl90IHJlc3VsdDsKIApA QCAtOTczLDggKzk2Nyw3IEBACiB9CiAKIF9fcHRyX3QKLW1hbGxvYyAoc2l6ZSkKLSAgICAg X19tYWxsb2Nfc2l6ZV90IHNpemU7CittYWxsb2MgKF9fbWFsbG9jX3NpemVfdCBzaXplKQog ewogICBfX3B0cl90ICgqaG9vaykgKF9fbWFsbG9jX3NpemVfdCk7CiAKQEAgLTk5OSwyMyAr OTkyLDE5IEBACiAgICBhbmQgX3JlYWxsb2MuICBNYWtlIHRoZW0gdXNlIHRoZSBHTlUgZnVu Y3Rpb25zLiAgKi8KIAogX19wdHJfdAotX21hbGxvYyAoc2l6ZSkKLSAgICAgX19tYWxsb2Nf c2l6ZV90IHNpemU7CitfbWFsbG9jIChfX21hbGxvY19zaXplX3Qgc2l6ZSkKIHsKICAgcmV0 dXJuIG1hbGxvYyAoc2l6ZSk7CiB9CiAKIHZvaWQKLV9mcmVlIChwdHIpCi0gICAgIF9fcHRy X3QgcHRyOworX2ZyZWUgKF9fcHRyX3QgcHRyKQogewogICBmcmVlIChwdHIpOwogfQogCiBf X3B0cl90Ci1fcmVhbGxvYyAocHRyLCBzaXplKQotICAgICBfX3B0cl90IHB0cjsKLSAgICAg X19tYWxsb2Nfc2l6ZV90IHNpemU7CitfcmVhbGxvYyAoX19wdHJfdCBwdHIsIF9fbWFsbG9j X3NpemVfdCBzaXplKQogewogICByZXR1cm4gcmVhbGxvYyAocHRyLCBzaXplKTsKIH0KQEAg LTEwNTgsOCArMTA0Nyw3IEBACiAvKiBSZXR1cm4gbWVtb3J5IHRvIHRoZSBoZWFwLgogICAg TGlrZSBgX2ZyZWVfaW50ZXJuYWwnIGJ1dCBkb24ndCBsb2NrIG11dGV4LiAgKi8KIHZvaWQK LV9mcmVlX2ludGVybmFsX25vbG9jayAocHRyKQotICAgICBfX3B0cl90IHB0cjsKK19mcmVl X2ludGVybmFsX25vbG9jayAoX19wdHJfdCBwdHIpCiB7CiAgIGludCB0eXBlOwogICBfX21h bGxvY19zaXplX3QgYmxvY2ssIGJsb2NrczsKQEAgLTEwNzYsNyArMTA2NCw3IEBACiAgICAg cmV0dXJuOwogCiAjaWZkZWYgQ1lHV0lOCi0gIGlmIChwdHIgPCBfaGVhcGJhc2UpCisgIGlm ICgoY2hhciopIHB0ciA8IF9oZWFwYmFzZSkKICAgICAvKiBXZSdyZSBiZWluZyBhc2tlZCB0 byBmcmVlIHNvbWV0aGluZyBpbiB0aGUgc3RhdGljIGhlYXAuICovCiAgICAgcmV0dXJuOwog I2VuZGlmCkBAIC0xMzEzLDggKzEzMDEsNyBAQAogLyogUmV0dXJuIG1lbW9yeSB0byB0aGUg aGVhcC4KICAgIExpa2UgYGZyZWUnIGJ1dCBkb24ndCBjYWxsIGEgX19mcmVlX2hvb2sgaWYg dGhlcmUgaXMgb25lLiAgKi8KIHZvaWQKLV9mcmVlX2ludGVybmFsIChwdHIpCi0gICAgIF9f cHRyX3QgcHRyOworX2ZyZWVfaW50ZXJuYWwgKF9fcHRyX3QgcHRyKQogewogICBMT0NLICgp OwogICBfZnJlZV9pbnRlcm5hbF9ub2xvY2sgKHB0cik7CkBAIC0xMzI0LDggKzEzMTEsNyBA QAogLyogUmV0dXJuIG1lbW9yeSB0byB0aGUgaGVhcC4gICovCiAKIHZvaWQKLWZyZWUgKHB0 cikKLSAgICAgX19wdHJfdCBwdHI7CitmcmVlIChfX3B0cl90IHB0cikKIHsKICAgdm9pZCAo Kmhvb2spIChfX3B0cl90KSA9IF9fZnJlZV9ob29rOwogCkBAIC0xMzQwLDggKzEzMjYsNyBA QAogd2Vha19hbGlhcyAoZnJlZSwgY2ZyZWUpCiAjZWxzZQogdm9pZAotY2ZyZWUgKHB0cikK LSAgICAgX19wdHJfdCBwdHI7CitjZnJlZSAoX19wdHJfdCBwdHIpCiB7CiAgIGZyZWUgKHB0 cik7CiB9CkBAIC0xMzgxLDkgKzEzNjYsNyBAQAogICAgZGF0YS4gICovCiAjaWZkZWYgQ1lH V0lOCiBfX3B0cl90Ci1zcGVjaWFsX3JlYWxsb2MgKHB0ciwgc2l6ZSkKLSAgICAgX19wdHJf dCBwdHI7Ci0gICAgIF9fbWFsbG9jX3NpemVfdCBzaXplOworc3BlY2lhbF9yZWFsbG9jIChf X3B0cl90IHB0ciwgX19tYWxsb2Nfc2l6ZV90IHNpemUpCiB7CiAgIF9fcHRyX3QgcmVzdWx0 OwogICBpbnQgdHlwZTsKQEAgLTE0MTEsOSArMTM5NCw3IEBACiAgICBuZXcgcmVnaW9uLiAg VGhpcyBtb2R1bGUgaGFzIGluY2VzdHVvdXMga25vd2xlZGdlIG9mIHRoZQogICAgaW50ZXJu YWxzIG9mIGJvdGggZnJlZSBhbmQgbWFsbG9jLiAqLwogX19wdHJfdAotX3JlYWxsb2NfaW50 ZXJuYWxfbm9sb2NrIChwdHIsIHNpemUpCi0gICAgIF9fcHRyX3QgcHRyOwotICAgICBfX21h bGxvY19zaXplX3Qgc2l6ZTsKK19yZWFsbG9jX2ludGVybmFsX25vbG9jayAoX19wdHJfdCBw dHIsIF9fbWFsbG9jX3NpemVfdCBzaXplKQogewogICBfX3B0cl90IHJlc3VsdDsKICAgaW50 IHR5cGU7CkBAIC0xNDI4LDcgKzE0MDksNyBAQAogICAgIHJldHVybiBfbWFsbG9jX2ludGVy bmFsX25vbG9jayAoc2l6ZSk7CiAKICNpZmRlZiBDWUdXSU4KLSAgaWYgKHB0ciA8IF9oZWFw YmFzZSkKKyAgaWYgKChjaGFyKikgcHRyIDwgX2hlYXBiYXNlKQogICAgIC8qIHB0ciBwb2lu dHMgaW50byB0aGUgc3RhdGljIGhlYXAgKi8KICAgICByZXR1cm4gc3BlY2lhbF9yZWFsbG9j IChwdHIsIHNpemUpOwogI2VuZGlmCkBAIC0xNTM1LDkgKzE1MTYsNyBAQAogfQogCiBfX3B0 cl90Ci1fcmVhbGxvY19pbnRlcm5hbCAocHRyLCBzaXplKQotICAgICBfX3B0cl90IHB0cjsK LSAgICAgX19tYWxsb2Nfc2l6ZV90IHNpemU7CitfcmVhbGxvY19pbnRlcm5hbCAoX19wdHJf dCBwdHIsIF9fbWFsbG9jX3NpemVfdCBzaXplKQogewogICBfX3B0cl90IHJlc3VsdDsKIApA QCAtMTU0OSw5ICsxNTI4LDcgQEAKIH0KIAogX19wdHJfdAotcmVhbGxvYyAocHRyLCBzaXpl KQotICAgICBfX3B0cl90IHB0cjsKLSAgICAgX19tYWxsb2Nfc2l6ZV90IHNpemU7CityZWFs bG9jIChfX3B0cl90IHB0ciwgX19tYWxsb2Nfc2l6ZV90IHNpemUpCiB7CiAgIF9fcHRyX3Qg KCpob29rKSAoX19wdHJfdCwgX19tYWxsb2Nfc2l6ZV90KTsKIApAQCAtMTU4OSw5ICsxNTY2 LDcgQEAKIC8qIEFsbG9jYXRlIGFuIGFycmF5IG9mIE5NRU1CIGVsZW1lbnRzIGVhY2ggU0la RSBieXRlcyBsb25nLgogICAgVGhlIGVudGlyZSBhcnJheSBpcyBpbml0aWFsaXplZCB0byB6 ZXJvcy4gICovCiBfX3B0cl90Ci1jYWxsb2MgKG5tZW1iLCBzaXplKQotICAgICByZWdpc3Rl ciBfX21hbGxvY19zaXplX3Qgbm1lbWI7Ci0gICAgIHJlZ2lzdGVyIF9fbWFsbG9jX3NpemVf dCBzaXplOworY2FsbG9jIChyZWdpc3RlciBfX21hbGxvY19zaXplX3Qgbm1lbWIsIHJlZ2lz dGVyIF9fbWFsbG9jX3NpemVfdCBzaXplKQogewogICByZWdpc3RlciBfX3B0cl90IHJlc3Vs dCA9IG1hbGxvYyAobm1lbWIgKiBzaXplKTsKIApAQCAtMTY0Myw4ICsxNjE4LDcgQEAKICAg IGFuZCByZXR1cm4gdGhlIHN0YXJ0IG9mIGRhdGEgc3BhY2UsIG9yIE5VTEwgb24gZXJyb3Jz LgogICAgSWYgSU5DUkVNRU5UIGlzIG5lZ2F0aXZlLCBzaHJpbmsgZGF0YSBzcGFjZS4gICov CiBfX3B0cl90Ci1fX2RlZmF1bHRfbW9yZWNvcmUgKGluY3JlbWVudCkKLSAgICAgX19tYWxs b2NfcHRyZGlmZl90IGluY3JlbWVudDsKK19fZGVmYXVsdF9tb3JlY29yZSAoX19tYWxsb2Nf cHRyZGlmZl90IGluY3JlbWVudCkKIHsKICAgX19wdHJfdCByZXN1bHQ7CiAjaWYgZGVmaW5l ZCAoQ1lHV0lOKQpAQCAtMTY4NCw5ICsxNjU4LDcgQEAKIAkJCQlfX21hbGxvY19zaXplX3Qg X19hbGlnbm1lbnQpKTsKIAogX19wdHJfdAotbWVtYWxpZ24gKGFsaWdubWVudCwgc2l6ZSkK LSAgICAgX19tYWxsb2Nfc2l6ZV90IGFsaWdubWVudDsKLSAgICAgX19tYWxsb2Nfc2l6ZV90 IHNpemU7CittZW1hbGlnbiAoX19tYWxsb2Nfc2l6ZV90IGFsaWdubWVudCwgX19tYWxsb2Nf c2l6ZV90IHNpemUpCiB7CiAgIF9fcHRyX3QgcmVzdWx0OwogICB1bnNpZ25lZCBsb25nIGlu dCBhZGosIGxhc3RhZGo7CkBAIC0xNzY3LDEwICsxNzM5LDggQEAKICNlbmRpZgogCiBpbnQK LXBvc2l4X21lbWFsaWduIChtZW1wdHIsIGFsaWdubWVudCwgc2l6ZSkKLSAgICAgX19wdHJf dCAqbWVtcHRyOwotICAgICBfX21hbGxvY19zaXplX3QgYWxpZ25tZW50OwotICAgICBfX21h bGxvY19zaXplX3Qgc2l6ZTsKK3Bvc2l4X21lbWFsaWduIChfX3B0cl90ICptZW1wdHIsIF9f bWFsbG9jX3NpemVfdCBhbGlnbm1lbnQsCisJCV9fbWFsbG9jX3NpemVfdCBzaXplKQogewog ICBfX3B0cl90IG1lbTsKIApAQCAtMTg0MSw4ICsxODExLDcgQEAKIHN0YXRpYyBfX21hbGxv Y19zaXplX3QgcGFnZXNpemU7CiAKIF9fcHRyX3QKLXZhbGxvYyAoc2l6ZSkKLSAgICAgX19t YWxsb2Nfc2l6ZV90IHNpemU7Cit2YWxsb2MgKF9fbWFsbG9jX3NpemVfdCBzaXplKQogewog ICBpZiAocGFnZXNpemUgPT0gMCkKICAgICBwYWdlc2l6ZSA9IF9fZ2V0cGFnZXNpemUgKCk7 CkBAIC0xOTM1LDggKzE5MDQsNyBAQAogCiBzdGF0aWMgdm9pZCBmcmVlaG9vayAoX19wdHJf dCk7CiBzdGF0aWMgdm9pZAotZnJlZWhvb2sgKHB0cikKLSAgICAgX19wdHJfdCBwdHI7Citm cmVlaG9vayAoX19wdHJfdCBwdHIpCiB7CiAgIHN0cnVjdCBoZHIgKmhkcjsKIApAQCAtMTk1 Nyw4ICsxOTI1LDcgQEAKIAogc3RhdGljIF9fcHRyX3QgbWFsbG9jaG9vayAoX19tYWxsb2Nf c2l6ZV90KTsKIHN0YXRpYyBfX3B0cl90Ci1tYWxsb2Nob29rIChzaXplKQotICAgICBfX21h bGxvY19zaXplX3Qgc2l6ZTsKK21hbGxvY2hvb2sgKF9fbWFsbG9jX3NpemVfdCBzaXplKQog ewogICBzdHJ1Y3QgaGRyICpoZHI7CiAKQEAgLTE5NzcsOSArMTk0NCw3IEBACiAKIHN0YXRp YyBfX3B0cl90IHJlYWxsb2Nob29rIChfX3B0cl90LCBfX21hbGxvY19zaXplX3QpOwogc3Rh dGljIF9fcHRyX3QKLXJlYWxsb2Nob29rIChwdHIsIHNpemUpCi0gICAgIF9fcHRyX3QgcHRy OwotICAgICBfX21hbGxvY19zaXplX3Qgc2l6ZTsKK3JlYWxsb2Nob29rIChfX3B0cl90IHB0 ciwgX19tYWxsb2Nfc2l6ZV90IHNpemUpCiB7CiAgIHN0cnVjdCBoZHIgKmhkciA9IE5VTEw7 CiAgIF9fbWFsbG9jX3NpemVfdCBvc2l6ZSA9IDA7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3Jj L3VuZXhjdy5jJwotLS0gc3JjL3VuZXhjdy5jCTIwMTEtMDgtMTYgMTM6Mjc6MTIgKzAwMDAK KysrIHNyYy91bmV4Y3cuYwkyMDExLTEyLTMxIDEzOjUyOjU3ICswMDAwCkBAIC0zMSw2ICsz MSw4IEBACiAKICNkZWZpbmUgRE9URVhFICIuZXhlIgogCitleHRlcm4gdm9pZCByZXBvcnRf c2hlYXBfdXNhZ2UgKGludCk7CisKIGV4dGVybiBpbnQgYnNzX3NicmtfZGlkX3VuZXhlYzsK IAogZXh0ZXJuIGludCBfX21hbGxvY19pbml0aWFsaXplZDsKCg== --------------060300040203070809050603--