From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulina Szubarczyk Subject: [PATCH v2 10/10] libxl: libxl_tmem functions improving coding style Date: Wed, 6 Apr 2016 13:46:03 +0200 Message-ID: <1459943163-18697-11-git-send-email-paulinaszubarczyk@gmail.com> References: <1459943163-18697-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 1anlvq-000480-Lz for xen-devel@lists.xenproject.org; Wed, 06 Apr 2016 11:47:34 +0000 Received: by mail-lb0-f194.google.com with SMTP id vk4so3573995lbb.1 for ; Wed, 06 Apr 2016 04:47:33 -0700 (PDT) In-Reply-To: <1459943163-18697-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 ZXJyb3Igc3BhY2UgKGxpa2UgeGNfdG1lbV9jb250cm9sLCB4Y190bWVtX2F1dGgpCgpTaWduZWQt b2ZmLWJ5OiBQYXVsaW5hIFN6dWJhcmN6eWsgPHBhdWxpbmFzenViYXJjenlrQGdtYWlsLmNvbT4K LS0tCkNoYW5nZWQgc2luY2UgdjE6CiogQWRkZWQgdGhlIGVycm9yIGNsZWFudXAgcGF0aCAnb3V0 Jy4KKiBSZXBsYWNlZCByZXR1cm4gd2l0aCBzZXQtYW5kLWdvdG8gc3RhdGVtZW50cy4KLS0tCiB0 b29scy9saWJ4bC9saWJ4bC5jIHwgODIgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0NiBpbnNlcnRpb25zKCspLCAz NiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90b29scy9saWJ4bC9saWJ4bC5jIGIvdG9vbHMv bGlieGwvbGlieGwuYwppbmRleCAwNTczNjZlLi5iZjBjM2MzIDEwMDY0NAotLS0gYS90b29scy9s aWJ4bC9saWJ4bC5jCisrKyBiL3Rvb2xzL2xpYnhsL2xpYnhsLmMKQEAgLTYyMzgsMTQgKzYyMzgs MTQgQEAgdWludDMyX3QgbGlieGxfdm1fZ2V0X3N0YXJ0X3RpbWUobGlieGxfY3R4ICpjdHgsIHVp bnQzMl90IGRvbWlkKQogCiBjaGFyICpsaWJ4bF90bWVtX2xpc3QobGlieGxfY3R4ICpjdHgsIHVp bnQzMl90IGRvbWlkLCBpbnQgdXNlX2xvbmcpCiB7Ci0gICAgaW50IHJjOworICAgIGludCByOwog ICAgIGNoYXIgX2J1ZlszMjc2OF07CiAgICAgR0NfSU5JVChjdHgpOwogCi0gICAgcmMgPSB4Y190 bWVtX2NvbnRyb2woY3R4LT54Y2gsIC0xLCBYRU5fU1lTQ1RMX1RNRU1fT1BfTElTVCwgZG9taWQs IDMyNzY4LCB1c2VfbG9uZywKKyAgICByID0geGNfdG1lbV9jb250cm9sKGN0eC0+eGNoLCAtMSwg WEVOX1NZU0NUTF9UTUVNX09QX0xJU1QsIGRvbWlkLCAzMjc2OCwgdXNlX2xvbmcsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgX2J1Zik7Ci0gICAgaWYgKHJjIDwgMCkgewotICAgICAgICBMT0dF VihFUlJPUiwgcmMsICJDYW4gbm90IGdldCB0bWVtIGxpc3QiKTsKKyAgICBpZiAociA8IDApIHsK KyAgICAgICAgTE9HRVYoRVJST1IsIHIsICJDYW4gbm90IGdldCB0bWVtIGxpc3QiKTsKICAgICAg ICAgR0NfRlJFRTsKICAgICAgICAgcmV0dXJuIE5VTEw7CiAgICAgfQpAQCAtNjI1NiwzNCArNjI1 NiwzOCBAQCBjaGFyICpsaWJ4bF90bWVtX2xpc3QobGlieGxfY3R4ICpjdHgsIHVpbnQzMl90IGRv bWlkLCBpbnQgdXNlX2xvbmcpCiAKIGludCBsaWJ4bF90bWVtX2ZyZWV6ZShsaWJ4bF9jdHggKmN0 eCwgdWludDMyX3QgZG9taWQpCiB7Ci0gICAgaW50IHJjOworICAgIGludCByLCByYzsKICAgICBH Q19JTklUKGN0eCk7CiAKLSAgICByYyA9IHhjX3RtZW1fY29udHJvbChjdHgtPnhjaCwgLTEsIFhF Tl9TWVNDVExfVE1FTV9PUF9GUkVFWkUsIGRvbWlkLCAwLCAwLAorICAgIHIgPSB4Y190bWVtX2Nv bnRyb2woY3R4LT54Y2gsIC0xLCBYRU5fU1lTQ1RMX1RNRU1fT1BfRlJFRVpFLCBkb21pZCwgMCwg MCwKICAgICAgICAgICAgICAgICAgICAgICAgICBOVUxMKTsKLSAgICBpZiAocmMgPCAwKSB7Ci0g ICAgICAgIExPR0VWKEVSUk9SLCByYywgIkNhbiBub3QgZnJlZXplIHRtZW0gcG9vbHMiKTsKLSAg ICAgICAgR0NfRlJFRTsKLSAgICAgICAgcmV0dXJuIEVSUk9SX0ZBSUw7CisgICAgaWYgKHIgPCAw KSB7CisgICAgICAgIExPR0VWKEVSUk9SLCByLCAiQ2FuIG5vdCBmcmVlemUgdG1lbSBwb29scyIp OworICAgICAgICByYyA9IEVSUk9SX0ZBSUw7CisgICAgICAgIGdvdG8gb3V0OwogICAgIH0KIAor ICAgIHJjID0gMDsKK291dDoKICAgICBHQ19GUkVFOwogICAgIHJldHVybiByYzsKIH0KIAogaW50 IGxpYnhsX3RtZW1fdGhhdyhsaWJ4bF9jdHggKmN0eCwgdWludDMyX3QgZG9taWQpCiB7Ci0gICAg aW50IHJjOworICAgIGludCByLCByYzsKICAgICBHQ19JTklUKGN0eCk7CiAKLSAgICByYyA9IHhj X3RtZW1fY29udHJvbChjdHgtPnhjaCwgLTEsIFhFTl9TWVNDVExfVE1FTV9PUF9USEFXLCBkb21p ZCwgMCwgMCwKKyAgICByID0geGNfdG1lbV9jb250cm9sKGN0eC0+eGNoLCAtMSwgWEVOX1NZU0NU TF9UTUVNX09QX1RIQVcsIGRvbWlkLCAwLCAwLAogICAgICAgICAgICAgICAgICAgICAgICAgIE5V TEwpOwotICAgIGlmIChyYyA8IDApIHsKLSAgICAgICAgTE9HRVYoRVJST1IsIHJjLCAiQ2FuIG5v dCB0aGF3IHRtZW0gcG9vbHMiKTsKLSAgICAgICAgR0NfRlJFRTsKLSAgICAgICAgcmV0dXJuIEVS Uk9SX0ZBSUw7CisgICAgaWYgKHIgPCAwKSB7CisgICAgICAgIExPR0VWKEVSUk9SLCByLCAiQ2Fu IG5vdCB0aGF3IHRtZW0gcG9vbHMiKTsKKyAgICAgICAgcmMgPSBFUlJPUl9GQUlMOworICAgICAg ICBnb3RvIG91dDsKICAgICB9CiAKKyAgICByYyA9IDA7CitvdXQ6CiAgICAgR0NfRlJFRTsKICAg ICByZXR1cm4gcmM7CiB9CkBAIC02MzAyLDIyICs2MzA2LDI0IEBAIHN0YXRpYyBpbnQzMl90IHRt ZW1fc2V0b3BfZnJvbV9zdHJpbmcoY2hhciAqc2V0X25hbWUpCiAKIGludCBsaWJ4bF90bWVtX3Nl dChsaWJ4bF9jdHggKmN0eCwgdWludDMyX3QgZG9taWQsIGNoYXIqIG5hbWUsIHVpbnQzMl90IHNl dCkKIHsKLSAgICBpbnQgcmM7CisgICAgaW50IHIsIHJjOwogICAgIGludDMyX3Qgc3Vib3AgPSB0 bWVtX3NldG9wX2Zyb21fc3RyaW5nKG5hbWUpOwogICAgIEdDX0lOSVQoY3R4KTsKIAogICAgIGlm IChzdWJvcCA9PSAtMSkgewogICAgICAgICBMT0dFVihFUlJPUiwgLTEsICJJbnZhbGlkIHNldCwg dmFsaWQgc2V0cyBhcmUgPHdlaWdodHxjYXB8Y29tcHJlc3M+Iik7Ci0gICAgICAgIEdDX0ZSRUU7 Ci0gICAgICAgIHJldHVybiBFUlJPUl9JTlZBTDsKKyAgICAgICAgcmMgPSBFUlJPUl9JTlZBTDsK KyAgICAgICAgZ290byBvdXQ7CiAgICAgfQotICAgIHJjID0geGNfdG1lbV9jb250cm9sKGN0eC0+ eGNoLCAtMSwgc3Vib3AsIGRvbWlkLCBzZXQsIDAsIE5VTEwpOwotICAgIGlmIChyYyA8IDApIHsK LSAgICAgICAgTE9HRVYoRVJST1IsIHJjLCAiQ2FuIG5vdCBzZXQgdG1lbSAlcyIsIG5hbWUpOwot ICAgICAgICBHQ19GUkVFOwotICAgICAgICByZXR1cm4gRVJST1JfRkFJTDsKKyAgICByID0geGNf dG1lbV9jb250cm9sKGN0eC0+eGNoLCAtMSwgc3Vib3AsIGRvbWlkLCBzZXQsIDAsIE5VTEwpOwor ICAgIGlmIChyIDwgMCkgeworICAgICAgICBMT0dFVihFUlJPUiwgciwgIkNhbiBub3Qgc2V0IHRt ZW0gJXMiLCBuYW1lKTsKKyAgICAgICAgcmMgPSBFUlJPUl9GQUlMOworICAgICAgICBnb3RvIG91 dDsKICAgICB9CiAKKyAgICByYyA9IDA7CitvdXQ6CiAgICAgR0NfRlJFRTsKICAgICByZXR1cm4g cmM7CiB9CkBAIC02MzI1LDMyICs2MzMxLDM2IEBAIGludCBsaWJ4bF90bWVtX3NldChsaWJ4bF9j dHggKmN0eCwgdWludDMyX3QgZG9taWQsIGNoYXIqIG5hbWUsIHVpbnQzMl90IHNldCkKIGludCBs aWJ4bF90bWVtX3NoYXJlZF9hdXRoKGxpYnhsX2N0eCAqY3R4LCB1aW50MzJfdCBkb21pZCwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGNoYXIqIHV1aWQsIGludCBhdXRoKQogewotICAgIGlu dCByYzsKKyAgICBpbnQgciwgcmM7CiAgICAgR0NfSU5JVChjdHgpOwogCi0gICAgcmMgPSB4Y190 bWVtX2F1dGgoY3R4LT54Y2gsIGRvbWlkLCB1dWlkLCBhdXRoKTsKLSAgICBpZiAocmMgPCAwKSB7 Ci0gICAgICAgIExPR0VWKEVSUk9SLCByYywgIkNhbiBub3Qgc2V0IHRtZW0gc2hhcmVkIGF1dGgi KTsKLSAgICAgICAgR0NfRlJFRTsKLSAgICAgICAgcmV0dXJuIEVSUk9SX0ZBSUw7CisgICAgciA9 IHhjX3RtZW1fYXV0aChjdHgtPnhjaCwgZG9taWQsIHV1aWQsIGF1dGgpOworICAgIGlmIChyIDwg MCkgeworICAgICAgICBMT0dFVihFUlJPUiwgciwgIkNhbiBub3Qgc2V0IHRtZW0gc2hhcmVkIGF1 dGgiKTsKKyAgICAgICAgcmMgPSBFUlJPUl9GQUlMOworICAgICAgICBnb3RvIG91dDsKICAgICB9 CiAKKyAgICByYyA9IDA7CitvdXQ6CiAgICAgR0NfRlJFRTsKICAgICByZXR1cm4gcmM7CiB9CiAK IGludCBsaWJ4bF90bWVtX2ZyZWVhYmxlKGxpYnhsX2N0eCAqY3R4KQogewotICAgIGludCByYzsK KyAgICBpbnQgciwgcmM7CiAgICAgR0NfSU5JVChjdHgpOwogCi0gICAgcmMgPSB4Y190bWVtX2Nv bnRyb2woY3R4LT54Y2gsIC0xLCBYRU5fU1lTQ1RMX1RNRU1fT1BfUVVFUllfRlJFRUFCTEVfTUIs IC0xLCAwLCAwLCAwKTsKLSAgICBpZiAocmMgPCAwKSB7Ci0gICAgICAgIExPR0VWKEVSUk9SLCBy YywgIkNhbiBub3QgZ2V0IHRtZW0gZnJlZWFibGUgbWVtb3J5Iik7Ci0gICAgICAgIEdDX0ZSRUU7 Ci0gICAgICAgIHJldHVybiBFUlJPUl9GQUlMOworICAgIHIgPSB4Y190bWVtX2NvbnRyb2woY3R4 LT54Y2gsIC0xLCBYRU5fU1lTQ1RMX1RNRU1fT1BfUVVFUllfRlJFRUFCTEVfTUIsIC0xLCAwLCAw LCAwKTsKKyAgICBpZiAociA8IDApIHsKKyAgICAgICAgTE9HRVYoRVJST1IsIHIsICJDYW4gbm90 IGdldCB0bWVtIGZyZWVhYmxlIG1lbW9yeSIpOworICAgICAgICByYyA9IEVSUk9SX0ZBSUw7Cisg ICAgICAgIGdvdG8gb3V0OwogICAgIH0KIAorICAgIHJjID0gMDsKK291dDoKICAgICBHQ19GUkVF OwogICAgIHJldHVybiByYzsKIH0KLS0gCjEuOS4xCgoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxA bGlzdHMueGVuLm9yZwpodHRwOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK