From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulina Szubarczyk Subject: [PATCH 10/10] libxl: libxl_tmem functions improving coding style Date: Fri, 1 Apr 2016 14:40:13 +0200 Message-ID: <1459514413-18682-11-git-send-email-paulinaszubarczyk@gmail.com> References: <1459514413-18682-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.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1alyOI-0001Lq-K6 for xen-devel@lists.xenproject.org; Fri, 01 Apr 2016 12:41:30 +0000 Received: by mail-lf0-f51.google.com with SMTP id p188so53649522lfd.0 for ; Fri, 01 Apr 2016 05:41:29 -0700 (PDT) In-Reply-To: <1459514413-18682-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: Paulina Szubarczyk , dario.faggioli@citrix.com, wei.liu2@citrix.com, ian.campbell@citrix.com List-Id: xen-devel@lists.xenproject.org SW4gYWNjb3JkYW5jZSB3aXRoIENPRElOR19TWVRMRToKIC0gVXNlICdyJyBmb3IgcmV0dXJuIHZh bHVlcyB0byBmdW5jdGlvbnMgd2hvc2UgcmV0dXJuIHZhbHVlcyBhcmUgYQogICBkaWZmZXJlbnQg ZXJyb3Igc3BhY2UgKGxpa2UgeGNfdG1lbV9jb250cm9sLCB4Y190bWVtX2F1dGgpCgpTaWduZWQt b2ZmLWJ5OiBQYXVsaW5hIFN6dWJhcmN6eWsgPHBhdWxpbmFzenViYXJjenlrQGdtYWlsLmNvbT4K LS0tCiB0b29scy9saWJ4bC9saWJ4bC5jIHwgNTggKysrKysrKysrKysrKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyOSBpbnNlcnRpb25z KCspLCAyOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90b29scy9saWJ4bC9saWJ4bC5jIGIv dG9vbHMvbGlieGwvbGlieGwuYwppbmRleCA2YmIyZjgyLi41Nzk0YWRlIDEwMDY0NAotLS0gYS90 b29scy9saWJ4bC9saWJ4bC5jCisrKyBiL3Rvb2xzL2xpYnhsL2xpYnhsLmMKQEAgLTYxMDcsMTQg KzYxMDcsMTQgQEAgdWludDMyX3QgbGlieGxfdm1fZ2V0X3N0YXJ0X3RpbWUobGlieGxfY3R4ICpj dHgsIHVpbnQzMl90IGRvbWlkKQogCiBjaGFyICpsaWJ4bF90bWVtX2xpc3QobGlieGxfY3R4ICpj dHgsIHVpbnQzMl90IGRvbWlkLCBpbnQgdXNlX2xvbmcpCiB7Ci0gICAgaW50IHJjOworICAgIGlu dCByOwogICAgIGNoYXIgX2J1ZlszMjc2OF07CiAgICAgR0NfSU5JVChjdHgpOwogCi0gICAgcmMg PSB4Y190bWVtX2NvbnRyb2woY3R4LT54Y2gsIC0xLCBYRU5fU1lTQ1RMX1RNRU1fT1BfTElTVCwg ZG9taWQsIDMyNzY4LCB1c2VfbG9uZywKKyAgICByID0geGNfdG1lbV9jb250cm9sKGN0eC0+eGNo LCAtMSwgWEVOX1NZU0NUTF9UTUVNX09QX0xJU1QsIGRvbWlkLCAzMjc2OCwgdXNlX2xvbmcsCiAg ICAgICAgICAgICAgICAgICAgICAgICAgX2J1Zik7Ci0gICAgaWYgKHJjIDwgMCkgewotICAgICAg ICBMT0dFVihFUlJPUiwgcmMsICJDYW4gbm90IGdldCB0bWVtIGxpc3QiKTsKKyAgICBpZiAociA8 IDApIHsKKyAgICAgICAgTE9HRVYoRVJST1IsIHIsICJDYW4gbm90IGdldCB0bWVtIGxpc3QiKTsK ICAgICAgICAgR0NfRlJFRTsKICAgICAgICAgcmV0dXJuIE5VTEw7CiAgICAgfQpAQCAtNjEyNSwz NiArNjEyNSwzNiBAQCBjaGFyICpsaWJ4bF90bWVtX2xpc3QobGlieGxfY3R4ICpjdHgsIHVpbnQz Ml90IGRvbWlkLCBpbnQgdXNlX2xvbmcpCiAKIGludCBsaWJ4bF90bWVtX2ZyZWV6ZShsaWJ4bF9j dHggKmN0eCwgdWludDMyX3QgZG9taWQpCiB7Ci0gICAgaW50IHJjOworICAgIGludCByOwogICAg IEdDX0lOSVQoY3R4KTsKIAotICAgIHJjID0geGNfdG1lbV9jb250cm9sKGN0eC0+eGNoLCAtMSwg WEVOX1NZU0NUTF9UTUVNX09QX0ZSRUVaRSwgZG9taWQsIDAsIDAsCisgICAgciA9IHhjX3RtZW1f Y29udHJvbChjdHgtPnhjaCwgLTEsIFhFTl9TWVNDVExfVE1FTV9PUF9GUkVFWkUsIGRvbWlkLCAw LCAwLAogICAgICAgICAgICAgICAgICAgICAgICAgIE5VTEwpOwotICAgIGlmIChyYyA8IDApIHsK LSAgICAgICAgTE9HRVYoRVJST1IsIHJjLCAiQ2FuIG5vdCBmcmVlemUgdG1lbSBwb29scyIpOwor ICAgIGlmIChyIDwgMCkgeworICAgICAgICBMT0dFVihFUlJPUiwgciwgIkNhbiBub3QgZnJlZXpl IHRtZW0gcG9vbHMiKTsKICAgICAgICAgR0NfRlJFRTsKICAgICAgICAgcmV0dXJuIEVSUk9SX0ZB SUw7CiAgICAgfQogCiAgICAgR0NfRlJFRTsKLSAgICByZXR1cm4gcmM7CisgICAgcmV0dXJuIHI7 CiB9CiAKIGludCBsaWJ4bF90bWVtX3RoYXcobGlieGxfY3R4ICpjdHgsIHVpbnQzMl90IGRvbWlk KQogewotICAgIGludCByYzsKKyAgICBpbnQgcjsKICAgICBHQ19JTklUKGN0eCk7CiAKLSAgICBy YyA9IHhjX3RtZW1fY29udHJvbChjdHgtPnhjaCwgLTEsIFhFTl9TWVNDVExfVE1FTV9PUF9USEFX LCBkb21pZCwgMCwgMCwKKyAgICByID0geGNfdG1lbV9jb250cm9sKGN0eC0+eGNoLCAtMSwgWEVO X1NZU0NUTF9UTUVNX09QX1RIQVcsIGRvbWlkLCAwLCAwLAogICAgICAgICAgICAgICAgICAgICAg ICAgIE5VTEwpOwotICAgIGlmIChyYyA8IDApIHsKLSAgICAgICAgTE9HRVYoRVJST1IsIHJjLCAi Q2FuIG5vdCB0aGF3IHRtZW0gcG9vbHMiKTsKKyAgICBpZiAociA8IDApIHsKKyAgICAgICAgTE9H RVYoRVJST1IsIHIsICJDYW4gbm90IHRoYXcgdG1lbSBwb29scyIpOwogICAgICAgICBHQ19GUkVF OwogICAgICAgICByZXR1cm4gRVJST1JfRkFJTDsKICAgICB9CiAKICAgICBHQ19GUkVFOwotICAg IHJldHVybiByYzsKKyAgICByZXR1cm4gcjsKIH0KIAogc3RhdGljIGludDMyX3QgdG1lbV9zZXRv cF9mcm9tX3N0cmluZyhjaGFyICpzZXRfbmFtZSkKQEAgLTYxNzEsNyArNjE3MSw3IEBAIHN0YXRp YyBpbnQzMl90IHRtZW1fc2V0b3BfZnJvbV9zdHJpbmcoY2hhciAqc2V0X25hbWUpCiAKIGludCBs aWJ4bF90bWVtX3NldChsaWJ4bF9jdHggKmN0eCwgdWludDMyX3QgZG9taWQsIGNoYXIqIG5hbWUs IHVpbnQzMl90IHNldCkKIHsKLSAgICBpbnQgcmM7CisgICAgaW50IHI7CiAgICAgaW50MzJfdCBz dWJvcCA9IHRtZW1fc2V0b3BfZnJvbV9zdHJpbmcobmFtZSk7CiAgICAgR0NfSU5JVChjdHgpOwog CkBAIC02MTgwLDQ4ICs2MTgwLDQ4IEBAIGludCBsaWJ4bF90bWVtX3NldChsaWJ4bF9jdHggKmN0 eCwgdWludDMyX3QgZG9taWQsIGNoYXIqIG5hbWUsIHVpbnQzMl90IHNldCkKICAgICAgICAgR0Nf RlJFRTsKICAgICAgICAgcmV0dXJuIEVSUk9SX0lOVkFMOwogICAgIH0KLSAgICByYyA9IHhjX3Rt ZW1fY29udHJvbChjdHgtPnhjaCwgLTEsIHN1Ym9wLCBkb21pZCwgc2V0LCAwLCBOVUxMKTsKLSAg ICBpZiAocmMgPCAwKSB7Ci0gICAgICAgIExPR0VWKEVSUk9SLCByYywgIkNhbiBub3Qgc2V0IHRt ZW0gJXMiLCBuYW1lKTsKKyAgICByID0geGNfdG1lbV9jb250cm9sKGN0eC0+eGNoLCAtMSwgc3Vi b3AsIGRvbWlkLCBzZXQsIDAsIE5VTEwpOworICAgIGlmIChyIDwgMCkgeworICAgICAgICBMT0dF VihFUlJPUiwgciwgIkNhbiBub3Qgc2V0IHRtZW0gJXMiLCBuYW1lKTsKICAgICAgICAgR0NfRlJF RTsKICAgICAgICAgcmV0dXJuIEVSUk9SX0ZBSUw7CiAgICAgfQogCiAgICAgR0NfRlJFRTsKLSAg ICByZXR1cm4gcmM7CisgICAgcmV0dXJuIHI7CiB9CiAKIGludCBsaWJ4bF90bWVtX3NoYXJlZF9h dXRoKGxpYnhsX2N0eCAqY3R4LCB1aW50MzJfdCBkb21pZCwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGNoYXIqIHV1aWQsIGludCBhdXRoKQogewotICAgIGludCByYzsKKyAgICBpbnQgcjsK ICAgICBHQ19JTklUKGN0eCk7CiAKLSAgICByYyA9IHhjX3RtZW1fYXV0aChjdHgtPnhjaCwgZG9t aWQsIHV1aWQsIGF1dGgpOwotICAgIGlmIChyYyA8IDApIHsKLSAgICAgICAgTE9HRVYoRVJST1Is IHJjLCAiQ2FuIG5vdCBzZXQgdG1lbSBzaGFyZWQgYXV0aCIpOworICAgIHIgPSB4Y190bWVtX2F1 dGgoY3R4LT54Y2gsIGRvbWlkLCB1dWlkLCBhdXRoKTsKKyAgICBpZiAociA8IDApIHsKKyAgICAg ICAgTE9HRVYoRVJST1IsIHIsICJDYW4gbm90IHNldCB0bWVtIHNoYXJlZCBhdXRoIik7CiAgICAg ICAgIEdDX0ZSRUU7CiAgICAgICAgIHJldHVybiBFUlJPUl9GQUlMOwogICAgIH0KIAogICAgIEdD X0ZSRUU7Ci0gICAgcmV0dXJuIHJjOworICAgIHJldHVybiByOwogfQogCiBpbnQgbGlieGxfdG1l bV9mcmVlYWJsZShsaWJ4bF9jdHggKmN0eCkKIHsKLSAgICBpbnQgcmM7CisgICAgaW50IHI7CiAg ICAgR0NfSU5JVChjdHgpOwogCi0gICAgcmMgPSB4Y190bWVtX2NvbnRyb2woY3R4LT54Y2gsIC0x LCBYRU5fU1lTQ1RMX1RNRU1fT1BfUVVFUllfRlJFRUFCTEVfTUIsIC0xLCAwLCAwLCAwKTsKLSAg ICBpZiAocmMgPCAwKSB7Ci0gICAgICAgIExPR0VWKEVSUk9SLCByYywgIkNhbiBub3QgZ2V0IHRt ZW0gZnJlZWFibGUgbWVtb3J5Iik7CisgICAgciA9IHhjX3RtZW1fY29udHJvbChjdHgtPnhjaCwg LTEsIFhFTl9TWVNDVExfVE1FTV9PUF9RVUVSWV9GUkVFQUJMRV9NQiwgLTEsIDAsIDAsIDApOwor ICAgIGlmIChyIDwgMCkgeworICAgICAgICBMT0dFVihFUlJPUiwgciwgIkNhbiBub3QgZ2V0IHRt ZW0gZnJlZWFibGUgbWVtb3J5Iik7CiAgICAgICAgIEdDX0ZSRUU7CiAgICAgICAgIHJldHVybiBF UlJPUl9GQUlMOwogICAgIH0KIAogICAgIEdDX0ZSRUU7Ci0gICAgcmV0dXJuIHJjOworICAgIHJl dHVybiByOwogfQogCiBpbnQgbGlieGxfZ2V0X2ZyZWVjcHVzKGxpYnhsX2N0eCAqY3R4LCBsaWJ4 bF9iaXRtYXAgKmNwdW1hcCkKLS0gCjEuOS4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlz dHMueGVuLm9yZwpodHRwOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK