From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by sourceware.org (Postfix) with ESMTP id C74D13858D35 for ; Fri, 31 Jul 2020 22:45:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org C74D13858D35 Received: from mail-ua1-f72.google.com (mail-ua1-f72.google.com [209.85.222.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-419-QA9gMxxvPBGBLuMaSVGHXQ-1; Fri, 31 Jul 2020 18:44:58 -0400 X-MC-Unique: QA9gMxxvPBGBLuMaSVGHXQ-1 Received: by mail-ua1-f72.google.com with SMTP id h22so105013uao.12 for ; Fri, 31 Jul 2020 15:44:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=id2Qu83rRoxZAnj35jJutjubap4HbqPgA9D26izUKzQ=; b=YSbNR4ZXzbgvUWEPS9JKjiOc2WssG3rrURIgaYiE7/ZdLoJlCp6ntyl75v7WgMOXdN xZhCr7BkD7k726TQMV8jtKGHeVV9ZKNZArQujC8vVT+SYZaCPqPAnlVagBMV5S9pmDz7 pdGVXO0XSJsdriif8arWUvhJK+wPVn1/49aOjeB4UhUCA/cpMZFfGpjPr7FJn/mUQGZo rTL4Z5nkSiXNYVp0bpqPBkOFo5apO4N6lTdcR0x7dWKPbv81UY1Wf4HkIztpMTnlAduI vMRwSrCMLl4me0VkpvPsJvDZGtkW05L8mK8mbZ85wxZkdojq2z79TXIXaqykxSMJIfye 2GOg== X-Gm-Message-State: AOAM531O30sSKh5BC9NpE/ayjNqYWa2BAn8+ACuL8eyya9q6Gvy+W1Ce mzzSnpn1YCxgI6vzCubqeZnoVEJzvj0MAmID3qtdeEbVd0fPK2xXD9Nsx7E1JiuPjvf5omXAN6i Uqxrv45w5QFFavE8xL4qT2aHUUI0qjFCuD9Xc X-Received: by 2002:a67:442:: with SMTP id 63mr4548998vse.19.1596235498291; Fri, 31 Jul 2020 15:44:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw65TJL6/B3yrTJoRNYS7hw7wm3aknRTtIkl9e8d/FQHBIb0nzQDsgjOJjTIvMhvz5UhAM58M6hpA1gnvIfcjw= X-Received: by 2002:a67:442:: with SMTP id 63mr4548994vse.19.1596235498036; Fri, 31 Jul 2020 15:44:58 -0700 (PDT) MIME-Version: 1.0 From: Aaron Merey Date: Fri, 31 Jul 2020 18:44:47 -0400 Message-ID: Subject: [PATCH] debuginfod-support.c: Replace globals with user_data To: gdb-patches@sourceware.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="000000000000d6e59505abc489a3" X-Spam-Status: No, score=-10.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Jul 2020 22:45:02 -0000 --000000000000d6e59505abc489a3 Content-Type: text/plain; charset="UTF-8" --000000000000d6e59505abc489a3 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-debuginfod-support.c-Replace-globals-with-user_data.patch" Content-Disposition: attachment; filename="0001-debuginfod-support.c-Replace-globals-with-user_data.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kdatcxg60 RnJvbSAxOTEzMzE3Y2I5NWQwMmMzMjQ0ZTVkOTFiN2I1OWUzM2NmZTk5MWM1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBYXJvbiBNZXJleSA8YW1lcmV5QHJlZGhhdC5jb20+CkRhdGU6 IEZyaSwgMzEgSnVsIDIwMjAgMTg6MjU6NDggLTA0MDAKU3ViamVjdDogW1BBVENIXSBkZWJ1Z2lu Zm9kLXN1cHBvcnQuYzogUmVwbGFjZSBnbG9iYWxzIHdpdGggdXNlcl9kYXRhCgpTdG9yZSBxdWVy eSBpbmZvcm1hdGlvbiBpbiB1c2VyX2RhdGEgc3RydWN0IGluc3RlYWQgb2YgZ2xvYmFsCnZhcmlh Ymxlcy4gQWxzbyBpbmNsdWRlIERFQlVHSU5GT0RfQ0ZMQUdTIGluIElOVEVSTkFMX0NGTEFHX0JB U0UuCgpnZGIvQ2hhbmdlTG9nOgoKCSogTWFrZWZpbGUuaW46IEFkZCBERUJVR0lORk9EX0NGTEFH UyB0byBJTlRFUk5BTF9DRkxBR1NfQkFTRS4KCSogZGVidWdpbmZvZC1zdXBwb3J0LmM6IFJlcGxh Y2UgZ2xvYmFsIHZhcnMgd2l0aCBzdHJ1Y3QgdXNlcl9kYXRhLgotLS0KIGdkYi9DaGFuZ2VMb2cg ICAgICAgICAgICB8ICA1ICsrKysrCiBnZGIvTWFrZWZpbGUuaW4gICAgICAgICAgfCAgOCArKysr KystLQogZ2RiL2RlYnVnaW5mb2Qtc3VwcG9ydC5jIHwgNDAgKysrKysrKysrKysrKysrKysrKysr KysrLS0tLS0tLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAzNSBpbnNlcnRpb25zKCspLCAx OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9nZGIvQ2hhbmdlTG9nIGIvZ2RiL0NoYW5nZUxv ZwppbmRleCA5ZTcxODM2MWE2Li42ZTQ0ZTc0ZjQwIDEwMDY0NAotLS0gYS9nZGIvQ2hhbmdlTG9n CisrKyBiL2dkYi9DaGFuZ2VMb2cKQEAgLTEsMyArMSw4IEBACisyMDIwLTA3LTMxICBBYXJvbiBN ZXJleSAgPGFtZXJleUByZWRoYXQuY29tPgorCisJKiBNYWtlZmlsZS5pbjogQWRkIERFQlVHSU5G T0RfQ0ZMQUdTIHRvIElOVEVSTkFMX0NGTEFHU19CQVNFLgorCSogZGVidWdpbmZvZC1zdXBwb3J0 LmM6IFJlcGxhY2UgZ2xvYmFsIHZhcnMgd2l0aCBzdHJ1Y3QgdXNlcl9kYXRhLgorCiAyMDIwLTA3 LTMwICBTaW1vbiBNYXJjaGkgIDxzaW1vbi5tYXJjaGlAcG9seW10bC5jYT4KIAogCVBSIGFkYS8y NjMxOApkaWZmIC0tZ2l0IGEvZ2RiL01ha2VmaWxlLmluIGIvZ2RiL01ha2VmaWxlLmluCmluZGV4 IDBkNmQ4MTM3YjUuLjc4Mzk0OWQwNTQgMTAwNjQ0Ci0tLSBhL2dkYi9NYWtlZmlsZS5pbgorKysg Yi9nZGIvTWFrZWZpbGUuaW4KQEAgLTIxNCw2ICsyMTQsOSBAQCBHREJfV0VSUk9SX0NGTEFHUyA9 ICQoV0VSUk9SX0NGTEFHUykKIFBUSFJFQURfQ0ZMQUdTID0gQFBUSFJFQURfQ0ZMQUdTQAogUFRI UkVBRF9MSUJTID0gQFBUSFJFQURfTElCU0AKIAorREVCVUdJTkZPRF9DRkxBR1MgPSBAREVCVUdJ TkZPRF9DRkxBR1NACitERUJVR0lORk9EX0xJQlMgPSBAREVCVUdJTkZPRF9MSUJTQAorCiBSRFlO QU1JQyA9IEBSRFlOQU1JQ0AKIAogIyBXaGVyZSBpcyB0aGUgSU5UTCBsaWJyYXJ5PyAgVHlwaWNh bGx5IGluIC4uL2ludGwuCkBAIC01OTgsNyArNjAxLDggQEAgSU5URVJOQUxfQ0ZMQUdTX0JBU0Ug PSBcCiAJJChHREJfQ0ZMQUdTKSAkKE9QQ09ERVNfQ0ZMQUdTKSAkKFJFQURMSU5FX0NGTEFHUykg JChaTElCSU5DKSBcCiAJJChCRkRfQ0ZMQUdTKSAkKElOQ0xVREVfQ0ZMQUdTKSAkKExJQkRFQ05V TUJFUl9DRkxBR1MpIFwKIAkkKElOVExfQ0ZMQUdTKSAkKElOQ0dOVSkgJChJTkNTVVBQT1JUKSAk KEVOQUJMRV9DRkxBR1MpIFwKLQkkKElOVEVSTkFMX0NQUEZMQUdTKSAkKFNSQ0hJR0hfQ0ZMQUdT KSAkKFRPUF9DRkxBR1MpICQoUFRIUkVBRF9DRkxBR1MpCisJJChJTlRFUk5BTF9DUFBGTEFHUykg JChTUkNISUdIX0NGTEFHUykgJChUT1BfQ0ZMQUdTKSAkKFBUSFJFQURfQ0ZMQUdTKSBcCisJJChE RUJVR0lORk9EX0NGTEFHUykKIElOVEVSTkFMX1dBUk5fQ0ZMQUdTID0gJChJTlRFUk5BTF9DRkxB R1NfQkFTRSkgJChHREJfV0FSTl9DRkxBR1MpCiBJTlRFUk5BTF9DRkxBR1MgPSAkKElOVEVSTkFM X1dBUk5fQ0ZMQUdTKSAkKEdEQl9XRVJST1JfQ0ZMQUdTKQogCkBAIC02MjQsNyArNjI4LDcgQEAg Q0xJQlMgPSAkKFNJTSkgJChSRUFETElORSkgJChPUENPREVTKSAkKExJQkNURikgJChCRkQpICQo WkxJQikgXAogCSQoTElCRVhQQVQpICQoTElCTFpNQSkgJChMSUJCQUJFTFRSQUNFKSAkKExJQklQ VCkgXAogCSQoV0lOMzJMSUJTKSAkKExJQkdOVSkgJChMSUJJQ09OVikgXAogCSQoTElCTVBGUikg JChTUkNISUdIX0xJQlMpICQoTElCWFhIQVNIKSAkKFBUSFJFQURfTElCUykgXAotCUBERUJVR0lO Rk9EX0xJQlNACisJJChERUJVR0lORk9EX0xJQlMpCiBDREVQUyA9ICQoTkFUX0NERVBTKSAkKFNJ TSkgJChCRkQpICQoUkVBRExJTkVfREVQUykgJChDVEZfREVQUykgXAogCSQoT1BDT0RFUykgJChJ TlRMX0RFUFMpICQoTElCSUJFUlRZKSAkKENPTkZJR19ERVBTKSAkKExJQkdOVSkgXAogCSQoTElC U1VQUE9SVCkKZGlmZiAtLWdpdCBhL2dkYi9kZWJ1Z2luZm9kLXN1cHBvcnQuYyBiL2dkYi9kZWJ1 Z2luZm9kLXN1cHBvcnQuYwppbmRleCBmNGEyMjdiMDQwLi45MzI1YmY4NjUxIDEwMDY0NAotLS0g YS9nZGIvZGVidWdpbmZvZC1zdXBwb3J0LmMKKysrIGIvZ2RiL2RlYnVnaW5mb2Qtc3VwcG9ydC5j CkBAIC00MywyOSArNDMsMzkgQEAgZGVidWdpbmZvZF9kZWJ1Z2luZm9fcXVlcnkgKGNvbnN0IHVu c2lnbmVkIGNoYXIgKmJ1aWxkX2lkLAogI2Vsc2UKICNpbmNsdWRlIDxlbGZ1dGlscy9kZWJ1Z2lu Zm9kLmg+CiAKLS8qIFRPRE86IFVzZSBkZWJ1Z2luZm9kIEFQSSBleHRlbnNpb25zIGluc3RlYWQg b2YgdGhlc2UgZ2xvYmFscy4gICovCi1zdGF0aWMgc3RkOjpzdHJpbmcgZGVzYzsKLXN0YXRpYyBz dGQ6OnN0cmluZyBmbmFtZTsKLXN0YXRpYyBib29sIGhhc19wcmludGVkOworc3RydWN0IHVzZXJf ZGF0YQoreworICBzdGQ6OnN0cmluZyBkZXNjOworICBzdGQ6OnN0cmluZyBmbmFtZTsKKyAgYm9v bCBoYXNfcHJpbnRlZDsKKworICB1c2VyX2RhdGEgKHN0ZDo6c3RyaW5nIGRlc2MsIHN0ZDo6c3Ry aW5nIGZuYW1lLCBib29sIGhhc19wcmludGVkKQorICAgIDogZGVzYyAoZGVzYyksIGZuYW1lIChm bmFtZSksIGhhc19wcmludGVkIChoYXNfcHJpbnRlZCkKKyAgeyB9Cit9OwogCiBzdGF0aWMgaW50 CiBwcm9ncmVzc2ZuIChkZWJ1Z2luZm9kX2NsaWVudCAqYywgbG9uZyBjdXIsIGxvbmcgdG90YWwp CiB7CisgIHN0cnVjdCB1c2VyX2RhdGEgKmRhdGEgPSBzdGF0aWNfY2FzdDx1c2VyX2RhdGEqPiAo ZGVidWdpbmZvZF9nZXRfdXNlcl9kYXRhIChjKSk7CisKICAgaWYgKGNoZWNrX3F1aXRfZmxhZyAo KSkKICAgICB7CiAgICAgICBwcmludGZfZmlsdGVyZWQgKCJDYW5jZWxsaW5nIGRvd25sb2FkIG9m ICVzICVwcy4uLlxuIiwKLQkJICAgICAgIGRlc2MuY19zdHIgKCksCi0JCSAgICAgICBzdHlsZWRf c3RyaW5nIChmaWxlX25hbWVfc3R5bGUuc3R5bGUgKCksIGZuYW1lLmNfc3RyICgpKSk7CisJCSAg ICAgICBkYXRhLT5kZXNjLmNfc3RyICgpLAorCQkgICAgICAgc3R5bGVkX3N0cmluZyAoZmlsZV9u YW1lX3N0eWxlLnN0eWxlICgpLAorCQkJCSAgICAgIGRhdGEtPmZuYW1lLmNfc3RyICgpKSk7CiAg ICAgICByZXR1cm4gMTsKICAgICB9CiAKLSAgaWYgKCFoYXNfcHJpbnRlZCAmJiB0b3RhbCAhPSAw KQorICBpZiAoISBkYXRhLT5oYXNfcHJpbnRlZCAmJiB0b3RhbCAhPSAwKQogICAgIHsKICAgICAg IC8qIFByaW50IHRoaXMgbWVzc2FnZSBvbmx5IG9uY2UuICAqLwotICAgICAgaGFzX3ByaW50ZWQg PSB0cnVlOworICAgICAgZGF0YS0+aGFzX3ByaW50ZWQgPSB0cnVlOwogICAgICAgcHJpbnRmX2Zp bHRlcmVkICgiRG93bmxvYWRpbmcgJXMgJXBzLi4uXG4iLAotCQkgICAgICAgZGVzYy5jX3N0ciAo KSwKLQkJICAgICAgIHN0eWxlZF9zdHJpbmcgKGZpbGVfbmFtZV9zdHlsZS5zdHlsZSAoKSwgZm5h bWUuY19zdHIgKCkpKTsKKwkJICAgICAgIGRhdGEtPmRlc2MuY19zdHIgKCksCisJCSAgICAgICBz dHlsZWRfc3RyaW5nIChmaWxlX25hbWVfc3R5bGUuc3R5bGUgKCksCisJCQkJICAgICAgZGF0YS0+ Zm5hbWUuY19zdHIgKCkpKTsKICAgICB9CiAKICAgcmV0dXJuIDA7CkBAIC05OCwxMCArMTA4LDkg QEAgZGVidWdpbmZvZF9zb3VyY2VfcXVlcnkgKGNvbnN0IHVuc2lnbmVkIGNoYXIgKmJ1aWxkX2lk LAogICBpZiAoYyA9PSBudWxscHRyKQogICAgIHJldHVybiBzY29wZWRfZmQgKC1FTk9NRU0pOwog Ci0gIGRlc2MgPSBzdGQ6OnN0cmluZyAoInNvdXJjZSBmaWxlIik7Ci0gIGZuYW1lID0gc3RkOjpz dHJpbmcgKHNyY3BhdGgpOwotICBoYXNfcHJpbnRlZCA9IGZhbHNlOworICBzdHJ1Y3QgdXNlcl9k YXRhIGRhdGEgKCJzb3VyY2UgZmlsZSIsIHNyY3BhdGgsIGZhbHNlKTsKIAorICBkZWJ1Z2luZm9k X3NldF91c2VyX2RhdGEgKGMsICZkYXRhKTsKICAgc2NvcGVkX2ZkIGZkIChkZWJ1Z2luZm9kX2Zp bmRfc291cmNlIChjLAogCQkJCQlidWlsZF9pZCwKIAkJCQkJYnVpbGRfaWRfbGVuLApAQCAtMTM2 LDExICsxNDUsMTAgQEAgZGVidWdpbmZvZF9kZWJ1Z2luZm9fcXVlcnkgKGNvbnN0IHVuc2lnbmVk IGNoYXIgKmJ1aWxkX2lkLAogICBpZiAoYyA9PSBudWxscHRyKQogICAgIHJldHVybiBzY29wZWRf ZmQgKC1FTk9NRU0pOwogCi0gIGRlc2MgPSBzdGQ6OnN0cmluZyAoInNlcGFyYXRlIGRlYnVnIGlu Zm8gZm9yIik7Ci0gIGZuYW1lID0gc3RkOjpzdHJpbmcgKGZpbGVuYW1lKTsKLSAgaGFzX3ByaW50 ZWQgPSBmYWxzZTsKICAgY2hhciAqZG5hbWUgPSBudWxscHRyOworICBzdHJ1Y3QgdXNlcl9kYXRh IGRhdGEgKCJzZXBhcmF0ZSBkZWJ1ZyBpbmZvIGZvciIsIGZpbGVuYW1lLCBmYWxzZSk7CiAKKyAg ZGVidWdpbmZvZF9zZXRfdXNlcl9kYXRhIChjLCAmZGF0YSk7CiAgIHNjb3BlZF9mZCBmZCAoZGVi dWdpbmZvZF9maW5kX2RlYnVnaW5mbyAoYywgYnVpbGRfaWQsIGJ1aWxkX2lkX2xlbiwgJmRuYW1l KSk7CiAKICAgaWYgKGZkLmdldCAoKSA8IDAgJiYgZmQuZ2V0ICgpICE9IC1FTk9FTlQpCi0tIAoy LjI1LjQKCg== --000000000000d6e59505abc489a3--