From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulina Szubarczyk Subject: [PATCH v4 7/7] libxl: libxl_tmem functions improving coding style Date: Mon, 9 May 2016 13:30:58 +0200 Message-ID: <1462793458-27170-8-git-send-email-paulinaszubarczyk@gmail.com> References: <1462793458-27170-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.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1azjQY-00052r-3s for xen-devel@lists.xenproject.org; Mon, 09 May 2016 11:32:42 +0000 Received: by mail-wm0-f68.google.com with SMTP id n129so20108760wmn.1 for ; Mon, 09 May 2016 04:32:40 -0700 (PDT) In-Reply-To: <1462793458-27170-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 Cc: wei.liu2@citrix.com, George.Dunlap@eu.citrix.com, Paulina Szubarczyk , dario.faggioli@citrix.com, ian.jackson@eu.citrix.com, roger.pau@citrix.com List-Id: xen-devel@lists.xenproject.org SW4gYWNjb3JkYW5jZSB3aXRoIENPRElOR19TWVRMRToKIC0gVXNlICdyJyBmb3IgcmV0dXJuIHZh bHVlcyB0byBmdW5jdGlvbnMgd2hvc2UgcmV0dXJuIHZhbHVlcyBhcmUgYQogICBkaWZmZXJlbnQg ZXJyb3Igc3BhY2UgKGxpa2UgeGNfdG1lbV9jb250cm9sLCB4Y190bWVtX2F1dGgpCgpsaWJ4YyBm dW5jdGlvbnMgYXJlIHN1cHBvc2VkIHRvLCBvbiBmYWlsdXJlLCBzZXQgZXJybm8gYW5kIGFsd2F5 cwpyZXR1cm4gLTEgIHdoaWNoIGlzIHRoZSB2YWx1ZSBzdG9yZWQgaW4gJ3InLCB0aGVyZm9yZSB1 c2UgTE9HRSgpCmluc3RlYWQgTE9HRVYoKSB3aXRoIHRoZSAncicgdmFsdWUuCgpTaWduZWQtb2Zm LWJ5OiBQYXVsaW5hIFN6dWJhcmN6eWsgPHBhdWxpbmFzenViYXJjenlrQGdtYWlsLmNvbT4KLS0t CkNoYW5nZWQgc2luY2UgdjM6CiAtIGNoYW5nZWQgTE9HKCkgdG8gTE9HRSgpIAoKIHRvb2xzL2xp YnhsL2xpYnhsLmMgfCA4OSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0t LS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDUwIGluc2VydGlvbnMoKyksIDM5IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhsL2xpYnhsLmMgYi90b29scy9saWJ4bC9s aWJ4bC5jCmluZGV4IDdjYjE1YmYuLjNlNWQ5N2EgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhsL2xp YnhsLmMKKysrIGIvdG9vbHMvbGlieGwvbGlieGwuYwpAQCAtNjYyMCwxNCArNjYyMCwxNCBAQCB1 aW50MzJfdCBsaWJ4bF92bV9nZXRfc3RhcnRfdGltZShsaWJ4bF9jdHggKmN0eCwgdWludDMyX3Qg ZG9taWQpCiAKIGNoYXIgKmxpYnhsX3RtZW1fbGlzdChsaWJ4bF9jdHggKmN0eCwgdWludDMyX3Qg ZG9taWQsIGludCB1c2VfbG9uZykKIHsKLSAgICBpbnQgcmM7CisgICAgaW50IHI7CiAgICAgY2hh ciBfYnVmWzMyNzY4XTsKICAgICBHQ19JTklUKGN0eCk7CiAKLSAgICByYyA9IHhjX3RtZW1fY29u dHJvbChjdHgtPnhjaCwgLTEsIFhFTl9TWVNDVExfVE1FTV9PUF9MSVNULCBkb21pZCwgMzI3Njgs IHVzZV9sb25nLAotICAgICAgICAgICAgICAgICAgICAgICAgIF9idWYpOwotICAgIGlmIChyYyA8 IDApIHsKLSAgICAgICAgTE9HRVYoRVJST1IsIHJjLCAiQ2FuIG5vdCBnZXQgdG1lbSBsaXN0Iik7 CisgICAgciA9IHhjX3RtZW1fY29udHJvbChjdHgtPnhjaCwgLTEsIFhFTl9TWVNDVExfVE1FTV9P UF9MSVNULCBkb21pZCwgMzI3NjgsCisgICAgICAgICAgICAgICAgICAgICAgICB1c2VfbG9uZywg X2J1Zik7CisgICAgaWYgKHIgPCAwKSB7CisgICAgICAgIExPR0UoRVJST1IsICJDYW4gbm90IGdl dCB0bWVtIGxpc3QiKTsKICAgICAgICAgR0NfRlJFRTsKICAgICAgICAgcmV0dXJuIE5VTEw7CiAg ICAgfQpAQCAtNjYzOCwzNCArNjYzOCwzOCBAQCBjaGFyICpsaWJ4bF90bWVtX2xpc3QobGlieGxf Y3R4ICpjdHgsIHVpbnQzMl90IGRvbWlkLCBpbnQgdXNlX2xvbmcpCiAKIGludCBsaWJ4bF90bWVt X2ZyZWV6ZShsaWJ4bF9jdHggKmN0eCwgdWludDMyX3QgZG9taWQpCiB7Ci0gICAgaW50IHJjOwor ICAgIGludCByLCByYzsKICAgICBHQ19JTklUKGN0eCk7CiAKLSAgICByYyA9IHhjX3RtZW1fY29u dHJvbChjdHgtPnhjaCwgLTEsIFhFTl9TWVNDVExfVE1FTV9PUF9GUkVFWkUsIGRvbWlkLCAwLCAw LAotICAgICAgICAgICAgICAgICAgICAgICAgIE5VTEwpOwotICAgIGlmIChyYyA8IDApIHsKLSAg ICAgICAgTE9HRVYoRVJST1IsIHJjLCAiQ2FuIG5vdCBmcmVlemUgdG1lbSBwb29scyIpOwotICAg ICAgICBHQ19GUkVFOwotICAgICAgICByZXR1cm4gRVJST1JfRkFJTDsKKyAgICByID0geGNfdG1l bV9jb250cm9sKGN0eC0+eGNoLCAtMSwgWEVOX1NZU0NUTF9UTUVNX09QX0ZSRUVaRSwgZG9taWQs IDAsIDAsCisgICAgICAgICAgICAgICAgICAgICAgICBOVUxMKTsKKyAgICBpZiAociA8IDApIHsK KyAgICAgICAgTE9HRShFUlJPUiwgIkNhbiBub3QgZnJlZXplIHRtZW0gcG9vbHMiKTsKKyAgICAg ICAgcmMgPSBFUlJPUl9GQUlMOworICAgICAgICBnb3RvIG91dDsKICAgICB9CiAKKyAgICByYyA9 IDA7CitvdXQ6CiAgICAgR0NfRlJFRTsKICAgICByZXR1cm4gcmM7CiB9CiAKIGludCBsaWJ4bF90 bWVtX3RoYXcobGlieGxfY3R4ICpjdHgsIHVpbnQzMl90IGRvbWlkKQogewotICAgIGludCByYzsK KyAgICBpbnQgciwgcmM7CiAgICAgR0NfSU5JVChjdHgpOwogCi0gICAgcmMgPSB4Y190bWVtX2Nv bnRyb2woY3R4LT54Y2gsIC0xLCBYRU5fU1lTQ1RMX1RNRU1fT1BfVEhBVywgZG9taWQsIDAsIDAs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgTlVMTCk7Ci0gICAgaWYgKHJjIDwgMCkgewotICAg ICAgICBMT0dFVihFUlJPUiwgcmMsICJDYW4gbm90IHRoYXcgdG1lbSBwb29scyIpOwotICAgICAg ICBHQ19GUkVFOwotICAgICAgICByZXR1cm4gRVJST1JfRkFJTDsKKyAgICByID0geGNfdG1lbV9j b250cm9sKGN0eC0+eGNoLCAtMSwgWEVOX1NZU0NUTF9UTUVNX09QX1RIQVcsIGRvbWlkLCAwLCAw LAorICAgICAgICAgICAgICAgICAgICAgICAgTlVMTCk7CisgICAgaWYgKHIgPCAwKSB7CisgICAg ICAgIExPR0UoRVJST1IsICJDYW4gbm90IHRoYXcgdG1lbSBwb29scyIpOworICAgICAgICByYyA9 IEVSUk9SX0ZBSUw7CisgICAgICAgIGdvdG8gb3V0OwogICAgIH0KIAorICAgIHJjID0gMDsKK291 dDoKICAgICBHQ19GUkVFOwogICAgIHJldHVybiByYzsKIH0KQEAgLTY2ODQsMjIgKzY2ODgsMjQg QEAgc3RhdGljIGludDMyX3QgdG1lbV9zZXRvcF9mcm9tX3N0cmluZyhjaGFyICpzZXRfbmFtZSkK IAogaW50IGxpYnhsX3RtZW1fc2V0KGxpYnhsX2N0eCAqY3R4LCB1aW50MzJfdCBkb21pZCwgY2hh ciogbmFtZSwgdWludDMyX3Qgc2V0KQogewotICAgIGludCByYzsKKyAgICBpbnQgciwgcmM7CiAg ICAgaW50MzJfdCBzdWJvcCA9IHRtZW1fc2V0b3BfZnJvbV9zdHJpbmcobmFtZSk7CiAgICAgR0Nf SU5JVChjdHgpOwogCiAgICAgaWYgKHN1Ym9wID09IC0xKSB7CiAgICAgICAgIExPR0VWKEVSUk9S LCAtMSwgIkludmFsaWQgc2V0LCB2YWxpZCBzZXRzIGFyZSA8d2VpZ2h0fGNhcHxjb21wcmVzcz4i KTsKLSAgICAgICAgR0NfRlJFRTsKLSAgICAgICAgcmV0dXJuIEVSUk9SX0lOVkFMOworICAgICAg ICByYyA9IEVSUk9SX0lOVkFMOworICAgICAgICBnb3RvIG91dDsKICAgICB9Ci0gICAgcmMgPSB4 Y190bWVtX2NvbnRyb2woY3R4LT54Y2gsIC0xLCBzdWJvcCwgZG9taWQsIHNldCwgMCwgTlVMTCk7 Ci0gICAgaWYgKHJjIDwgMCkgewotICAgICAgICBMT0dFVihFUlJPUiwgcmMsICJDYW4gbm90IHNl dCB0bWVtICVzIiwgbmFtZSk7Ci0gICAgICAgIEdDX0ZSRUU7Ci0gICAgICAgIHJldHVybiBFUlJP Ul9GQUlMOworICAgIHIgPSB4Y190bWVtX2NvbnRyb2woY3R4LT54Y2gsIC0xLCBzdWJvcCwgZG9t aWQsIHNldCwgMCwgTlVMTCk7CisgICAgaWYgKHIgPCAwKSB7CisgICAgICAgIExPR0UoRVJST1Is ICJDYW4gbm90IHNldCB0bWVtICVzIiwgbmFtZSk7CisgICAgICAgIHJjID0gRVJST1JfRkFJTDsK KyAgICAgICAgZ290byBvdXQ7CiAgICAgfQogCisgICAgcmMgPSAwOworb3V0OgogICAgIEdDX0ZS RUU7CiAgICAgcmV0dXJuIHJjOwogfQpAQCAtNjcwNywzMiArNjcxMywzNyBAQCBpbnQgbGlieGxf dG1lbV9zZXQobGlieGxfY3R4ICpjdHgsIHVpbnQzMl90IGRvbWlkLCBjaGFyKiBuYW1lLCB1aW50 MzJfdCBzZXQpCiBpbnQgbGlieGxfdG1lbV9zaGFyZWRfYXV0aChsaWJ4bF9jdHggKmN0eCwgdWlu dDMyX3QgZG9taWQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICBjaGFyKiB1dWlkLCBpbnQg YXV0aCkKIHsKLSAgICBpbnQgcmM7CisgICAgaW50IHIsIHJjOwogICAgIEdDX0lOSVQoY3R4KTsK IAotICAgIHJjID0geGNfdG1lbV9hdXRoKGN0eC0+eGNoLCBkb21pZCwgdXVpZCwgYXV0aCk7Ci0g ICAgaWYgKHJjIDwgMCkgewotICAgICAgICBMT0dFVihFUlJPUiwgcmMsICJDYW4gbm90IHNldCB0 bWVtIHNoYXJlZCBhdXRoIik7Ci0gICAgICAgIEdDX0ZSRUU7Ci0gICAgICAgIHJldHVybiBFUlJP Ul9GQUlMOworICAgIHIgPSB4Y190bWVtX2F1dGgoY3R4LT54Y2gsIGRvbWlkLCB1dWlkLCBhdXRo KTsKKyAgICBpZiAociA8IDApIHsKKyAgICAgICAgTE9HRShFUlJPUiwgIkNhbiBub3Qgc2V0IHRt ZW0gc2hhcmVkIGF1dGgiKTsKKyAgICAgICAgcmMgPSBFUlJPUl9GQUlMOworICAgICAgICBnb3Rv IG91dDsKICAgICB9CiAKKyAgICByYyA9IDA7CitvdXQ6CiAgICAgR0NfRlJFRTsKICAgICByZXR1 cm4gcmM7CiB9CiAKIGludCBsaWJ4bF90bWVtX2ZyZWVhYmxlKGxpYnhsX2N0eCAqY3R4KQogewot ICAgIGludCByYzsKKyAgICBpbnQgciwgcmM7CiAgICAgR0NfSU5JVChjdHgpOwogCi0gICAgcmMg PSB4Y190bWVtX2NvbnRyb2woY3R4LT54Y2gsIC0xLCBYRU5fU1lTQ1RMX1RNRU1fT1BfUVVFUllf RlJFRUFCTEVfTUIsIC0xLCAwLCAwLCAwKTsKLSAgICBpZiAocmMgPCAwKSB7Ci0gICAgICAgIExP R0VWKEVSUk9SLCByYywgIkNhbiBub3QgZ2V0IHRtZW0gZnJlZWFibGUgbWVtb3J5Iik7Ci0gICAg ICAgIEdDX0ZSRUU7Ci0gICAgICAgIHJldHVybiBFUlJPUl9GQUlMOworICAgIHIgPSB4Y190bWVt X2NvbnRyb2woY3R4LT54Y2gsIC0xLCBYRU5fU1lTQ1RMX1RNRU1fT1BfUVVFUllfRlJFRUFCTEVf TUIsCisgICAgICAgICAgICAgICAgICAgICAgICAtMSwgMCwgMCwgMCk7CisgICAgaWYgKHIgPCAw KSB7CisgICAgICAgIExPR0UoRVJST1IsICJDYW4gbm90IGdldCB0bWVtIGZyZWVhYmxlIG1lbW9y eSIpOworICAgICAgICByYyA9IEVSUk9SX0ZBSUw7CisgICAgICAgIGdvdG8gb3V0OwogICAgIH0K IAorICAgIHJjID0gMDsKK291dDoKICAgICBHQ19GUkVFOwogICAgIHJldHVybiByYzsKIH0KLS0g CjEuOS4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K WGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwOi8vbGlz dHMueGVuLm9yZy94ZW4tZGV2ZWwK