From: "Charles Coffing" Subject: [PATCH] warn_unused_result fixes Date: Mon, 11 Jun 2007 18:22:43 -0400 Message-ID: <466D759C.D169.003C.0@novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__PartAB8C8D23.0__=" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org --=__PartAB8C8D23.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline More fixes prompted by gcc's warn_unused_result, in the tools directory. Note that some of the existing error checking for asprintf was wrong for Linux. asprintf in glibc returns -1 on error, but leaves the pointer uninitialized. Only the BSDs zero out the pointer on error. Also, while fixing these warnings I saw several error paths that were incorrect. This patch minimally fixes the warn_unused_result; more complete error path cleanup will be a later patch. Please apply to xen-unstable. Signed-off-by: Charles Coffing --=__PartAB8C8D23.0__= Content-Type: application/octet-stream; name="warn-unused-result.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="warn-unused-result.diff" ZGlmZiAtcnUgeGVuLXVuc3RhYmxlLmhnL3Rvb2xzL2Jsa3RhcC9kcml2ZXJzL2Jsa3RhcGN0cmwu YyB4ZW4tdW5zdGFibGUvdG9vbHMvYmxrdGFwL2RyaXZlcnMvYmxrdGFwY3RybC5jCi0tLSB4ZW4t dW5zdGFibGUuaGcvdG9vbHMvYmxrdGFwL2RyaXZlcnMvYmxrdGFwY3RybC5jCTIwMDctMDYtMDgg MTQ6Mjk6NTQuMDAwMDAwMDAwIC0wNjAwCisrKyB4ZW4tdW5zdGFibGUvdG9vbHMvYmxrdGFwL2Ry aXZlcnMvYmxrdGFwY3RybC5jCTIwMDctMDYtMTEgMTY6MDY6MTEuMDAwMDAwMDAwIC0wNjAwCkBA IC0xNDMsNyArMTQzLDggQEAKIAkJcmV0dXJuIC0xOwogCX0KIAotCWFzcHJpbnRmKCZkZXZuYW1l LCIlcy8lcyVkIixCTEtUQVBfREVWX0RJUiwgQkxLVEFQX0RFVl9OQU1FLCAqbWlub3IpOworCWlm IChhc3ByaW50ZigmZGV2bmFtZSwiJXMvJXMlZCIsQkxLVEFQX0RFVl9ESVIsIEJMS1RBUF9ERVZf TkFNRSwgKm1pbm9yKSA9PSAtMSkKKwkJcmV0dXJuIC0xOwogCW1ha2VfYmxrdGFwX2RldihkZXZu YW1lLCptYWpvciwqbWlub3IpOwkKIAlEUFJJTlRGKCJSZWNlaXZlZCBkZXZpY2UgaWQgJWQgYW5k IG1ham9yICVkLCAiCiAJCSJzZW50IGRvbWlkICVkIGFuZCBiZV9pZCAlZFxuIiwKQEAgLTQ5NSwy MCArNDk2LDI3IEBACiAKIAkJaWYgKCFleGlzdCkgewogCQkJRFBSSU5URigiUHJvY2VzcyBkb2Vz IG5vdCBleGlzdDpcbiIpOwotCQkJYXNwcmludGYoJnJkY3RsZGV2LCAKLQkJCQkgIiVzL3RhcGN0 cmxyZWFkJWQiLCBCTEtUQVBfQ1RSTF9ESVIsIG1pbm9yKTsKLQkJCWJsa2lmLT5mZHNbUkVBRF0g PSBvcGVuX2N0cmxfc29ja2V0KHJkY3RsZGV2KTsKLQorCQkJaWYgKGFzcHJpbnRmKCZyZGN0bGRl diwKKwkJCQkgICAgICIlcy90YXBjdHJscmVhZCVkIiwgQkxLVEFQX0NUUkxfRElSLCBtaW5vcikg PT0gLTEpCisJCQkJcmV0dXJuIC0xOworCQkJaWYgKGFzcHJpbnRmKCZ3cmN0bGRldiwKKwkJCQkg ICAgICIlcy90YXBjdHJsd3JpdGUlZCIsIEJMS1RBUF9DVFJMX0RJUiwgbWlub3IpID09IC0xKSB7 CisJCQkJZnJlZShyZGN0bGRldik7CisJCQkJcmV0dXJuIC0xOworCQkJfQorCQkJaWYgKGFzcHJp bnRmKCZjbWQsICJ0YXBkaXNrICVzICVzIiwgd3JjdGxkZXYsIHJkY3RsZGV2KSA9PSAtMSkgewor CQkJCWZyZWUocmRjdGxkZXYpOworCQkJCWZyZWUod3JjdGxkZXYpOworCQkJCXJldHVybiAtMTsK KwkJCX0KIAotCQkJYXNwcmludGYoJndyY3RsZGV2LCAKLQkJCQkgIiVzL3RhcGN0cmx3cml0ZSVk IiwgQkxLVEFQX0NUUkxfRElSLCBtaW5vcik7CisJCQlibGtpZi0+ZmRzW1JFQURdID0gb3Blbl9j dHJsX3NvY2tldChyZGN0bGRldik7CiAJCQlibGtpZi0+ZmRzW1dSSVRFXSA9IG9wZW5fY3RybF9z b2NrZXQod3JjdGxkZXYpOwogCQkJCiAJCQlpZiAoYmxraWYtPmZkc1tSRUFEXSA9PSAtMSB8fCBi bGtpZi0+ZmRzW1dSSVRFXSA9PSAtMSkgCiAJCQkJZ290byBmYWlsOwogCiAJCQkvKmxhdW5jaCB0 aGUgbmV3IHByb2Nlc3MqLwotCQkJYXNwcmludGYoJmNtZCwgInRhcGRpc2sgJXMgJXMiLCB3cmN0 bGRldiwgcmRjdGxkZXYpOwogCQkJRFBSSU5URigiTGF1bmNoaW5nIHByb2Nlc3MsIENNRExJTkUg WyVzXVxuIixjbWQpOwogCQkJaWYgKHN5c3RlbShjbWQpID09IC0xKSB7CiAJCQkJRFBSSU5URigi VW5hYmxlIHRvIGZvcmssIGNtZGxpbmU6IFslc11cbiIsY21kKTsKQEAgLTY5Miw3ICs3MDAsOCBA QAogCXJlZ2lzdGVyX25ld191bm1hcF9ob29rKHVubWFwX2Jsa3RhcGN0cmwpOwogCiAJLyogQXR0 YWNoIHRvIGJsa3RhcDAgKi8KLQlhc3ByaW50ZigmZGV2bmFtZSwiJXMvJXMwIiwgQkxLVEFQX0RF Vl9ESVIsIEJMS1RBUF9ERVZfTkFNRSk7CisJaWYgKGFzcHJpbnRmKCZkZXZuYW1lLCIlcy8lczAi LCBCTEtUQVBfREVWX0RJUiwgQkxLVEFQX0RFVl9OQU1FKSA9PSAtMSkKKyAgICAgICAgICAgICAg ICBnb3RvIG9wZW5fZmFpbGVkOwogCWlmICgocmV0ID0geGNfZmluZF9kZXZpY2VfbnVtYmVyKCJi bGt0YXAwIikpIDwgMCkgewogCQlEUFJJTlRGKCJjb3VsZG4ndCBmaW5kIGRldmljZSBudW1iZXIg Zm9yICdibGt0YXAwJ1xuIik7CiAJCWdvdG8gb3Blbl9mYWlsZWQ7CmRpZmYgLXJ1IHhlbi11bnN0 YWJsZS5oZy90b29scy9ibGt0YXAvZHJpdmVycy9ibG9jay1xY293LmMgeGVuLXVuc3RhYmxlL3Rv b2xzL2Jsa3RhcC9kcml2ZXJzL2Jsb2NrLXFjb3cuYwotLS0geGVuLXVuc3RhYmxlLmhnL3Rvb2xz L2Jsa3RhcC9kcml2ZXJzL2Jsb2NrLXFjb3cuYwkyMDA3LTA2LTA4IDE0OjI5OjU0LjAwMDAwMDAw MCAtMDYwMAorKysgeGVuLXVuc3RhYmxlL3Rvb2xzL2Jsa3RhcC9kcml2ZXJzL2Jsb2NrLXFjb3cu YwkyMDA3LTA2LTExIDE2OjA2OjExLjAwMDAwMDAwMCAtMDYwMApAQCAtODcxLDcgKzg3MSwxMCBA QAogCX0KIAogCXMtPmZkID0gZmQ7Ci0JYXNwcmludGYoJnMtPm5hbWUsIiVzIiwgbmFtZSk7CisJ aWYgKGFzcHJpbnRmKCZzLT5uYW1lLCIlcyIsIG5hbWUpID09IC0xKSB7CisJCWNsb3NlKGZkKTsK KwkJcmV0dXJuIC0xOworCX0KIAogCUFTU0VSVChzaXplb2YoUUNvd0hlYWRlcikgKyBzaXplb2Yo UUNvd0hlYWRlcl9leHQpIDwgNTEyKTsKIApAQCAtMTE2NSw3ICsxMTY4LDcgQEAKIAkJb2Zmc2V0 ID0gc2l6ZW9mKFFDb3dIZWFkZXIpICsgc2l6ZW9mKHVpbnQzMl90KTsKIAkJbHNlZWsoZmQsIG9m ZnNldCwgU0VFS19TRVQpOwogCQlvdXQgPSBjcHVfdG9fYmUzMihja3N1bSk7Ci0JCXdyaXRlKGZk LCAmb3V0LCBzaXplb2YodWludDMyX3QpKTsKKwkJaWYgKHdyaXRlKGZkLCAmb3V0LCBzaXplb2Yo dWludDMyX3QpKSkgOwogCQljbG9zZShmZCk7CiAJfQogCmRpZmYgLXJ1IHhlbi11bnN0YWJsZS5o Zy90b29scy9ibGt0YXAvZHJpdmVycy90YXBkaXNrLmMgeGVuLXVuc3RhYmxlL3Rvb2xzL2Jsa3Rh cC9kcml2ZXJzL3RhcGRpc2suYwotLS0geGVuLXVuc3RhYmxlLmhnL3Rvb2xzL2Jsa3RhcC9kcml2 ZXJzL3RhcGRpc2suYwkyMDA3LTAzLTEyIDA5OjAxOjA0LjAwMDAwMDAwMCAtMDYwMAorKysgeGVu LXVuc3RhYmxlL3Rvb2xzL2Jsa3RhcC9kcml2ZXJzL3RhcGRpc2suYwkyMDA3LTA2LTExIDE2OjA2 OjExLjAwMDAwMDAwMCAtMDYwMApAQCAtMjIwLDcgKzIyMCw4IEBACiAJZmRfbGlzdF9lbnRyeV90 ICpwdHI7CiAJaW50IHBhZ2Vfc2l6ZTsKIAotCWFzcHJpbnRmKCZkZXZuYW1lLCIlcy8lcyVkIiwg QkxLVEFQX0RFVl9ESVIsIEJMS1RBUF9ERVZfTkFNRSwgbWlub3IpOworCWlmIChhc3ByaW50Zigm ZGV2bmFtZSwiJXMvJXMlZCIsIEJMS1RBUF9ERVZfRElSLCBCTEtUQVBfREVWX05BTUUsIG1pbm9y KSA9PSAtMSkKKwkJcmV0dXJuIC0xOwogCXRhcF9mZCA9IG9wZW4oZGV2bmFtZSwgT19SRFdSKTsK IAlpZiAodGFwX2ZkID09IC0xKSAKIAl7CmRpZmYgLXJ1IHhlbi11bnN0YWJsZS5oZy90b29scy9i bGt0YXAvbGliL3hlbmJ1cy5jIHhlbi11bnN0YWJsZS90b29scy9ibGt0YXAvbGliL3hlbmJ1cy5j Ci0tLSB4ZW4tdW5zdGFibGUuaGcvdG9vbHMvYmxrdGFwL2xpYi94ZW5idXMuYwkyMDA3LTAzLTEy IDA5OjAxOjA0LjAwMDAwMDAwMCAtMDYwMAorKysgeGVuLXVuc3RhYmxlL3Rvb2xzL2Jsa3RhcC9s aWIveGVuYnVzLmMJMjAwNy0wNi0xMSAxNjowNjoxMS4wMDAwMDAwMDAgLTA2MDAKQEAgLTM2MCw4 ICszNjAsNyBAQAogCWNoYXIgKnBhdGg7CiAJc3RydWN0IHhlbmJ1c193YXRjaCAqdmJkX3dhdGNo OwogCQotCWFzcHJpbnRmKCZwYXRoLCAiL2xvY2FsL2RvbWFpbi8lcy9iYWNrZW5kL3RhcCIsIGRv bWlkKTsKLQlpZiAocGF0aCA9PSBOVUxMKSAKKwlpZiAoYXNwcmludGYoJnBhdGgsICIvbG9jYWwv ZG9tYWluLyVzL2JhY2tlbmQvdGFwIiwgZG9taWQpID09IC0xKQogCQlyZXR1cm4gLUVOT01FTTsK IAkKIAl2YmRfd2F0Y2ggPSAoc3RydWN0IHhlbmJ1c193YXRjaCAqKW1hbGxvYyhzaXplb2Yoc3Ry dWN0IHhlbmJ1c193YXRjaCkpOwpAQCAtMzk5LDggKzM5OCw3IEBACiAJc3RydWN0IHhlbmJ1c193 YXRjaCAqZG9taWRfd2F0Y2g7CiAJY2hhciAqcGF0aCA9IE5VTEw7CiAKLQlhc3ByaW50ZigmcGF0 aCwgIi9sb2NhbC9kb21haW4iKTsKLQlpZiAocGF0aCA9PSBOVUxMKSAKKwlpZiAoYXNwcmludGYo JnBhdGgsICIvbG9jYWwvZG9tYWluIikgPT0gLTEpCiAJCXJldHVybiAtRU5PTUVNOwogCiAJZG9t aWRfd2F0Y2ggPSBtYWxsb2Moc2l6ZW9mKHN0cnVjdCB4ZW5idXNfd2F0Y2gpKTsKZGlmZiAtcnUg eGVuLXVuc3RhYmxlLmhnL3Rvb2xzL2Jsa3RhcC9saWIveHNfYXBpLmMgeGVuLXVuc3RhYmxlL3Rv b2xzL2Jsa3RhcC9saWIveHNfYXBpLmMKLS0tIHhlbi11bnN0YWJsZS5oZy90b29scy9ibGt0YXAv bGliL3hzX2FwaS5jCTIwMDctMDItMjEgMTM6NDI6MTAuMDAwMDAwMDAwIC0wNzAwCisrKyB4ZW4t dW5zdGFibGUvdG9vbHMvYmxrdGFwL2xpYi94c19hcGkuYwkyMDA3LTA2LTExIDE2OjA2OjQyLjAw MDAwMDAwMCAtMDYwMApAQCAtMTI2LDEwICsxMjYsMTIgQEAKIAlyZXQgPSB2YXNwcmludGYoJmJ1 ZiwgZm10LCBhcCk7CiAJdmFfZW5kKGFwKTsKIAkKLQlhc3ByaW50ZigmcGF0aCwgIiVzLyVzIiwg ZGlyLCBub2RlKTsKLQkKLQlpZiAoKHBhdGggPT0gTlVMTCkgfHwgKGJ1ZiA9PSBOVUxMKSkKLQkJ cmV0dXJuIDA7CisJaWYgKHJldCA9PSAtMSkKKwkJcmV0dXJuIEVOT01FTTsKKwlpZiAoYXNwcmlu dGYoJnBhdGgsICIlcy8lcyIsIGRpciwgbm9kZSkgPT0gLTEpIHsKKwkJZnJlZShidWYpOworCQly ZXR1cm4gRU5PTUVNOworCX0KIAogCXJldCA9IHhzX3dyaXRlKGgsIFhCVF9OVUxMLCBwYXRoLCBi dWYsIHN0cmxlbihidWYpKzEpOwogCQpAQCAtMTgwLDEwICsxODIsMTEgQEAKIAkKIAllID0geHNf ZGlyZWN0b3J5KGgsIHh0aCwgIi9sb2NhbC9kb21haW4iLCAmbnVtKTsKIAlpZiAoZSA9PSBOVUxM KQotCQlyZXR1cm4gTlVMTDsKKwkJZ290byBkb25lOwogCiAJZm9yIChpID0gMDsgKGkgPCBudW0p ICYmIChkb21pZCA9PSBOVUxMKTsgaSsrKSB7Ci0JCWFzcHJpbnRmKCZwYXRoLCAiL2xvY2FsL2Rv bWFpbi8lcy9uYW1lIiwgZVtpXSk7CisJCWlmIChhc3ByaW50ZigmcGF0aCwgIi9sb2NhbC9kb21h aW4vJXMvbmFtZSIsIGVbaV0pID09IC0xKQorCQkJYnJlYWs7CiAJCXZhbCA9IHhzX3JlYWQoaCwg eHRoLCBwYXRoLCAmbGVuKTsKIAkJZnJlZShwYXRoKTsKIAkJaWYgKHZhbCA9PSBOVUxMKQpAQCAt MTkxLDI5ICsxOTQsMzEgQEAKIAkJCiAJCWlmIChzdHJjbXAodmFsLCBET01OQU1FKSA9PSAwKSB7 CiAJCQkvKiBtYXRjaCEgKi8KLQkJCWFzcHJpbnRmKCZwYXRoLCAiL2xvY2FsL2RvbWFpbi8lcy9k b21pZCIsIGVbaV0pOworCQkJaWYgKGFzcHJpbnRmKCZwYXRoLCAiL2xvY2FsL2RvbWFpbi8lcy9k b21pZCIsIGVbaV0pID09IC0xKSB7CisJCQkJZnJlZSh2YWwpOworCQkJCWJyZWFrOworCQkJfQog CQkJZG9taWQgPSB4c19yZWFkKGgsIHh0aCwgcGF0aCwgJmxlbik7CiAJCQlmcmVlKHBhdGgpOwog CQl9CiAJCWZyZWUodmFsKTsKIAl9Citkb25lOgogCXhzX3RyYW5zYWN0aW9uX2VuZChoLCB4dGgs IDApOwotCQotCWZyZWUoZSk7CisJaWYgKGUpCisJCWZyZWUoZSk7CiAJcmV0dXJuIGRvbWlkOwog fQogCiBpbnQgY29udmVydF9kZXZfbmFtZV90b19udW0oY2hhciAqbmFtZSkgewotCWNoYXIgKnBf c2QsICpwX2hkLCAqcF94dmQsICpwX3BseCwgKnAsICphbHBoYSwqcHRyOworCWNoYXIgKnAsICpw dHI7CiAJaW50IG1ham9yc1sxMF0gPSB7MywyMiwzMywzNCw1Niw1Nyw4OCw4OSw5MCw5MX07CiAJ aW50IG1haixpLHJldCA9IDA7Ci0KLQlhc3ByaW50ZigmcF9zZCwiL2Rldi9zZCIpOwotCWFzcHJp bnRmKCZwX2hkLCIvZGV2L2hkIik7Ci0JYXNwcmludGYoJnBfeHZkLCIvZGV2L3h2ZCIpOwotCWFz cHJpbnRmKCZwX3BseCwicGx4Iik7Ci0JYXNwcmludGYoJmFscGhhLCJhYmNkZWZnaGlqa2xtbm9w Iik7Ci0JCisJY2hhciAqcF9zZCA9ICIvZGV2L3NkIjsKKwljaGFyICpwX2hkID0gIi9kZXYvaGQi OworCWNoYXIgKnBfeHZkID0gIi9kZXYveHZkIjsKKwljaGFyICpwX3BseCA9ICJwbHgiOworCWNo YXIgKmFscGhhID0gImFiY2RlZmdoaWprbG1ub3AiOwogCiAJaWYgKHN0cnN0cihuYW1lLCBwX3Nk KSAhPSBOVUxMKSB7CiAJCXAgPSBuYW1lICsgc3RybGVuKHBfc2QpOwpAQCAtMjUxLDEyICsyNTYs NiBAQAogCQlyZXQgPSBCQVNFX0RFVl9WQUw7CiAJfQogCi0JZnJlZShwX3NkKTsKLQlmcmVlKHBf aGQpOwotCWZyZWUocF94dmQpOwotCWZyZWUocF9wbHgpOwotCWZyZWUoYWxwaGEpOwotCiAJcmV0 dXJuIHJldDsKIH0KIApkaWZmIC1ydSB4ZW4tdW5zdGFibGUuaGcvdG9vbHMvY29uc29sZS9kYWVt b24vaW8uYyB4ZW4tdW5zdGFibGUvdG9vbHMvY29uc29sZS9kYWVtb24vaW8uYwotLS0geGVuLXVu c3RhYmxlLmhnL3Rvb2xzL2NvbnNvbGUvZGFlbW9uL2lvLmMJMjAwNy0wNi0xMSAxNToxNDozNS4w MDAwMDAwMDAgLTA2MDAKKysrIHhlbi11bnN0YWJsZS90b29scy9jb25zb2xlL2RhZW1vbi9pby5j CTIwMDctMDYtMTEgMTY6MDY6MTEuMDAwMDAwMDAwIC0wNjAwCkBAIC0zMDMsNyArMzAzLDEwIEBA CiAJCXZvaWQgKnJlc3VsdCA9IHZhX2FyZyhhcCwgdm9pZCAqKTsKIAkJY2hhciAqcDsKIAotCQlh c3ByaW50ZigmcGF0aCwgIiVzLyVzIiwgZGlyLCBuYW1lKTsKKwkJaWYgKGFzcHJpbnRmKCZwYXRo LCAiJXMvJXMiLCBkaXIsIG5hbWUpID09IC0xKSB7CisJCQlyZXQgPSBFTk9NRU07CisJCQlicmVh azsKKwkJfQogCQlwID0geHNfcmVhZCh4cywgWEJUX05VTEwsIHBhdGgsIE5VTEwpOwogCQlmcmVl KHBhdGgpOwogCQlpZiAocCA9PSBOVUxMKSB7Cg== --=__PartAB8C8D23.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --=__PartAB8C8D23.0__=--