From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by sourceware.org (Postfix) with ESMTPS id 1674A3858D1E for ; Fri, 30 Dec 2022 12:58:10 +0000 (GMT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 9D2A521DF4; Fri, 30 Dec 2022 12:58:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1672405088; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=2VoRJHOSnV2l1eMy14PMIu3X2mR52On+Dqk+zYEXH/Y=; b=tzX/u7yTiMThhPKQM4V3vbOY7p1fiEKR6PoEk1XfxbrmV+EuzDrSiDPM/4OIFQtii+W2xr rObUBv6Fm4u4q/Wrxqu9RN4+YqtfvgY8QU8BB5LVr2qBQO1aOhHjloxEY/3EBNBOrjDesk JMN7b0VpMkaVLrySuc2ImUBvI9nn9Mg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1672405088; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=2VoRJHOSnV2l1eMy14PMIu3X2mR52On+Dqk+zYEXH/Y=; b=keiUQgm49BrkmiSCohdeGANtC9pcDAQqpMP3nSGe/wFqOr5RYCxGMy4iTSnYAg5W/9siQz TdKpBkAzRhXS80CQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 83C7C138FA; Fri, 30 Dec 2022 12:58:08 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id KUbbHmDgrmNTBgAAMHmgww (envelope-from ); Fri, 30 Dec 2022 12:58:08 +0000 Content-Type: multipart/mixed; boundary="------------WoEZHjbty0eYgQvr5AKsYIpY" Message-ID: <3ddbd82e-6e70-327f-8dd8-08ce85625297@suse.de> Date: Fri, 30 Dec 2022 13:58:08 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.1 Subject: [pushed] [gdb/symtab] Make comp_unit_head.length private To: Tom Tromey Cc: tdevries via Gdb-patches References: <20221224224435.760523-1-tom@tromey.com> <71d0815665fb2b2c4904264b023840d1@suse.de> <87sfh3cxc0.fsf@tromey.com> <74dd4be1f399773c5cb7fc9ab188f358@suse.de> <87lemucagf.fsf@tromey.com> Content-Language: en-US From: Tom de Vries In-Reply-To: <87lemucagf.fsf@tromey.com> X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This is a multi-part message in MIME format. --------------WoEZHjbty0eYgQvr5AKsYIpY Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit [was: Re: [PATCH] Add initializers to comp_unit_head ] On 12/26/22 18:59, Tom Tromey wrote: >> OK, so how about: >> - get_length_with_initial >> - get_length_without_initial >> ? > > Works for me, thank you. Committed with that approach, as attached. Thanks, - Tom --------------WoEZHjbty0eYgQvr5AKsYIpY Content-Type: text/x-patch; charset=UTF-8; name="0001-gdb-symtab-Make-comp_unit_head.length-private.patch" Content-Disposition: attachment; filename="0001-gdb-symtab-Make-comp_unit_head.length-private.patch" Content-Transfer-Encoding: base64 RnJvbSBkOGY1MmE5YTljY2JmNzQxMWNmNGFlNDg3ZDI3NTY4MjZmNWQwYmQ1IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBUb20gZGUgVnJpZXMgPHRkZXZyaWVzQHN1c2UuZGU+ CkRhdGU6IEZyaSwgMzAgRGVjIDIwMjIgMTM6NTU6MjIgKzAxMDAKU3ViamVjdDogW3B1c2hl ZF0gW2dkYi9zeW10YWJdIE1ha2UgY29tcF91bml0X2hlYWQubGVuZ3RoIHByaXZhdGUKCk1h a2UgY29tcF91bml0X2hlYWQubGVuZ3RoIHByaXZhdGUsIHRvIGVuZm9yY2UgdXNpbmcgYWNj ZXNzb3IgZnVuY3Rpb25zLgoKUmVwbGFjZSBhY2Nlc3NvciBmdW5jdGlvbiBnZXRfbGVuZ3Ro IHdpdGggZ2V0X2xlbmd0aF93aXRoX2luaXRpYWwgYW5kCmdldF9sZW5ndGhfd2l0aG91dF9p bml0aWFsLCB0byBtYWtlIGl0IGV4cGxpY2l0IHdoaWNoIHZhcmlhbnQgd2UncmUgdXNpbmcu CgpUZXN0ZWQgb24geDg2XzY0LWxpbnV4LgoKUFIgc3ltdGFiLzI5MzQzCkJ1ZzogaHR0cHM6 Ly9zb3VyY2V3YXJlLm9yZy9idWd6aWxsYS9zaG93X2J1Zy5jZ2k/aWQ9MjkzNDMKLS0tCiBn ZGIvZHdhcmYyL2NvbXAtdW5pdC1oZWFkLmMgfCAgNiArKystLS0KIGdkYi9kd2FyZjIvY29t cC11bml0LWhlYWQuaCB8IDI1ICsrKysrKysrKysrKysrKysrKysrLS0tLS0KIGdkYi9kd2Fy ZjIvcmVhZC5jICAgICAgICAgICB8IDIwICsrKysrKysrKystLS0tLS0tLS0tCiAzIGZpbGVz IGNoYW5nZWQsIDMzIGluc2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2dkYi9kd2FyZjIvY29tcC11bml0LWhlYWQuYyBiL2dkYi9kd2FyZjIvY29tcC11bml0 LWhlYWQuYwppbmRleCBlZGIyYThhYTU1YS4uYjYxOGE2NzQ4MDggMTAwNjQ0Ci0tLSBhL2dk Yi9kd2FyZjIvY29tcC11bml0LWhlYWQuYworKysgYi9nZGIvZHdhcmYyL2NvbXAtdW5pdC1o ZWFkLmMKQEAgLTQ0LDcgKzQ0LDcgQEAgcmVhZF9jb21wX3VuaXRfaGVhZCAoc3RydWN0IGNv bXBfdW5pdF9oZWFkICpjdV9oZWFkZXIsCiAgIGNvbnN0IGNoYXIgKmZpbGVuYW1lID0gc2Vj dGlvbi0+Z2V0X2ZpbGVfbmFtZSAoKTsKICAgYmZkICphYmZkID0gc2VjdGlvbi0+Z2V0X2Jm ZF9vd25lciAoKTsKIAotICBjdV9oZWFkZXItPmxlbmd0aCA9IHJlYWRfaW5pdGlhbF9sZW5n dGggKGFiZmQsIGluZm9fcHRyLCAmYnl0ZXNfcmVhZCk7CisgIGN1X2hlYWRlci0+c2V0X2xl bmd0aCAocmVhZF9pbml0aWFsX2xlbmd0aCAoYWJmZCwgaW5mb19wdHIsICZieXRlc19yZWFk KSk7CiAgIGN1X2hlYWRlci0+aW5pdGlhbF9sZW5ndGhfc2l6ZSA9IGJ5dGVzX3JlYWQ7CiAg IGN1X2hlYWRlci0+b2Zmc2V0X3NpemUgPSAoYnl0ZXNfcmVhZCA9PSA0KSA/IDQgOiA4Owog ICBpbmZvX3B0ciArPSBieXRlc19yZWFkOwpAQCAtMTYyLDExICsxNjIsMTEgQEAgZXJyb3Jf Y2hlY2tfY29tcF91bml0X2hlYWQgKGR3YXJmMl9wZXJfb2JqZmlsZSAqcGVyX29iamZpbGUs CiAKICAgLyogQ2FzdCB0byBVTE9OR0VTVCB0byB1c2UgNjQtYml0IGFyaXRobWV0aWMgd2hl biBwb3NzaWJsZSB0bwogICAgICBhdm9pZCBwb3RlbnRpYWwgMzItYml0IG92ZXJmbG93LiAg Ki8KLSAgaWYgKCgoVUxPTkdFU1QpIGhlYWRlci0+c2VjdF9vZmYgKyBoZWFkZXItPmdldF9s ZW5ndGggKCkpCisgIGlmICgoKFVMT05HRVNUKSBoZWFkZXItPnNlY3Rfb2ZmICsgaGVhZGVy LT5nZXRfbGVuZ3RoX3dpdGhfaW5pdGlhbCAoKSkKICAgICAgID4gc2VjdGlvbi0+c2l6ZSkK ICAgICBlcnJvciAoXygiRHdhcmYgRXJyb3I6IGJhZCBsZW5ndGggKDB4JXgpIGluIGNvbXBp bGF0aW9uIHVuaXQgaGVhZGVyICIKIAkgICAiKG9mZnNldCAlcyArIDApIFtpbiBtb2R1bGUg JXNdIiksCi0JICAgaGVhZGVyLT5sZW5ndGgsIHNlY3Rfb2Zmc2V0X3N0ciAoaGVhZGVyLT5z ZWN0X29mZiksCisJICAgaGVhZGVyLT5nZXRfbGVuZ3RoX3dpdGhvdXRfaW5pdGlhbCAoKSwg c2VjdF9vZmZzZXRfc3RyIChoZWFkZXItPnNlY3Rfb2ZmKSwKIAkgICBmaWxlbmFtZSk7CiB9 CiAKZGlmZiAtLWdpdCBhL2dkYi9kd2FyZjIvY29tcC11bml0LWhlYWQuaCBiL2dkYi9kd2Fy ZjIvY29tcC11bml0LWhlYWQuaAppbmRleCA3NTc5ZmU3ZmEyOS4uNDUzODRmYWM3MjAgMTAw NjQ0Ci0tLSBhL2dkYi9kd2FyZjIvY29tcC11bml0LWhlYWQuaAorKysgYi9nZGIvZHdhcmYy L2NvbXAtdW5pdC1oZWFkLmgKQEAgLTM0LDcgKzM0LDkgQEAKICAgIHRyYW5zbGF0aW9uLCBs b29rcyBsaWtlIHRoaXMuICAqLwogc3RydWN0IGNvbXBfdW5pdF9oZWFkCiB7Ci0gIHVuc2ln bmVkIGludCBsZW5ndGggPSAwOworcHJpdmF0ZToKKyAgdW5zaWduZWQgaW50IG1fbGVuZ3Ro ID0gMDsKK3B1YmxpYzoKICAgdW5zaWduZWQgY2hhciB2ZXJzaW9uID0gMDsKICAgdW5zaWdu ZWQgY2hhciBhZGRyX3NpemUgPSAwOwogICB1bnNpZ25lZCBjaGFyIHNpZ25lZF9hZGRyX3Ag PSAwOwpAQCAtNjUsMTcgKzY3LDMwIEBAIHN0cnVjdCBjb21wX3VuaXRfaGVhZAogICAgICBE V19VVF9za2VsZXRvbiBvciBEV19VVF9zcGxpdF9jb21waWxlLiAgKi8KICAgVUxPTkdFU1Qg c2lnbmF0dXJlID0gMDsKIAotICAvKiBSZXR1cm4gdGhlIHRvdGFsIGxlbmd0aCBvZiB0aGUg Q1UgZGVzY3JpYmVkIGJ5IHRoaXMgaGVhZGVyLiAgKi8KLSAgdW5zaWduZWQgaW50IGdldF9s ZW5ndGggKCkgY29uc3QKKyAgdm9pZCBzZXRfbGVuZ3RoICh1bnNpZ25lZCBpbnQgbGVuZ3Ro KQogICB7Ci0gICAgcmV0dXJuIGluaXRpYWxfbGVuZ3RoX3NpemUgKyBsZW5ndGg7CisgICAg bV9sZW5ndGggPSBsZW5ndGg7CisgIH0KKworICAvKiBSZXR1cm4gdGhlIHRvdGFsIGxlbmd0 aCBvZiB0aGUgQ1UgZGVzY3JpYmVkIGJ5IHRoaXMgaGVhZGVyLCBpbmNsdWRpbmcgdGhlCisg ICAgIGluaXRpYWwgbGVuZ3RoIGZpZWxkLiAgKi8KKyAgdW5zaWduZWQgaW50IGdldF9sZW5n dGhfd2l0aF9pbml0aWFsICgpIGNvbnN0CisgIHsKKyAgICByZXR1cm4gbV9sZW5ndGggKyBp bml0aWFsX2xlbmd0aF9zaXplOworICB9CisKKyAgLyogUmV0dXJuIHRoZSB0b3RhbCBsZW5n dGggb2YgdGhlIENVIGRlc2NyaWJlZCBieSB0aGlzIGhlYWRlciwgZXhjbHVkaW5nIHRoZQor ICAgICBpbml0aWFsIGxlbmd0aCBmaWVsZC4gICovCisgIHVuc2lnbmVkIGludCBnZXRfbGVu Z3RoX3dpdGhvdXRfaW5pdGlhbCAoKSBjb25zdAorICB7CisgICAgcmV0dXJuIG1fbGVuZ3Ro OwogICB9CiAKICAgLyogUmV0dXJuIFRSVUUgaWYgT0ZGIGlzIHdpdGhpbiB0aGlzIENVLiAg Ki8KICAgYm9vbCBvZmZzZXRfaW5fY3VfcCAoc2VjdF9vZmZzZXQgb2ZmKSBjb25zdAogICB7 CiAgICAgc2VjdF9vZmZzZXQgYm90dG9tID0gc2VjdF9vZmY7Ci0gICAgc2VjdF9vZmZzZXQg dG9wID0gc2VjdF9vZmYgKyBnZXRfbGVuZ3RoICgpOworICAgIHNlY3Rfb2Zmc2V0IHRvcCA9 IHNlY3Rfb2ZmICsgZ2V0X2xlbmd0aF93aXRoX2luaXRpYWwgKCk7CiAgICAgcmV0dXJuIG9m ZiA+PSBib3R0b20gJiYgb2ZmIDwgdG9wOwogICB9CiAKZGlmZiAtLWdpdCBhL2dkYi9kd2Fy ZjIvcmVhZC5jIGIvZ2RiL2R3YXJmMi9yZWFkLmMKaW5kZXggMjhmYWRiODg2YWEuLmIzM2Vh Njg0N2UwIDEwMDY0NAotLS0gYS9nZGIvZHdhcmYyL3JlYWQuYworKysgYi9nZGIvZHdhcmYy L3JlYWQuYwpAQCAtNTU5OCw3ICs1NTk4LDcgQEAgY3JlYXRlX2RlYnVnX3R5cGVfaGFzaF90 YWJsZSAoZHdhcmYyX3Blcl9vYmpmaWxlICpwZXJfb2JqZmlsZSwKICAgICAgIHB0ciA9IHJl YWRfYW5kX2NoZWNrX2NvbXBfdW5pdF9oZWFkIChwZXJfb2JqZmlsZSwgJmhlYWRlciwgc2Vj dGlvbiwKIAkJCQkJICAgYWJicmV2X3NlY3Rpb24sIHB0ciwgc2VjdGlvbl9raW5kKTsKIAot ICAgICAgbGVuZ3RoID0gaGVhZGVyLmdldF9sZW5ndGggKCk7CisgICAgICBsZW5ndGggPSBo ZWFkZXIuZ2V0X2xlbmd0aF93aXRoX2luaXRpYWwgKCk7CiAKICAgICAgIC8qIFNraXAgZHVt bXkgdHlwZSB1bml0cy4gICovCiAgICAgICBpZiAocHRyID49IGluZm9fcHRyICsgbGVuZ3Ro CkBAIC02MDA1LDcgKzYwMDUsNyBAQCByZWFkX2N1dHVfZGllX2Zyb21fZHdvIChkd2FyZjJf Y3UgKmN1LAogICAgICAgZ2RiX2Fzc2VydCAoZHdvX3VuaXQtPnNlY3Rfb2ZmID09IGN1LT5o ZWFkZXIuc2VjdF9vZmYpOwogICAgICAgLyogRm9yIERXT3MgY29taW5nIGZyb20gRFdQIGZp bGVzLCB3ZSBkb24ndCBrbm93IHRoZSBDVSBsZW5ndGgKIAkgbm9yIHRoZSB0eXBlJ3Mgb2Zm c2V0IGluIHRoZSBUVSB1bnRpbCBub3cuICAqLwotICAgICAgZHdvX3VuaXQtPmxlbmd0aCA9 IGN1LT5oZWFkZXIuZ2V0X2xlbmd0aCAoKTsKKyAgICAgIGR3b191bml0LT5sZW5ndGggPSBj dS0+aGVhZGVyLmdldF9sZW5ndGhfd2l0aF9pbml0aWFsICgpOwogICAgICAgZHdvX3VuaXQt PnR5cGVfb2Zmc2V0X2luX3R1ID0gY3UtPmhlYWRlci50eXBlX2N1X29mZnNldF9pbl90dTsK IAogICAgICAgLyogRXN0YWJsaXNoIHRoZSB0eXBlIG9mZnNldCB0aGF0IGNhbiBiZSB1c2Vk IHRvIGxvb2t1cCB0aGUgdHlwZS4KQEAgLTYwMjEsNyArNjAyMSw3IEBAIHJlYWRfY3V0dV9k aWVfZnJvbV9kd28gKGR3YXJmMl9jdSAqY3UsCiAgICAgICBnZGJfYXNzZXJ0IChkd29fdW5p dC0+c2VjdF9vZmYgPT0gY3UtPmhlYWRlci5zZWN0X29mZik7CiAgICAgICAvKiBGb3IgRFdP cyBjb21pbmcgZnJvbSBEV1AgZmlsZXMsIHdlIGRvbid0IGtub3cgdGhlIENVIGxlbmd0aAog CSB1bnRpbCBub3cuICAqLwotICAgICAgZHdvX3VuaXQtPmxlbmd0aCA9IGN1LT5oZWFkZXIu Z2V0X2xlbmd0aCAoKTsKKyAgICAgIGR3b191bml0LT5sZW5ndGggPSBjdS0+aGVhZGVyLmdl dF9sZW5ndGhfd2l0aF9pbml0aWFsICgpOwogICAgIH0KIAogICBkd29fYWJicmV2X3NlY3Rp b24tPnJlYWQgKG9iamZpbGUpOwpAQCAtNjI4OSw3ICs2Mjg5LDcgQEAgY3V0dV9yZWFkZXI6 OmN1dHVfcmVhZGVyIChkd2FyZjJfcGVyX2N1X2RhdGEgKnRoaXNfY3UsCiAKIAkgIC8qIExF TkdUSCBoYXMgbm90IGJlZW4gc2V0IHlldCBmb3IgdHlwZSB1bml0cyBpZiB3ZSdyZQogCSAg ICAgdXNpbmcgLmdkYl9pbmRleC4gICovCi0JICB0aGlzX2N1LT5zZXRfbGVuZ3RoIChjdS0+ aGVhZGVyLmdldF9sZW5ndGggKCkpOworCSAgdGhpc19jdS0+c2V0X2xlbmd0aCAoY3UtPmhl YWRlci5nZXRfbGVuZ3RoX3dpdGhfaW5pdGlhbCAoKSk7CiAKIAkgIC8qIEVzdGFibGlzaCB0 aGUgdHlwZSBvZmZzZXQgdGhhdCBjYW4gYmUgdXNlZCB0byBsb29rdXAgdGhlIHR5cGUuICAq LwogCSAgc2lnX3R5cGUtPnR5cGVfb2Zmc2V0X2luX3NlY3Rpb24gPQpAQCAtNjMwNSw3ICs2 MzA1LDcgQEAgY3V0dV9yZWFkZXI6OmN1dHVfcmVhZGVyIChkd2FyZjJfcGVyX2N1X2RhdGEg KnRoaXNfY3UsCiAJCQkJCQkgICAgcmN1aF9raW5kOjpDT01QSUxFKTsKIAogCSAgZ2RiX2Fz c2VydCAodGhpc19jdS0+c2VjdF9vZmYgPT0gY3UtPmhlYWRlci5zZWN0X29mZik7Ci0JICB0 aGlzX2N1LT5zZXRfbGVuZ3RoIChjdS0+aGVhZGVyLmdldF9sZW5ndGggKCkpOworCSAgdGhp c19jdS0+c2V0X2xlbmd0aCAoY3UtPmhlYWRlci5nZXRfbGVuZ3RoX3dpdGhfaW5pdGlhbCAo KSk7CiAJICB0aGlzX2N1LT5zZXRfdmVyc2lvbiAoY3UtPmhlYWRlci52ZXJzaW9uKTsKIAl9 CiAgICAgfQpAQCAtNjQ2NSw3ICs2NDY1LDcgQEAgY3V0dV9yZWFkZXI6OmN1dHVfcmVhZGVy IChkd2FyZjJfcGVyX2N1X2RhdGEgKnRoaXNfY3UsCiAgICAgICBtX25ld19jdS0+c3RyX29m ZnNldHNfYmFzZSA9IHBhcmVudF9jdS0+c3RyX29mZnNldHNfYmFzZTsKICAgICAgIG1fbmV3 X2N1LT5hZGRyX2Jhc2UgPSBwYXJlbnRfY3UtPmFkZHJfYmFzZTsKICAgICB9Ci0gIHRoaXNf Y3UtPnNldF9sZW5ndGggKG1fbmV3X2N1LT5oZWFkZXIuZ2V0X2xlbmd0aCAoKSk7CisgIHRo aXNfY3UtPnNldF9sZW5ndGggKG1fbmV3X2N1LT5oZWFkZXIuZ2V0X2xlbmd0aF93aXRoX2lu aXRpYWwgKCkpOwogCiAgIC8qIFNraXAgZHVtbXkgY29tcGlsYXRpb24gdW5pdHMuICAqLwog ICBpZiAoaW5mb19wdHIgPj0gYmVnaW5faW5mb19wdHIgKyB0aGlzX2N1LT5sZW5ndGggKCkK QEAgLTcyNDksNyArNzI0OSw3IEBAIHJlYWRfY29tcF91bml0c19mcm9tX3NlY3Rpb24gKGR3 YXJmMl9wZXJfb2JqZmlsZSAqcGVyX29iamZpbGUsCiAJICAqc2xvdCA9IHNpZ19wdHI7CiAJ fQogICAgICAgdGhpc19jdS0+c2VjdF9vZmYgPSBzZWN0X29mZjsKLSAgICAgIHRoaXNfY3Ut PnNldF9sZW5ndGggKGN1X2hlYWRlci5nZXRfbGVuZ3RoICgpKTsKKyAgICAgIHRoaXNfY3Ut PnNldF9sZW5ndGggKGN1X2hlYWRlci5nZXRfbGVuZ3RoX3dpdGhfaW5pdGlhbCAoKSk7CiAg ICAgICB0aGlzX2N1LT5pc19kd3ogPSBpc19kd3o7CiAgICAgICB0aGlzX2N1LT5zZWN0aW9u ID0gc2VjdGlvbjsKICAgICAgIC8qIEluaXQgdGhpcyBhc2FwLCB0byBhdm9pZCBhIGRhdGEg cmFjZSBpbiB0aGUgc2V0X3ZlcnNpb24gaW4KQEAgLTc3NDQsNyArNzc0NCw3IEBAIGxvYWRf ZnVsbF9jb21wX3VuaXQgKGR3YXJmMl9wZXJfY3VfZGF0YSAqdGhpc19jdSwKIAogICBnZGJf YXNzZXJ0IChjdS0+ZGllX2hhc2ggPT0gTlVMTCk7CiAgIGN1LT5kaWVfaGFzaCA9Ci0gICAg aHRhYl9jcmVhdGVfYWxsb2NfZXggKGN1LT5oZWFkZXIubGVuZ3RoIC8gMTIsCisgICAgaHRh Yl9jcmVhdGVfYWxsb2NfZXggKGN1LT5oZWFkZXIuZ2V0X2xlbmd0aF93aXRob3V0X2luaXRp YWwgKCkgLyAxMiwKIAkJCSAgZGllX2hhc2gsCiAJCQkgIGRpZV9lcSwKIAkJCSAgTlVMTCwK QEAgLTE4NDA5LDcgKzE4NDA5LDcgQEAgY29va2VkX2luZGV4ZXI6OmluZGV4X2RpZXMgKGN1 dHVfcmVhZGVyICpyZWFkZXIsCiB7CiAgIGNvbnN0IGdkYl9ieXRlICplbmRfcHRyID0gKHJl YWRlci0+YnVmZmVyCiAJCQkgICAgICsgdG9fdW5kZXJseWluZyAocmVhZGVyLT5jdS0+aGVh ZGVyLnNlY3Rfb2ZmKQotCQkJICAgICArIHJlYWRlci0+Y3UtPmhlYWRlci5nZXRfbGVuZ3Ro ICgpKTsKKwkJCSAgICAgKyByZWFkZXItPmN1LT5oZWFkZXIuZ2V0X2xlbmd0aF93aXRoX2lu aXRpYWwgKCkpOwogCiAgIHdoaWxlIChpbmZvX3B0ciA8IGVuZF9wdHIpCiAgICAgewpAQCAt MjMwMjYsNyArMjMwMjYsNyBAQCByZWFkX3NpZ25hdHVyZWRfdHlwZSAoc2lnbmF0dXJlZF90 eXBlICpzaWdfdHlwZSwKIAogICAgICAgZ2RiX2Fzc2VydCAoY3UtPmRpZV9oYXNoID09IE5V TEwpOwogICAgICAgY3UtPmRpZV9oYXNoID0KLQlodGFiX2NyZWF0ZV9hbGxvY19leCAoY3Ut PmhlYWRlci5sZW5ndGggLyAxMiwKKwlodGFiX2NyZWF0ZV9hbGxvY19leCAoY3UtPmhlYWRl ci5nZXRfbGVuZ3RoX3dpdGhvdXRfaW5pdGlhbCAoKSAvIDEyLAogCQkJICAgICAgZGllX2hh c2gsCiAJCQkgICAgICBkaWVfZXEsCiAJCQkgICAgICBOVUxMLAoKYmFzZS1jb21taXQ6IGE5 ODRmMTEyYjAxNWI3ZDMzYzNjOTEyMzBlYjRjMzU2OTU5MjY1MzkKLS0gCjIuMzUuMwoK --------------WoEZHjbty0eYgQvr5AKsYIpY--