From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roger Pau Monne Subject: [PATCH v3 for-4.7 12/16] libxl: add explicit casts from yajl_gen_status to yajl_status Date: Wed, 27 Apr 2016 13:11:50 +0200 Message-ID: <1461755514-23754-13-git-send-email-roger.pau@citrix.com> References: <1461755514-23754-1-git-send-email-roger.pau@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1avNOM-0003QA-LY for xen-devel@lists.xenproject.org; Wed, 27 Apr 2016 11:12:26 +0000 In-Reply-To: <1461755514-23754-1-git-send-email-roger.pau@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Wei Liu , Ian Jackson , Roger Pau Monne List-Id: xen-devel@lists.xenproject.org T3IgZWxzZSBjbGFuZyBjb21wbGFpbnMgd2l0aDoKCmltcGxpY2l0IGNvbnZlcnNpb24gZnJvbSBl bnVtZXJhdGlvbiB0eXBlICd5YWpsX2dlbl9zdGF0dXMnIHRvIGRpZmZlcmVudAplbnVtZXJhdGlv biB0eXBlICd5YWpsX3N0YXR1cycgWy1XZXJyb3IsLVdlbnVtLWNvbnZlcnNpb25dCgpTaWduZWQt b2ZmLWJ5OiBSb2dlciBQYXUgTW9ubsOpIDxyb2dlci5wYXVAY2l0cml4LmNvbT4KQWNrZWQtYnk6 IFdlaSBMaXUgPHdlaS5saXUyQGNpdHJpeC5jb20+Ci0tLQpDYzogSWFuIEphY2tzb24gPGlhbi5q YWNrc29uQGV1LmNpdHJpeC5jb20+CkNjOiBXZWkgTGl1IDx3ZWkubGl1MkBjaXRyaXguY29tPgot LS0KIHRvb2xzL2xpYnhsL2xpYnhsX2pzb24uYyB8IDI5ICsrKysrKysrKysrKysrKysrKy0tLS0t LS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTggaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGwvbGlieGxfanNvbi5jIGIvdG9vbHMvbGlieGwvbGli eGxfanNvbi5jCmluZGV4IDNiNjk1ZGQuLjZiYjA2OTUgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhs L2xpYnhsX2pzb24uYworKysgYi90b29scy9saWJ4bC9saWJ4bF9qc29uLmMKQEAgLTYxNyw0MiAr NjE3LDQ4IEBAIHlhamxfc3RhdHVzIGxpYnhsX19qc29uX29iamVjdF90b195YWpsX2dlbihsaWJ4 bF9fZ2MgKmdjLAogICAgIGludCBpZHggPSAwOwogICAgIHlhamxfc3RhdHVzIHJjOwogCisjZGVm aW5lIENPTlZFUlRfWUFKTF9HRU5fVE9fU1RBVFVTKGdlbikgXAorICAgICgoZ2VuKSA9PSB5YWps X2dlbl9zdGF0dXNfb2sgPyB5YWpsX3N0YXR1c19vayA6IHlhamxfc3RhdHVzX2Vycm9yKTsKKwog ICAgIHN3aXRjaCAob2JqLT50eXBlKSB7CiAgICAgY2FzZSBKU09OX05VTEw6Ci0gICAgICAgIHJl dHVybiB5YWpsX2dlbl9udWxsKGhhbmQpOworICAgICAgICByZXR1cm4gQ09OVkVSVF9ZQUpMX0dF Tl9UT19TVEFUVVMoeWFqbF9nZW5fbnVsbChoYW5kKSk7CiAgICAgY2FzZSBKU09OX0JPT0w6Ci0g ICAgICAgIHJldHVybiB5YWpsX2dlbl9ib29sKGhhbmQsIG9iai0+dS5iKTsKKyAgICAgICAgcmV0 dXJuIENPTlZFUlRfWUFKTF9HRU5fVE9fU1RBVFVTKHlhamxfZ2VuX2Jvb2woaGFuZCwgb2JqLT51 LmIpKTsKICAgICBjYXNlIEpTT05fSU5URUdFUjoKLSAgICAgICAgcmV0dXJuIHlhamxfZ2VuX2lu dGVnZXIoaGFuZCwgb2JqLT51LmkpOworICAgICAgICByZXR1cm4gQ09OVkVSVF9ZQUpMX0dFTl9U T19TVEFUVVMoeWFqbF9nZW5faW50ZWdlcihoYW5kLCBvYmotPnUuaSkpOwogICAgIGNhc2UgSlNP Tl9ET1VCTEU6Ci0gICAgICAgIHJldHVybiB5YWpsX2dlbl9kb3VibGUoaGFuZCwgb2JqLT51LmQp OworICAgICAgICByZXR1cm4gQ09OVkVSVF9ZQUpMX0dFTl9UT19TVEFUVVMoeWFqbF9nZW5fZG91 YmxlKGhhbmQsIG9iai0+dS5kKSk7CiAgICAgY2FzZSBKU09OX05VTUJFUjoKLSAgICAgICAgcmV0 dXJuIHlhamxfZ2VuX251bWJlcihoYW5kLCBvYmotPnUuc3RyaW5nLCBzdHJsZW4ob2JqLT51LnN0 cmluZykpOworICAgICAgICByZXR1cm4gQ09OVkVSVF9ZQUpMX0dFTl9UT19TVEFUVVMoCisgICAg ICAgICAgICAgICAgICB5YWpsX2dlbl9udW1iZXIoaGFuZCwgb2JqLT51LnN0cmluZywgc3RybGVu KG9iai0+dS5zdHJpbmcpKSk7CiAgICAgY2FzZSBKU09OX1NUUklORzoKLSAgICAgICAgcmV0dXJu IGxpYnhsX195YWpsX2dlbl9hc2NpaXooaGFuZCwgb2JqLT51LnN0cmluZyk7CisgICAgICAgIHJl dHVybiBDT05WRVJUX1lBSkxfR0VOX1RPX1NUQVRVUygKKyAgICAgICAgICAgICAgICAgICAgICAg IGxpYnhsX195YWpsX2dlbl9hc2NpaXooaGFuZCwgb2JqLT51LnN0cmluZykpOwogICAgIGNhc2Ug SlNPTl9NQVA6IHsKICAgICAgICAgbGlieGxfX2pzb25fbWFwX25vZGUgKm5vZGUgPSBOVUxMOwog Ci0gICAgICAgIHJjID0geWFqbF9nZW5fbWFwX29wZW4oaGFuZCk7CisgICAgICAgIHJjID0gQ09O VkVSVF9ZQUpMX0dFTl9UT19TVEFUVVMoeWFqbF9nZW5fbWFwX29wZW4oaGFuZCkpOwogICAgICAg ICBpZiAocmMgIT0geWFqbF9zdGF0dXNfb2spCiAgICAgICAgICAgICByZXR1cm4gcmM7CiAgICAg ICAgIGZvciAoaWR4ID0gMDsgaWR4IDwgb2JqLT51Lm1hcC0+Y291bnQ7IGlkeCsrKSB7CiAgICAg ICAgICAgICBpZiAoZmxleGFycmF5X2dldChvYmotPnUubWFwLCBpZHgsICh2b2lkKiopJm5vZGUp ICE9IDApCiAgICAgICAgICAgICAgICAgYnJlYWs7CiAKLSAgICAgICAgICAgIHJjID0gbGlieGxf X3lhamxfZ2VuX2FzY2lpeihoYW5kLCBub2RlLT5tYXBfa2V5KTsKKyAgICAgICAgICAgIHJjID0g Q09OVkVSVF9ZQUpMX0dFTl9UT19TVEFUVVMoCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg bGlieGxfX3lhamxfZ2VuX2FzY2lpeihoYW5kLCBub2RlLT5tYXBfa2V5KSk7CiAgICAgICAgICAg ICBpZiAocmMgIT0geWFqbF9zdGF0dXNfb2spCiAgICAgICAgICAgICAgICAgcmV0dXJuIHJjOwog ICAgICAgICAgICAgcmMgPSBsaWJ4bF9fanNvbl9vYmplY3RfdG9feWFqbF9nZW4oZ2MsIGhhbmQs IG5vZGUtPm9iaik7CiAgICAgICAgICAgICBpZiAocmMgIT0geWFqbF9zdGF0dXNfb2spCiAgICAg ICAgICAgICAgICAgcmV0dXJuIHJjOwogICAgICAgICB9Ci0gICAgICAgIHJldHVybiB5YWpsX2dl bl9tYXBfY2xvc2UoaGFuZCk7CisgICAgICAgIHJldHVybiBDT05WRVJUX1lBSkxfR0VOX1RPX1NU QVRVUyh5YWpsX2dlbl9tYXBfY2xvc2UoaGFuZCkpOwogICAgIH0KICAgICBjYXNlIEpTT05fQVJS QVk6IHsKICAgICAgICAgbGlieGxfX2pzb25fb2JqZWN0ICpub2RlID0gTlVMTDsKIAotICAgICAg ICByYyA9IHlhamxfZ2VuX2FycmF5X29wZW4oaGFuZCk7CisgICAgICAgIHJjID0gQ09OVkVSVF9Z QUpMX0dFTl9UT19TVEFUVVMoeWFqbF9nZW5fYXJyYXlfb3BlbihoYW5kKSk7CiAgICAgICAgIGlm IChyYyAhPSB5YWpsX3N0YXR1c19vaykKICAgICAgICAgICAgIHJldHVybiByYzsKICAgICAgICAg Zm9yIChpZHggPSAwOyBpZHggPCBvYmotPnUuYXJyYXktPmNvdW50OyBpZHgrKykgewpAQCAtNjYy LDEzICs2NjgsMTQgQEAgeWFqbF9zdGF0dXMgbGlieGxfX2pzb25fb2JqZWN0X3RvX3lhamxfZ2Vu KGxpYnhsX19nYyAqZ2MsCiAgICAgICAgICAgICBpZiAocmMgIT0geWFqbF9zdGF0dXNfb2spCiAg ICAgICAgICAgICAgICAgcmV0dXJuIHJjOwogICAgICAgICB9Ci0gICAgICAgIHJldHVybiB5YWps X2dlbl9hcnJheV9jbG9zZShoYW5kKTsKKyAgICAgICAgcmV0dXJuIENPTlZFUlRfWUFKTF9HRU5f VE9fU1RBVFVTKHlhamxfZ2VuX2FycmF5X2Nsb3NlKGhhbmQpKTsKICAgICB9CiAgICAgY2FzZSBK U09OX0FOWToKICAgICAgICAgLyogSlNPTl9BTlkgaXMgbm90IGEgdmFsaWQgdmFsdWUgZm9yIG9i ai0+dHlwZS4gKi8KICAgICAgICAgOwogICAgIH0KICAgICBhYm9ydCgpOworI3VuZGVmIENPTlZF UlRfWUFKTF9HRU5fVE9fU1RBVFVTCiB9CiAKIAotLSAKMi42LjQgKEFwcGxlIEdpdC02MykKCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwg bWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHA6Ly9saXN0cy54ZW4ub3Jn L3hlbi1kZXZlbAo=