From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Patterson Subject: [PATCH 2/2] libxl: replace deprecated readdir_r() with readdir() Date: Sun, 29 May 2016 22:32:47 -0400 Message-ID: <1464575567-3962-2-git-send-email-cjp256@gmail.com> References: <1464575567-3962-1-git-send-email-cjp256@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1464575567-3962-1-git-send-email-cjp256@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.xen.org Cc: wei.liu2@citrix.com, Chris Patterson , ian.jackson@eu.citrix.com List-Id: xen-devel@lists.xenproject.org RnJvbTogQ2hyaXMgUGF0dGVyc29uIDxwYXR0ZXJzb25jQGFpbmZvc2VjLmNvbT4KClJlcGxhY2Ug dGhlIHVzYWdlIG9mIHJlYWRkaXJfcigpIHdpdGggcmVhZGRpcigpIHRvIGFkZHJlc3MKYSBjb21w aWxhdGlvbiBlcnJvciBkdWUgdG8gdGhlIGRlcHJlY2F0aW9uIG9mIHJlYWRkaXJfci4KCmdsaWJj IGhhcyBkZXByZWNhdGVkIHRoaXMgZm9yIHRoZWlyIG5leHQgcmVsZWFzZSAoMi4yNCk6Cmh0dHBz Oi8vc291cmNld2FyZS5vcmcvYnVnemlsbGEvc2hvd19idWcuY2dpP2lkPTE5MDU2CgpUaGlzIGFs c28gcmVtb3ZlcyB0aGUgemFsbG9jX2RpcmVudCgpIGhlbHBlciBmdW5jdGlvbgp3aGljaCBpcyBu byBsb25nZXIgcmVxdWlyZWQuCgpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBQYXR0ZXJzb24gPHBhdHRl cnNvbmNAYWluZm9zZWMuY29tPgotLS0KIHRvb2xzL2xpYnhsL2xpYnhsX3B2dXNiLmMgfCAyNiAr KysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogdG9vbHMvbGlieGwvbGlieGxfdXRpbHMuYyB8ICA5 ICsrLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyksIDI5IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhsL2xpYnhsX3B2dXNiLmMgYi90b29scy9saWJ4 bC9saWJ4bF9wdnVzYi5jCmluZGV4IDlmMWU4NDIuLmQxMzk3YzQgMTAwNjQ0Ci0tLSBhL3Rvb2xz L2xpYnhsL2xpYnhsX3B2dXNiLmMKKysrIGIvdG9vbHMvbGlieGwvbGlieGxfcHZ1c2IuYwpAQCAt NTA4LDE5ICs1MDgsMTAgQEAgaW50IGxpYnhsX2RldmlkX3RvX2RldmljZV91c2JjdHJsKGxpYnhs X2N0eCAqY3R4LAogICAgIHJldHVybiByYzsKIH0KIAotc3RhdGljIHZvaWQgKnphbGxvY19kaXJl bnQobGlieGxfX2djICpnYywgY29uc3QgY2hhciAqZGlycGF0aCkKLXsKLSAgICBzaXplX3QgbmVl ZCA9IG9mZnNldG9mKHN0cnVjdCBkaXJlbnQsIGRfbmFtZSkgKwotICAgICAgICAgICAgICAgICAg cGF0aGNvbmYoZGlycGF0aCwgX1BDX05BTUVfTUFYKSArIDE7Ci0KLSAgICByZXR1cm4gbGlieGxf X3phbGxvYyhnYywgbmVlZCk7Ci19Ci0KIHN0YXRpYyBjaGFyICp1c2JkZXZfYnVzYWRkcl90b19i dXNpZChsaWJ4bF9fZ2MgKmdjLCBpbnQgYnVzLCBpbnQgYWRkcikKIHsKICAgICBESVIgKmRpcjsK ICAgICBjaGFyICpidXNpZCA9IE5VTEw7Ci0gICAgc3RydWN0IGRpcmVudCAqZGVfYnVmOwogICAg IHN0cnVjdCBkaXJlbnQgKmRlOwogCiAgICAgLyogaW52YWxpZCBob3N0YnVzIG9yIGhvc3RhZGRy ICovCkBAIC01MzMsMjEgKzUyNCwxNyBAQCBzdGF0aWMgY2hhciAqdXNiZGV2X2J1c2FkZHJfdG9f YnVzaWQobGlieGxfX2djICpnYywgaW50IGJ1cywgaW50IGFkZHIpCiAgICAgICAgIHJldHVybiBO VUxMOwogICAgIH0KIAotICAgIGRlX2J1ZiA9IHphbGxvY19kaXJlbnQoZ2MsIFNZU0ZTX1VTQl9E RVYpOwotCiAgICAgZm9yICg7OykgewogICAgICAgICBjaGFyICpmaWxlbmFtZTsKICAgICAgICAg dm9pZCAqYnVmOwogICAgICAgICBpbnQgYnVzbnVtID0gLTE7CiAgICAgICAgIGludCBkZXZudW0g PSAtMTsKIAotICAgICAgICBpbnQgciA9IHJlYWRkaXJfcihkaXIsIGRlX2J1ZiwgJmRlKTsKLSAg ICAgICAgaWYgKHIpIHsKKyAgICAgICAgZGUgPSByZWFkZGlyKGRpcik7CisgICAgICAgIGlmICgh ZGUpIHsKICAgICAgICAgICAgIExPR0UoRVJST1IsICJmYWlsZWQgdG8gcmVhZGRpciAlcyIsIFNZ U0ZTX1VTQl9ERVYpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KLSAgICAgICAgaWYg KCFkZSkKLSAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgIGlmICghc3RyY21wKGRlLT5kX25h bWUsICIuIikgfHwKICAgICAgICAgICAgICFzdHJjbXAoZGUtPmRfbmFtZSwgIi4uIikpCkBAIC0x MTU3LDcgKzExNDQsNiBAQCBzdGF0aWMgaW50IHVzYmRldl9nZXRfYWxsX2ludGVyZmFjZXMobGli eGxfX2djICpnYywgY29uc3QgY2hhciAqYnVzaWQsCiB7CiAgICAgRElSICpkaXI7CiAgICAgY2hh ciAqYnVmOwotICAgIHN0cnVjdCBkaXJlbnQgKmRlX2J1ZjsKICAgICBzdHJ1Y3QgZGlyZW50ICpk ZTsKICAgICBpbnQgcmM7CiAKQEAgLTExNzIsMTggKzExNTgsMTQgQEAgc3RhdGljIGludCB1c2Jk ZXZfZ2V0X2FsbF9pbnRlcmZhY2VzKGxpYnhsX19nYyAqZ2MsIGNvbnN0IGNoYXIgKmJ1c2lkLAog ICAgICAgICByZXR1cm4gRVJST1JfRkFJTDsKICAgICB9CiAKLSAgICBkZV9idWYgPSB6YWxsb2Nf ZGlyZW50KGdjLCBTWVNGU19VU0JfREVWKTsKLQogICAgIGZvciAoOzspIHsKLSAgICAgICAgaW50 IHIgPSByZWFkZGlyX3IoZGlyLCBkZV9idWYsICZkZSk7CisgICAgICAgIGRlID0gcmVhZGRpcihk aXIpOwogCi0gICAgICAgIGlmIChyKSB7CisgICAgICAgIGlmICghZGUpIHsKICAgICAgICAgICAg IExPR0UoRVJST1IsICJmYWlsZWQgdG8gcmVhZGRpciAlcyIsIFNZU0ZTX1VTQl9ERVYpOwogICAg ICAgICAgICAgcmMgPSBFUlJPUl9GQUlMOwogICAgICAgICAgICAgZ290byBvdXQ7CiAgICAgICAg IH0KLSAgICAgICAgaWYgKCFkZSkKLSAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgIGlmICgh c3RyY21wKGRlLT5kX25hbWUsICIuIikgfHwKICAgICAgICAgICAgICFzdHJjbXAoZGUtPmRfbmFt ZSwgIi4uIikpCmRpZmYgLS1naXQgYS90b29scy9saWJ4bC9saWJ4bF91dGlscy5jIGIvdG9vbHMv bGlieGwvbGlieGxfdXRpbHMuYwppbmRleCBjZWI4ODI1Li42MTNhOWQ2IDEwMDY0NAotLS0gYS90 b29scy9saWJ4bC9saWJ4bF91dGlscy5jCisrKyBiL3Rvb2xzL2xpYnhsL2xpYnhsX3V0aWxzLmMK QEAgLTU0OCwyMCArNTQ4LDE1IEBAIGludCBsaWJ4bF9fcmVtb3ZlX2RpcmVjdG9yeShsaWJ4bF9f Z2MgKmdjLCBjb25zdCBjaGFyICpkaXJwYXRoKQogICAgICAgICBnb3RvIG91dDsKICAgICB9CiAK LSAgICBzaXplX3QgbmVlZCA9IG9mZnNldG9mKHN0cnVjdCBkaXJlbnQsIGRfbmFtZSkgKwotICAg ICAgICBwYXRoY29uZihkaXJwYXRoLCBfUENfTkFNRV9NQVgpICsgMTsKLSAgICBzdHJ1Y3QgZGly ZW50ICpkZV9idWYgPSBsaWJ4bF9femFsbG9jKGdjLCBuZWVkKTsKICAgICBzdHJ1Y3QgZGlyZW50 ICpkZTsKIAogICAgIGZvciAoOzspIHsKLSAgICAgICAgaW50IHIgPSByZWFkZGlyX3IoZCwgZGVf YnVmLCAmZGUpOwotICAgICAgICBpZiAocikgeworICAgICAgICBkZSA9IHJlYWRkaXIoZCk7Cisg ICAgICAgIGlmICghZGUpIHsKICAgICAgICAgICAgIExPR0UoRVJST1IsICJmYWlsZWQgdG8gcmVh ZGRpciAlcyBmb3IgcmVtb3ZhbCIsIGRpcnBhdGgpOwogICAgICAgICAgICAgcmMgPSBFUlJPUl9G QUlMOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KLSAgICAgICAgaWYgKCFkZSkKLSAg ICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgIGlmICghc3RyY21wKGRlLT5kX25hbWUsICIuIikg fHwKICAgICAgICAgICAgICFzdHJjbXAoZGUtPmRfbmFtZSwgIi4uIikpCi0tIAoyLjEuNAoKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBt YWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cDovL2xpc3RzLnhlbi5vcmcv eGVuLWRldmVsCg==