From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulina Szubarczyk Subject: [PATCH v3 7/7] libxl: libxl_tmem functions improving coding style Date: Wed, 20 Apr 2016 10:04:04 +0200 Message-ID: <1461139444-12342-8-git-send-email-paulinaszubarczyk@gmail.com> References: <1461139444-12342-1-git-send-email-paulinaszubarczyk@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1asn8g-0006LR-1K for xen-devel@lists.xenproject.org; Wed, 20 Apr 2016 08:05:34 +0000 Received: by mail-lf0-f45.google.com with SMTP id g184so35902389lfb.3 for ; Wed, 20 Apr 2016 01:05:32 -0700 (PDT) In-Reply-To: <1461139444-12342-1-git-send-email-paulinaszubarczyk@gmail.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, roger.pau@citrix.com, George.Dunlap@eu.citrix.com Cc: ian.jackson@eu.citrix.com, dario.faggioli@citrix.com, wei.liu2@citrix.com, ian.campbell@citrix.com, Paulina Szubarczyk List-Id: xen-devel@lists.xenproject.org SW4gYWNjb3JkYW5jZSB3aXRoIENPRElOR19TWVRMRToKIC0gVXNlICdyJyBmb3IgcmV0dXJuIHZh bHVlcyB0byBmdW5jdGlvbnMgd2hvc2UgcmV0dXJuIHZhbHVlcyBhcmUgYQogICBkaWZmZXJlbnQg ZXJyb3Igc3BhY2UgKGxpa2UgeGNfdG1lbV9jb250cm9sLCB4Y190bWVtX2F1dGgpCgpsaWJ4YyBm dW5jdGlvbnMgYXJlIHN1cHBvc2VkIHRvLCBvbiBmYWlsdXJlLCBzZXQgZXJybm8gYW5kIGFsd2Fz IHJldHVybiAtMSAKd2hpY2ggaXMgdGhlIHZhbHVlIHN0b3JlZCBpbiAncicsIHRoZXJmb3JlIHVz ZSBMT0coKSBpbnN0ZWFkIExPR0VWKCkgCndpdGggdGhlICdyJyB2YWx1ZSBzaW5jZSB0aGUgZXJy b3IgY29kZSBpcyBhbHdheXMgLTEuCgpTaWduZWQtb2ZmLWJ5OiBQYXVsaW5hIFN6dWJhcmN6eWsg PHBhdWxpbmFzenViYXJjenlrQGdtYWlsLmNvbT4KLS0tCkNoYW5nZWQgc2luY2UgdjI6CiAqIGNv cnJlY3RlZCBpbmRlbnRhdGlvbgogKiBjaGFuZ2VkIExPR0VWKCktPkxPRygpCi0tLQogdG9vbHMv bGlieGwvbGlieGwuYyB8IDg5ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNTAgaW5zZXJ0aW9ucygrKSwgMzkgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGwvbGlieGwuYyBiL3Rvb2xzL2xpYnhs L2xpYnhsLmMKaW5kZXggOTEzMGY3NC4uMDJiNjE2NCAxMDA2NDQKLS0tIGEvdG9vbHMvbGlieGwv bGlieGwuYworKysgYi90b29scy9saWJ4bC9saWJ4bC5jCkBAIC02NTk3LDE0ICs2NTk3LDE0IEBA IHVpbnQzMl90IGxpYnhsX3ZtX2dldF9zdGFydF90aW1lKGxpYnhsX2N0eCAqY3R4LCB1aW50MzJf dCBkb21pZCkKIAogY2hhciAqbGlieGxfdG1lbV9saXN0KGxpYnhsX2N0eCAqY3R4LCB1aW50MzJf dCBkb21pZCwgaW50IHVzZV9sb25nKQogewotICAgIGludCByYzsKKyAgICBpbnQgcjsKICAgICBj aGFyIF9idWZbMzI3NjhdOwogICAgIEdDX0lOSVQoY3R4KTsKIAotICAgIHJjID0geGNfdG1lbV9j b250cm9sKGN0eC0+eGNoLCAtMSwgWEVOX1NZU0NUTF9UTUVNX09QX0xJU1QsIGRvbWlkLCAzMjc2 OCwgdXNlX2xvbmcsCi0gICAgICAgICAgICAgICAgICAgICAgICAgX2J1Zik7Ci0gICAgaWYgKHJj IDwgMCkgewotICAgICAgICBMT0dFVihFUlJPUiwgcmMsICJDYW4gbm90IGdldCB0bWVtIGxpc3Qi KTsKKyAgICByID0geGNfdG1lbV9jb250cm9sKGN0eC0+eGNoLCAtMSwgWEVOX1NZU0NUTF9UTUVN X09QX0xJU1QsIGRvbWlkLCAzMjc2OCwKKyAgICAgICAgICAgICAgICAgICAgICAgIHVzZV9sb25n LCBfYnVmKTsKKyAgICBpZiAociA8IDApIHsKKyAgICAgICAgTE9HKEVSUk9SLCAiQ2FuIG5vdCBn ZXQgdG1lbSBsaXN0Iik7CiAgICAgICAgIEdDX0ZSRUU7CiAgICAgICAgIHJldHVybiBOVUxMOwog ICAgIH0KQEAgLTY2MTUsMzQgKzY2MTUsMzggQEAgY2hhciAqbGlieGxfdG1lbV9saXN0KGxpYnhs X2N0eCAqY3R4LCB1aW50MzJfdCBkb21pZCwgaW50IHVzZV9sb25nKQogCiBpbnQgbGlieGxfdG1l bV9mcmVlemUobGlieGxfY3R4ICpjdHgsIHVpbnQzMl90IGRvbWlkKQogewotICAgIGludCByYzsK KyAgICBpbnQgciwgcmM7CiAgICAgR0NfSU5JVChjdHgpOwogCi0gICAgcmMgPSB4Y190bWVtX2Nv bnRyb2woY3R4LT54Y2gsIC0xLCBYRU5fU1lTQ1RMX1RNRU1fT1BfRlJFRVpFLCBkb21pZCwgMCwg MCwKLSAgICAgICAgICAgICAgICAgICAgICAgICBOVUxMKTsKLSAgICBpZiAocmMgPCAwKSB7Ci0g ICAgICAgIExPR0VWKEVSUk9SLCByYywgIkNhbiBub3QgZnJlZXplIHRtZW0gcG9vbHMiKTsKLSAg ICAgICAgR0NfRlJFRTsKLSAgICAgICAgcmV0dXJuIEVSUk9SX0ZBSUw7CisgICAgciA9IHhjX3Rt ZW1fY29udHJvbChjdHgtPnhjaCwgLTEsIFhFTl9TWVNDVExfVE1FTV9PUF9GUkVFWkUsIGRvbWlk LCAwLCAwLAorICAgICAgICAgICAgICAgICAgICAgICAgTlVMTCk7CisgICAgaWYgKHIgPCAwKSB7 CisgICAgICAgIExPRyhFUlJPUiwgIkNhbiBub3QgZnJlZXplIHRtZW0gcG9vbHMiKTsKKyAgICAg ICAgcmMgPSBFUlJPUl9GQUlMOworICAgICAgICBnb3RvIG91dDsKICAgICB9CiAKKyAgICByYyA9 IDA7CitvdXQ6CiAgICAgR0NfRlJFRTsKICAgICByZXR1cm4gcmM7CiB9CiAKIGludCBsaWJ4bF90 bWVtX3RoYXcobGlieGxfY3R4ICpjdHgsIHVpbnQzMl90IGRvbWlkKQogewotICAgIGludCByYzsK KyAgICBpbnQgciwgcmM7CiAgICAgR0NfSU5JVChjdHgpOwogCi0gICAgcmMgPSB4Y190bWVtX2Nv bnRyb2woY3R4LT54Y2gsIC0xLCBYRU5fU1lTQ1RMX1RNRU1fT1BfVEhBVywgZG9taWQsIDAsIDAs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgTlVMTCk7Ci0gICAgaWYgKHJjIDwgMCkgewotICAg ICAgICBMT0dFVihFUlJPUiwgcmMsICJDYW4gbm90IHRoYXcgdG1lbSBwb29scyIpOwotICAgICAg ICBHQ19GUkVFOwotICAgICAgICByZXR1cm4gRVJST1JfRkFJTDsKKyAgICByID0geGNfdG1lbV9j b250cm9sKGN0eC0+eGNoLCAtMSwgWEVOX1NZU0NUTF9UTUVNX09QX1RIQVcsIGRvbWlkLCAwLCAw LAorICAgICAgICAgICAgICAgICAgICAgICAgTlVMTCk7CisgICAgaWYgKHIgPCAwKSB7CisgICAg ICAgIExPRyhFUlJPUiwgIkNhbiBub3QgdGhhdyB0bWVtIHBvb2xzIik7CisgICAgICAgIHJjID0g RVJST1JfRkFJTDsKKyAgICAgICAgZ290byBvdXQ7CiAgICAgfQogCisgICAgcmMgPSAwOworb3V0 OgogICAgIEdDX0ZSRUU7CiAgICAgcmV0dXJuIHJjOwogfQpAQCAtNjY2MSwyMiArNjY2NSwyNCBA QCBzdGF0aWMgaW50MzJfdCB0bWVtX3NldG9wX2Zyb21fc3RyaW5nKGNoYXIgKnNldF9uYW1lKQog CiBpbnQgbGlieGxfdG1lbV9zZXQobGlieGxfY3R4ICpjdHgsIHVpbnQzMl90IGRvbWlkLCBjaGFy KiBuYW1lLCB1aW50MzJfdCBzZXQpCiB7Ci0gICAgaW50IHJjOworICAgIGludCByLCByYzsKICAg ICBpbnQzMl90IHN1Ym9wID0gdG1lbV9zZXRvcF9mcm9tX3N0cmluZyhuYW1lKTsKICAgICBHQ19J TklUKGN0eCk7CiAKICAgICBpZiAoc3Vib3AgPT0gLTEpIHsKICAgICAgICAgTE9HRVYoRVJST1Is IC0xLCAiSW52YWxpZCBzZXQsIHZhbGlkIHNldHMgYXJlIDx3ZWlnaHR8Y2FwfGNvbXByZXNzPiIp OwotICAgICAgICBHQ19GUkVFOwotICAgICAgICByZXR1cm4gRVJST1JfSU5WQUw7CisgICAgICAg IHJjID0gRVJST1JfSU5WQUw7CisgICAgICAgIGdvdG8gb3V0OwogICAgIH0KLSAgICByYyA9IHhj X3RtZW1fY29udHJvbChjdHgtPnhjaCwgLTEsIHN1Ym9wLCBkb21pZCwgc2V0LCAwLCBOVUxMKTsK LSAgICBpZiAocmMgPCAwKSB7Ci0gICAgICAgIExPR0VWKEVSUk9SLCByYywgIkNhbiBub3Qgc2V0 IHRtZW0gJXMiLCBuYW1lKTsKLSAgICAgICAgR0NfRlJFRTsKLSAgICAgICAgcmV0dXJuIEVSUk9S X0ZBSUw7CisgICAgciA9IHhjX3RtZW1fY29udHJvbChjdHgtPnhjaCwgLTEsIHN1Ym9wLCBkb21p ZCwgc2V0LCAwLCBOVUxMKTsKKyAgICBpZiAociA8IDApIHsKKyAgICAgICAgTE9HKEVSUk9SLCAi Q2FuIG5vdCBzZXQgdG1lbSAlcyIsIG5hbWUpOworICAgICAgICByYyA9IEVSUk9SX0ZBSUw7Cisg ICAgICAgIGdvdG8gb3V0OwogICAgIH0KIAorICAgIHJjID0gMDsKK291dDoKICAgICBHQ19GUkVF OwogICAgIHJldHVybiByYzsKIH0KQEAgLTY2ODQsMzIgKzY2OTAsMzcgQEAgaW50IGxpYnhsX3Rt ZW1fc2V0KGxpYnhsX2N0eCAqY3R4LCB1aW50MzJfdCBkb21pZCwgY2hhciogbmFtZSwgdWludDMy X3Qgc2V0KQogaW50IGxpYnhsX3RtZW1fc2hhcmVkX2F1dGgobGlieGxfY3R4ICpjdHgsIHVpbnQz Ml90IGRvbWlkLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgY2hhciogdXVpZCwgaW50IGF1 dGgpCiB7Ci0gICAgaW50IHJjOworICAgIGludCByLCByYzsKICAgICBHQ19JTklUKGN0eCk7CiAK LSAgICByYyA9IHhjX3RtZW1fYXV0aChjdHgtPnhjaCwgZG9taWQsIHV1aWQsIGF1dGgpOwotICAg IGlmIChyYyA8IDApIHsKLSAgICAgICAgTE9HRVYoRVJST1IsIHJjLCAiQ2FuIG5vdCBzZXQgdG1l bSBzaGFyZWQgYXV0aCIpOwotICAgICAgICBHQ19GUkVFOwotICAgICAgICByZXR1cm4gRVJST1Jf RkFJTDsKKyAgICByID0geGNfdG1lbV9hdXRoKGN0eC0+eGNoLCBkb21pZCwgdXVpZCwgYXV0aCk7 CisgICAgaWYgKHIgPCAwKSB7CisgICAgICAgIExPRyhFUlJPUiwgIkNhbiBub3Qgc2V0IHRtZW0g c2hhcmVkIGF1dGgiKTsKKyAgICAgICAgcmMgPSBFUlJPUl9GQUlMOworICAgICAgICBnb3RvIG91 dDsKICAgICB9CiAKKyAgICByYyA9IDA7CitvdXQ6CiAgICAgR0NfRlJFRTsKICAgICByZXR1cm4g cmM7CiB9CiAKIGludCBsaWJ4bF90bWVtX2ZyZWVhYmxlKGxpYnhsX2N0eCAqY3R4KQogewotICAg IGludCByYzsKKyAgICBpbnQgciwgcmM7CiAgICAgR0NfSU5JVChjdHgpOwogCi0gICAgcmMgPSB4 Y190bWVtX2NvbnRyb2woY3R4LT54Y2gsIC0xLCBYRU5fU1lTQ1RMX1RNRU1fT1BfUVVFUllfRlJF RUFCTEVfTUIsIC0xLCAwLCAwLCAwKTsKLSAgICBpZiAocmMgPCAwKSB7Ci0gICAgICAgIExPR0VW KEVSUk9SLCByYywgIkNhbiBub3QgZ2V0IHRtZW0gZnJlZWFibGUgbWVtb3J5Iik7Ci0gICAgICAg IEdDX0ZSRUU7Ci0gICAgICAgIHJldHVybiBFUlJPUl9GQUlMOworICAgIHIgPSB4Y190bWVtX2Nv bnRyb2woY3R4LT54Y2gsIC0xLCBYRU5fU1lTQ1RMX1RNRU1fT1BfUVVFUllfRlJFRUFCTEVfTUIs CisgICAgICAgICAgICAgICAgICAgICAgICAtMSwgMCwgMCwgMCk7CisgICAgaWYgKHIgPCAwKSB7 CisgICAgICAgIExPRyhFUlJPUiwgIkNhbiBub3QgZ2V0IHRtZW0gZnJlZWFibGUgbWVtb3J5Iik7 CisgICAgICAgIHJjID0gRVJST1JfRkFJTDsKKyAgICAgICAgZ290byBvdXQ7CiAgICAgfQogCisg ICAgcmMgPSAwOworb3V0OgogICAgIEdDX0ZSRUU7CiAgICAgcmV0dXJuIHJjOwogfQotLSAKMS45 LjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4t ZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHA6Ly9saXN0cy54 ZW4ub3JnL3hlbi1kZXZlbAo=