From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Subject: [PATCH 5/8] python: use PyBytes/PyUnicode instead of PyString Date: Thu, 23 Feb 2017 11:48:25 +0100 Message-ID: <1487846908-21462-6-git-send-email-marmarek@invisiblethingslab.com> References: <1487846908-21462-1-git-send-email-marmarek@invisiblethingslab.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1487846908-21462-1-git-send-email-marmarek@invisiblethingslab.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xen.org Cc: Wei Liu , Ian Jackson , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= List-Id: xen-devel@lists.xenproject.org SW4gUHl0aG9uMiBQeUJ5dGVzIGlzIHRoZSBzYW1lIGFzIFB5U3RyaW5nLCBidXQgaW4gUHl0aG9u MyBQeVN0cmluZyBpcwpnb25lIGFuZCAnc3RyJyBpcyByZWFsbHkgUHlVbmljb2RlIGluIEMtQVBJ LgpXaGVuIGhhbmRsaW5nIGFyYml0cmFyeSBkYXRhLCB1c2UgUHlCeXRlcyAtIHdoaWNoIGlzIHRo ZSByaWdodCB0aGluZyB0bwpkbyBpbiBQeXRob24zLCBhbmQgcG9zZSBubyBBUEkgY2hhbmdlIGlu IFB5dGhvbjIuIFdoZW4gaGFuZGxpbmcKeGVuc3RvcmUgcGF0aHMgYW5kIHRyYW5zYWN0aW9uIGlk cywgd2hpY2ggaGF2ZSB3ZWxsIGRlZmluZWQgZm9ybWF0LCB1c2UKUHlVbmljb2RlIC0gdG8gZWFz ZSBBUEkgdXNhZ2UgLSBubyBuZWVkIHRvIHByZWZpeCBhbGwgeGVuc3RvcmUgcGF0aHMKd2l0aCAn Yicgd2hlbiBtaWdyYXRpbmcgc2NyaXB0cyB0byBQeXRob24zLgoKU2lnbmVkLW9mZi1ieTogTWFy ZWsgTWFyY3p5a293c2tpLUfDs3JlY2tpIDxtYXJtYXJla0BpbnZpc2libGV0aGluZ3NsYWIuY29t PgotLS0KIHRvb2xzL3B5dGhvbi94ZW4vbG93bGV2ZWwveGMveGMuYyB8ICA2ICsrKy0tLQogdG9v bHMvcHl0aG9uL3hlbi9sb3dsZXZlbC94cy94cy5jIHwgMjAgKysrKysrKysrKysrKysrKy0tLS0K IDIgZmlsZXMgY2hhbmdlZCwgMTkgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS90b29scy9weXRob24veGVuL2xvd2xldmVsL3hjL3hjLmMgYi90b29scy9weXRob24v eGVuL2xvd2xldmVsL3hjL3hjLmMKaW5kZXggYmNiYjdiMC4uY2U4N2FmYiAxMDA2NDQKLS0tIGEv dG9vbHMvcHl0aG9uL3hlbi9sb3dsZXZlbC94Yy94Yy5jCisrKyBiL3Rvb2xzL3B5dGhvbi94ZW4v bG93bGV2ZWwveGMveGMuYwpAQCAtNjc4LDcgKzY3OCw3IEBAIHN0YXRpYyB2b2lkIHB5eGNfZG9t X2V4dHJhY3RfY3B1aWQoUHlPYmplY3QgKmNvbmZpZywKIAogICAgIGZvciAoIGkgPSAwOyBpIDwg NDsgaSsrICkKICAgICAgICAgaWYgKCAob2JqID0gUHlEaWN0X0dldEl0ZW1TdHJpbmcoY29uZmln LCByZWdzX2V4dHJhY3RbaV0pKSAhPSBOVUxMICkKLSAgICAgICAgICAgIHJlZ3NbaV0gPSBQeVN0 cmluZ19BU19TVFJJTkcob2JqKTsKKyAgICAgICAgICAgIHJlZ3NbaV0gPSBQeUJ5dGVzX0FTX1NU UklORyhvYmopOwogfQogCiBzdGF0aWMgUHlPYmplY3QgKnB5eGNfY3JlYXRlX2NwdWlkX2RpY3Qo Y2hhciAqKnJlZ3MpCkBAIC02OTMsNyArNjkzLDcgQEAgc3RhdGljIFB5T2JqZWN0ICpweXhjX2Ny ZWF0ZV9jcHVpZF9kaWN0KGNoYXIgKipyZWdzKQogICAgICAgIGlmICggcmVnc1tpXSA9PSBOVUxM ICkKICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgUHlEaWN0X1NldEl0ZW1TdHJpbmcoZGlj dCwgcmVnc19leHRyYWN0W2ldLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIFB5U3RyaW5n X0Zyb21TdHJpbmcocmVnc1tpXSkpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIFB5Qnl0 ZXNfRnJvbVN0cmluZyhyZWdzW2ldKSk7CiAgICAgICAgZnJlZShyZWdzW2ldKTsKICAgICAgICBy ZWdzW2ldID0gTlVMTDsKICAgIH0KQEAgLTk0MCw3ICs5NDAsNyBAQCBzdGF0aWMgUHlPYmplY3Qg KnB5eGNfcmVhZGNvbnNvbGVyaW5nKFhjT2JqZWN0ICpzZWxmLAogICAgICAgICBzdHIgPSBwdHI7 CiAgICAgfQogCi0gICAgb2JqID0gUHlTdHJpbmdfRnJvbVN0cmluZ0FuZFNpemUoc3RyLCBjb3Vu dCk7CisgICAgb2JqID0gUHlCeXRlc19Gcm9tU3RyaW5nQW5kU2l6ZShzdHIsIGNvdW50KTsKICAg ICBmcmVlKHN0cik7CiAgICAgcmV0dXJuIG9iajsKIH0KZGlmZiAtLWdpdCBhL3Rvb2xzL3B5dGhv bi94ZW4vbG93bGV2ZWwveHMveHMuYyBiL3Rvb2xzL3B5dGhvbi94ZW4vbG93bGV2ZWwveHMveHMu YwppbmRleCA2NmFiMDhkLi5jMmI0ZDg3IDEwMDY0NAotLS0gYS90b29scy9weXRob24veGVuL2xv d2xldmVsL3hzL3hzLmMKKysrIGIvdG9vbHMvcHl0aG9uL3hlbi9sb3dsZXZlbC94cy94cy5jCkBA IC0xMDMsNyArMTAzLDcgQEAgc3RhdGljIFB5T2JqZWN0ICp4c3B5X3JlYWQoWHNIYW5kbGUgKnNl bGYsIFB5T2JqZWN0ICphcmdzKQogICAgIHhzdmFsID0geHNfcmVhZCh4aCwgdGgsIHBhdGgsICZ4 c3ZhbF9uKTsKICAgICBQeV9FTkRfQUxMT1dfVEhSRUFEUwogICAgIGlmICh4c3ZhbCkgewotICAg ICAgICBQeU9iamVjdCAqdmFsID0gUHlTdHJpbmdfRnJvbVN0cmluZ0FuZFNpemUoeHN2YWwsIHhz dmFsX24pOworICAgICAgICBQeU9iamVjdCAqdmFsID0gUHlCeXRlc19Gcm9tU3RyaW5nQW5kU2l6 ZSh4c3ZhbCwgeHN2YWxfbik7CiAgICAgICAgIGZyZWUoeHN2YWwpOwogICAgICAgICByZXR1cm4g dmFsOwogICAgIH0KQEAgLTE3OSw3ICsxNzksMTEgQEAgc3RhdGljIFB5T2JqZWN0ICp4c3B5X2xz KFhzSGFuZGxlICpzZWxmLCBQeU9iamVjdCAqYXJncykKICAgICAgICAgaW50IGk7CiAgICAgICAg IFB5T2JqZWN0ICp2YWwgPSBQeUxpc3RfTmV3KHhzdmFsX24pOwogICAgICAgICBmb3IgKGkgPSAw OyBpIDwgeHN2YWxfbjsgaSsrKQotICAgICAgICAgICAgUHlMaXN0X1NldEl0ZW0odmFsLCBpLCBQ eVN0cmluZ19Gcm9tU3RyaW5nKHhzdmFsW2ldKSk7CisjaWYgUFlfTUFKT1JfVkVSU0lPTiA+PSAz CisgICAgICAgICAgICBQeUxpc3RfU2V0SXRlbSh2YWwsIGksIFB5VW5pY29kZV9Gcm9tU3RyaW5n KHhzdmFsW2ldKSk7CisjZWxzZQorICAgICAgICAgICAgUHlMaXN0X1NldEl0ZW0odmFsLCBpLCBQ eUJ5dGVzX0Zyb21TdHJpbmcoeHN2YWxbaV0pKTsKKyNlbmRpZgogICAgICAgICBmcmVlKHhzdmFs KTsKICAgICAgICAgcmV0dXJuIHZhbDsKICAgICB9CkBAIC01NTAsNyArNTU0LDExIEBAIHN0YXRp YyBQeU9iamVjdCAqeHNweV90cmFuc2FjdGlvbl9zdGFydChYc0hhbmRsZSAqc2VsZikKICAgICB9 CiAKICAgICBzbnByaW50Zih0aHN0ciwgc2l6ZW9mKHRoc3RyKSwgIiVsWCIsICh1bnNpZ25lZCBs b25nKXRoKTsKLSAgICByZXR1cm4gUHlTdHJpbmdfRnJvbVN0cmluZyh0aHN0cik7CisjaWYgUFlf TUFKT1JfVkVSU0lPTiA+PSAzCisgICAgcmV0dXJuIFB5VW5pY29kZV9Gcm9tU3RyaW5nKHRoc3Ry KTsKKyNlbHNlCisgICAgcmV0dXJuIFB5Qnl0ZXNfRnJvbVN0cmluZyh0aHN0cik7CisjZW5kaWYK IH0KIAogI2RlZmluZSB4c3B5X3RyYW5zYWN0aW9uX2VuZF9kb2MgIlxuIgkJCQkJXApAQCAtNzcz LDcgKzc4MSwxMSBAQCBzdGF0aWMgUHlPYmplY3QgKnhzcHlfZ2V0X2RvbWFpbl9wYXRoKFhzSGFu ZGxlICpzZWxmLCBQeU9iamVjdCAqYXJncykKICAgICBQeV9FTkRfQUxMT1dfVEhSRUFEUwogCiAg ICAgaWYgKHhzdmFsKSB7Ci0gICAgICAgIFB5T2JqZWN0ICp2YWwgPSBQeVN0cmluZ19Gcm9tU3Ry aW5nKHhzdmFsKTsKKyNpZiBQWV9NQUpPUl9WRVJTSU9OID49IDMKKyAgICAgICAgUHlPYmplY3Qg KnZhbCA9IFB5VW5pY29kZV9Gcm9tU3RyaW5nKHhzdmFsKTsKKyNlbHNlCisgICAgICAgIFB5T2Jq ZWN0ICp2YWwgPSBQeUJ5dGVzX0Zyb21TdHJpbmcoeHN2YWwpOworI2VuZGlmCiAgICAgICAgIGZy ZWUoeHN2YWwpOwogICAgICAgICByZXR1cm4gdmFsOwogICAgIH0KLS0gCjIuNy40CgoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxp bmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVu LWRldmVsCg==