From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 41790 invoked by alias); 27 Jul 2017 16:35:34 -0000 Mailing-List: contact elfutils-devel-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Post: List-Help: List-Subscribe: Sender: elfutils-devel-owner@sourceware.org Received: (qmail 41771 invoked by uid 89); 27 Jul 2017 16:35:34 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM,RP_MATCHES_RCVD,SPF_PASS autolearn=ham version=3.3.2 spammy=H*i:sk:1501171, H*f:sk:1501171 X-Spam-Status: No, score=-26.4 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM,RP_MATCHES_RCVD,SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: mail-ua0-f174.google.com Received: from mail-ua0-f174.google.com (HELO mail-ua0-f174.google.com) (209.85.217.174) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 27 Jul 2017 16:35:32 +0000 Received: by mail-ua0-f174.google.com with SMTP id k43so108299105uaf.3 for ; Thu, 27 Jul 2017 09:35:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=rDhDWMqEixo8Xr76sVNcByW/iTCNJ3EcMry19BQUB/U=; b=OLwE5xMMYYnSrroSTze4Ww6NE6pqhu8VX2gOGg+vgwhFIpCfoPaY8/URyGPQfsR+gr XNaJv1iCGZHNXNTz2i0BmyQNUMcZOgXvFbpO5S0PpqDTc35VdTmudObMWSTdQJAQ3k9K aej4EmYVomIHItOwj0cQPbSS08/tRRlT0VbXSVMiHOirtVun2BLsrOVT0sI1Yvqsb/M/ Ie3+Rs05tC3Ymm7DGAwV64j05PHHOhoKqJfsGh8URyMBu9q1FbmrS0n2c6aYXf65woQs uSG5M6+NKuPEDWZgbxbmvCwMkZy+2vYC3vNEj9qOXLZtoGJXicxlJdclOWC381TNJH9C uddA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=rDhDWMqEixo8Xr76sVNcByW/iTCNJ3EcMry19BQUB/U=; b=ttzPbOxz/iog9znWyqYUpJUaV+wzaAnjy7bYvKIDmxxN1fHfNCypn08tu+KmXSMd+1 Vi8Tyykh8Dh06D8lkWE3Apomhu9x+y+c6g8N8kHNDWpfoYYdr07z5LUe7rBcw6ts0LCD strCpgv47XerzCo9MuuTqkh6aVvZ23B7iyZdcGLweZu5ldA8yupmUcCJj2PUJgitel9V 7QZqBDIn0EjagOvgT5STCG3LnNx4wEjrtj23k6/zcT5lGS3s69H0ah4Qq2jQn0y/CYl/ TSw4Yh0w2Lag10PvjRqHnAwSJwxvrNDY8/mppX1PgUkmxpeagZ3tMOEPmuFmH8ftQuao 9RaQ== X-Gm-Message-State: AIVw113FxWCKew5j+kGphS4dGVXwUy/Ap9nDBIYqh1sgQiAVRFbCIjs8 +ZFOcMhYGsGBui0ZVsP8tssUocTQJdGnclcibA== X-Received: by 10.31.49.136 with SMTP id x130mr2966100vkx.210.1501173330314; Thu, 27 Jul 2017 09:35:30 -0700 (PDT) MIME-Version: 1.0 Received: by 10.176.24.144 with HTTP; Thu, 27 Jul 2017 09:35:29 -0700 (PDT) In-Reply-To: <1501171933.3741.14.camel@klomp.org> References: <1501171933.3741.14.camel@klomp.org> From: "Yunlian Jiang via elfutils-devel" Reply-To: Yunlian Jiang Date: Thu, 27 Jul 2017 16:35:00 -0000 Message-ID: Subject: Re: [PATCH] libdwfl: Move nested functions in parse_opt to file scope. To: Mark Wielaard Cc: elfutils-devel@sourceware.org Content-Type: multipart/mixed; boundary="001a114386ae1b47c505554f277d" X-SW-Source: 2017-q3/txt/msg00058.txt.bz2 --001a114386ae1b47c505554f277d Content-Type: text/plain; charset="UTF-8" Content-length: 511 I attach the output of git format-patch and this should work. On Thu, Jul 27, 2017 at 9:12 AM, Mark Wielaard wrote: > On Thu, 2017-07-27 at 08:42 -0700, Yunlian Jiang via elfutils-devel > wrote: >> * Move nested function 'failure' to file scope to compile with clang. >> * Move nested function 'fail' to file scope to compile with clang. > > The patch seems fine but doesn't apply because of whitespace issues > (looks like tab versus space issues?) Could you sent again. > > Thanks, > > Mark --001a114386ae1b47c505554f277d Content-Type: text/x-patch; charset="US-ASCII"; name="0001-libdwfl-Move-nested-functions-in-parse_opt-to-file-s.patch" Content-Disposition: attachment; filename="0001-libdwfl-Move-nested-functions-in-parse_opt-to-file-s.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_j5mnu77e0 Content-length: 7276 RnJvbSBiYzFkZjg2MjljOTg3ODU3ODk0NDRiNWVjODM2ZjNiYmM2MWJkZjdk IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBZdW5saWFuIEppYW5n IDx5dW5saWFuQGdvb2dsZS5jb20+CkRhdGU6IFdlZCwgMjYgSnVsIDIwMTcg MTY6MjU6NDMgLTA3MDAKU3ViamVjdDogW1BBVENIXSBsaWJkd2ZsOiBNb3Zl IG5lc3RlZCBmdW5jdGlvbnMgaW4gcGFyc2Vfb3B0IHRvIGZpbGUgc2NvcGUu CgoqIE1vdmUgbmVzdGVkIGZ1bmN0aW9uICdmYWlsdXJlJyB0byBmaWxlIHNj b3BlIHRvIGNvbXBpbGUgd2l0aCBjbGFuZy4KKiBNb3ZlIG5lc3RlZCBmdW5j dGlvbiAnZmFpbCcgdG8gZmlsZSBzY29wZSB0byBjb21waWxlIHdpdGggY2xh bmcuCgpTaWduZWQtb2ZmLWJ5OiBZdW5saWFuIEppYW5nIDx5dW5saWFuQGdv b2dsZS5jb20+Ci0tLQogbGliZHdmbC9hcmdwLXN0ZC5jIHwgNTUgKysrKysr KysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tCiAxIGZpbGUgY2hhbmdlZCwgMjkgaW5zZXJ0aW9ucygrKSwgMjYgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGliZHdmbC9hcmdwLXN0ZC5jIGIv bGliZHdmbC9hcmdwLXN0ZC5jCmluZGV4IDM0N2EwNWI0Li40OThhY2UyMSAx MDA2NDQKLS0tIGEvbGliZHdmbC9hcmdwLXN0ZC5jCisrKyBiL2xpYmR3Zmwv YXJncC1zdGQuYwpAQCAtMTA0LDI1ICsxMDQsMjggQEAgc3RydWN0IHBhcnNl X29wdAogICBjb25zdCBjaGFyICpjb3JlOwogfTsKIAorc3RhdGljIGlubGlu ZSB2b2lkCitmYWlsdXJlIChEd2ZsICpkd2ZsLCBpbnQgZXJybnVtLCBjb25z dCBjaGFyICptc2csIHN0cnVjdCBhcmdwX3N0YXRlICpzdGF0ZSkKK3sKKyAg aWYgKGR3ZmwgIT0gTlVMTCkKKyAgICBkd2ZsX2VuZCAoZHdmbCk7CisgIGlm IChlcnJudW0gPT0gLTEpCisgICAgYXJncF9mYWlsdXJlIChzdGF0ZSwgRVhJ VF9GQUlMVVJFLCAwLCAiJXM6ICVzIiwKKyAgICAgICAgICAgICAgICAgIG1z ZywgSU5UVVNFKGR3ZmxfZXJybXNnKSAoLTEpKTsKKyAgZWxzZQorICAgIGFy Z3BfZmFpbHVyZSAoc3RhdGUsIEVYSVRfRkFJTFVSRSwgZXJybnVtLCAiJXMi LCBtc2cpOworfQorCitzdGF0aWMgaW5saW5lIGVycm9yX3QKK2ZhaWwgKER3 ZmwgKmR3ZmwsIGludCBlcnJudW0sIGNvbnN0IGNoYXIgKm1zZywgc3RydWN0 IGFyZ3Bfc3RhdGUgKnN0YXRlKQoreworICBmYWlsdXJlIChkd2ZsLCBlcnJu dW0sIG1zZywgc3RhdGUpOworICByZXR1cm4gZXJybnVtID09IC0xID8gRUlP IDogZXJybnVtOworfQorCiBzdGF0aWMgZXJyb3JfdAogcGFyc2Vfb3B0IChp bnQga2V5LCBjaGFyICphcmcsIHN0cnVjdCBhcmdwX3N0YXRlICpzdGF0ZSkK IHsKLSAgaW5saW5lIHZvaWQgZmFpbHVyZSAoRHdmbCAqZHdmbCwgaW50IGVy cm51bSwgY29uc3QgY2hhciAqbXNnKQotICAgIHsKLSAgICAgIGlmIChkd2Zs ICE9IE5VTEwpCi0JZHdmbF9lbmQgKGR3ZmwpOwotICAgICAgaWYgKGVycm51 bSA9PSAtMSkKLQlhcmdwX2ZhaWx1cmUgKHN0YXRlLCBFWElUX0ZBSUxVUkUs IDAsICIlczogJXMiLAotCQkgICAgICBtc2csIElOVFVTRShkd2ZsX2Vycm1z ZykgKC0xKSk7Ci0gICAgICBlbHNlCi0JYXJncF9mYWlsdXJlIChzdGF0ZSwg RVhJVF9GQUlMVVJFLCBlcnJudW0sICIlcyIsIG1zZyk7Ci0gICAgfQotICBp bmxpbmUgZXJyb3JfdCBmYWlsIChEd2ZsICpkd2ZsLCBpbnQgZXJybnVtLCBj b25zdCBjaGFyICptc2cpCi0gICAgewotICAgICAgZmFpbHVyZSAoZHdmbCwg ZXJybnVtLCBtc2cpOwotICAgICAgcmV0dXJuIGVycm51bSA9PSAtMSA/IEVJ TyA6IGVycm51bTsKLSAgICB9Ci0KICAgc3dpdGNoIChrZXkpCiAgICAgewog ICAgIGNhc2UgQVJHUF9LRVlfSU5JVDoKQEAgLTEzMCw3ICsxMzMsNyBAQCBw YXJzZV9vcHQgKGludCBrZXksIGNoYXIgKmFyZywgc3RydWN0IGFyZ3Bfc3Rh dGUgKnN0YXRlKQogCWFzc2VydCAoc3RhdGUtPmhvb2sgPT0gTlVMTCk7CiAJ c3RydWN0IHBhcnNlX29wdCAqb3B0ID0gY2FsbG9jICgxLCBzaXplb2YgKCpv cHQpKTsKIAlpZiAob3B0ID09IE5VTEwpCi0JICBmYWlsdXJlIChOVUxMLCBE V0ZMX0VfRVJSTk8sICJjYWxsb2MiKTsKKwkgIGZhaWx1cmUgKE5VTEwsIERX RkxfRV9FUlJOTywgImNhbGxvYyIsIHN0YXRlKTsKIAlzdGF0ZS0+aG9vayA9 IG9wdDsKICAgICAgIH0KICAgICAgIGJyZWFrOwpAQCAtMTQ3LDcgKzE1MCw3 IEBAIHBhcnNlX29wdCAoaW50IGtleSwgY2hhciAqYXJnLCBzdHJ1Y3QgYXJn cF9zdGF0ZSAqc3RhdGUpCiAJICB7CiAJICAgIGR3ZmwgPSBJTlRVU0UoZHdm bF9iZWdpbikgKCZvZmZsaW5lX2NhbGxiYWNrcyk7CiAJICAgIGlmIChkd2Zs ID09IE5VTEwpCi0JICAgICAgcmV0dXJuIGZhaWwgKGR3ZmwsIC0xLCBhcmcp OworCSAgICAgIHJldHVybiBmYWlsIChkd2ZsLCAtMSwgYXJnLCBzdGF0ZSk7 CiAJICAgIG9wdC0+ZHdmbCA9IGR3Zmw7CiAKIAkgICAgLyogU3RhcnQgYXQg emVybyBzbyBpZiB0aGVyZSBpcyBqdXN0IG9uZSAtZSBmb28uc28sCkBAIC0x NzMsNyArMTc2LDcgQEAgcGFyc2Vfb3B0IChpbnQga2V5LCBjaGFyICphcmcs IHN0cnVjdCBhcmdwX3N0YXRlICpzdGF0ZSkKIAkgICAgRHdmbCAqZHdmbCA9 IElOVFVTRShkd2ZsX2JlZ2luKSAoJnByb2NfY2FsbGJhY2tzKTsKIAkgICAg aW50IHJlc3VsdCA9IElOVFVTRShkd2ZsX2xpbnV4X3Byb2NfcmVwb3J0KSAo ZHdmbCwgYXRvaSAoYXJnKSk7CiAJICAgIGlmIChyZXN1bHQgIT0gMCkKLQkg ICAgICByZXR1cm4gZmFpbCAoZHdmbCwgcmVzdWx0LCBhcmcpOworCSAgICAg IHJldHVybiBmYWlsIChkd2ZsLCByZXN1bHQsIGFyZywgc3RhdGUpOwogCiAJ ICAgIC8qIE5vbi1mYXRhbCB0byBub3QgYmUgYWJsZSB0byBhdHRhY2ggdG8g cHJvY2VzcywgaWdub3JlIGVycm9yLiAgKi8KIAkgICAgSU5UVVNFKGR3Zmxf bGludXhfcHJvY19hdHRhY2gpIChkd2ZsLCBhdG9pIChhcmcpLCBmYWxzZSk7 CkBAIC0yMDIsNyArMjA1LDcgQEAgcGFyc2Vfb3B0IChpbnQga2V5LCBjaGFy ICphcmcsIHN0cnVjdCBhcmdwX3N0YXRlICpzdGF0ZSkKIAkgICAgaW50IHJl c3VsdCA9IElOVFVTRShkd2ZsX2xpbnV4X3Byb2NfbWFwc19yZXBvcnQpIChk d2ZsLCBmKTsKIAkgICAgZmNsb3NlIChmKTsKIAkgICAgaWYgKHJlc3VsdCAh PSAwKQotCSAgICAgIHJldHVybiBmYWlsIChkd2ZsLCByZXN1bHQsIGFyZyk7 CisJICAgICAgcmV0dXJuIGZhaWwgKGR3ZmwsIHJlc3VsdCwgYXJnLCBzdGF0 ZSk7CiAJICAgIG9wdC0+ZHdmbCA9IGR3Zmw7CiAJICB9CiAJZWxzZQpAQCAt MjMxLDExICsyMzQsMTEgQEAgcGFyc2Vfb3B0IChpbnQga2V5LCBjaGFyICph cmcsIHN0cnVjdCBhcmdwX3N0YXRlICpzdGF0ZSkKIAkgICAgRHdmbCAqZHdm bCA9IElOVFVTRShkd2ZsX2JlZ2luKSAoJmtlcm5lbF9jYWxsYmFja3MpOwog CSAgICBpbnQgcmVzdWx0ID0gSU5UVVNFKGR3ZmxfbGludXhfa2VybmVsX3Jl cG9ydF9rZXJuZWwpIChkd2ZsKTsKIAkgICAgaWYgKHJlc3VsdCAhPSAwKQot CSAgICAgIHJldHVybiBmYWlsIChkd2ZsLCByZXN1bHQsIF8oImNhbm5vdCBs b2FkIGtlcm5lbCBzeW1ib2xzIikpOworCSAgICAgIHJldHVybiBmYWlsIChk d2ZsLCByZXN1bHQsIF8oImNhbm5vdCBsb2FkIGtlcm5lbCBzeW1ib2xzIiks IHN0YXRlKTsKIAkgICAgcmVzdWx0ID0gSU5UVVNFKGR3ZmxfbGludXhfa2Vy bmVsX3JlcG9ydF9tb2R1bGVzKSAoZHdmbCk7CiAJICAgIGlmIChyZXN1bHQg IT0gMCkKIAkgICAgICAvKiBOb24tZmF0YWwgdG8gaGF2ZSBubyBtb2R1bGVz IHNpbmNlIHdlIGRvIGhhdmUgdGhlIGtlcm5lbC4gICovCi0JICAgICAgZmFp bHVyZSAoZHdmbCwgcmVzdWx0LCBfKCJjYW5ub3QgZmluZCBrZXJuZWwgbW9k dWxlcyIpKTsKKwkgICAgICBmYWlsdXJlIChkd2ZsLCByZXN1bHQsIF8oImNh bm5vdCBmaW5kIGtlcm5lbCBtb2R1bGVzIiksIHN0YXRlKTsKIAkgICAgb3B0 LT5kd2ZsID0gZHdmbDsKIAkgIH0KIAllbHNlCkBAIC0yNTIsNyArMjU1LDcg QEAgcGFyc2Vfb3B0IChpbnQga2V5LCBjaGFyICphcmcsIHN0cnVjdCBhcmdw X3N0YXRlICpzdGF0ZSkKIAkgICAgaW50IHJlc3VsdCA9IElOVFVTRShkd2Zs X2xpbnV4X2tlcm5lbF9yZXBvcnRfb2ZmbGluZSkgKGR3ZmwsIGFyZywKIAkJ CQkJCQkJICAgTlVMTCk7CiAJICAgIGlmIChyZXN1bHQgIT0gMCkKLQkgICAg ICByZXR1cm4gZmFpbCAoZHdmbCwgcmVzdWx0LCBfKCJjYW5ub3QgZmluZCBr ZXJuZWwgb3IgbW9kdWxlcyIpKTsKKwkgICAgICByZXR1cm4gZmFpbCAoZHdm bCwgcmVzdWx0LCBfKCJjYW5ub3QgZmluZCBrZXJuZWwgb3IgbW9kdWxlcyIp LCBzdGF0ZSk7CiAJICAgIG9wdC0+ZHdmbCA9IGR3Zmw7CiAJICB9CiAJZWxz ZQpAQCAtMjcxLDcgKzI3NCw3IEBAIHBhcnNlX29wdCAoaW50IGtleSwgY2hh ciAqYXJnLCBzdHJ1Y3QgYXJncF9zdGF0ZSAqc3RhdGUpCiAJICAgIGFyZyA9 ICJhLm91dCI7CiAJICAgIGR3ZmwgPSBJTlRVU0UoZHdmbF9iZWdpbikgKCZv ZmZsaW5lX2NhbGxiYWNrcyk7CiAJICAgIGlmIChJTlRVU0UoZHdmbF9yZXBv cnRfb2ZmbGluZSkgKGR3ZmwsICIiLCBhcmcsIC0xKSA9PSBOVUxMKQotCSAg ICAgIHJldHVybiBmYWlsIChkd2ZsLCAtMSwgYXJnKTsKKwkgICAgICByZXR1 cm4gZmFpbCAoZHdmbCwgLTEsIGFyZywgc3RhdGUpOwogCSAgICBvcHQtPmR3 ZmwgPSBkd2ZsOwogCSAgfQogCkBAIC0zMDEsNyArMzA0LDcgQEAgcGFyc2Vf b3B0IChpbnQga2V5LCBjaGFyICphcmcsIHN0cnVjdCBhcmdwX3N0YXRlICpz dGF0ZSkKIAkgICAgICB7CiAJCWVsZl9lbmQgKGNvcmUpOwogCQljbG9zZSAo ZmQpOwotCQlyZXR1cm4gZmFpbCAoZHdmbCwgcmVzdWx0LCBvcHQtPmNvcmUp OworCQlyZXR1cm4gZmFpbCAoZHdmbCwgcmVzdWx0LCBvcHQtPmNvcmUsIHN0 YXRlKTsKIAkgICAgICB9CiAKIAkgICAgLyogTm9uLWZhdGFsIHRvIG5vdCBi ZSBhYmxlIHRvIGF0dGFjaCB0byBjb3JlLCBpZ25vcmUgZXJyb3IuICAqLwpA QCAtMzMxLDcgKzMzNCw3IEBAIHBhcnNlX29wdCAoaW50IGtleSwgY2hhciAq YXJnLCBzdHJ1Y3QgYXJncF9zdGF0ZSAqc3RhdGUpCiAJZWxzZSBpZiAob3B0 LT5lKQogCSAgewogCSAgICBpZiAoSU5UVVNFKGR3ZmxfcmVwb3J0X29mZmxp bmUpIChkd2ZsLCAiIiwgb3B0LT5lLCAtMSkgPT0gTlVMTCkKLQkgICAgICBy ZXR1cm4gZmFpbCAoZHdmbCwgLTEsIG9wdC0+ZSk7CisJICAgICAgcmV0dXJu IGZhaWwgKGR3ZmwsIC0xLCBvcHQtPmUsIHN0YXRlKTsKIAkgIH0KIAogCS8q IE9uZSBvZiB0aGUgdGhyZWUgZmxhdm9ycyBoYXMgZG9uZSBkd2ZsX2JlZ2lu IGFuZCBzb21lIHJlcG9ydGluZwotLSAKMi4xNC4wLnJjMC40MDAuZzFjMzY0 MzJkZmYtZ29vZwoK --001a114386ae1b47c505554f277d--