From: "Charles Coffing" Subject: [PATCH] compile errors in blktap Date: Thu, 17 May 2007 15:34:08 -0400 Message-ID: <464C58BC.D169.003C.0@novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__PartECCBEB20.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 --=__PartECCBEB20.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline When compiling the various blktap drivers with warnings cranked up, I get errors that return values are not checked. The attached patch adds error checking to properly fix several error paths. It applies against xen-unstable. Signed-off-by: Charles Coffing --=__PartECCBEB20.0__= Content-Type: application/octet-stream; name="blktap-warnings.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="blktap-warnings.diff" SW5kZXg6IHhlbi0zLjEtdGVzdGluZy90b29scy9ibGt0YXAvZHJpdmVycy9ibGt0YXBjdHJsLmMK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0geGVuLTMuMS10ZXN0aW5nLm9yaWcvdG9vbHMvYmxrdGFwL2RyaXZlcnMv YmxrdGFwY3RybC5jCisrKyB4ZW4tMy4xLXRlc3RpbmcvdG9vbHMvYmxrdGFwL2RyaXZlcnMvYmxr dGFwY3RybC5jCkBAIC02NzgsNyArNjc4LDEwIEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyICph cmd2W10pCiAJX19pbml0X2Jsa2lmKCk7CiAJc25wcmludGYoYnVmLCBzaXplb2YoYnVmKSwgIkJM S1RBUENUUkxbJWRdIiwgZ2V0cGlkKCkpOwogCW9wZW5sb2coYnVmLCBMT0dfQ09OU3xMT0dfT0RF TEFZLCBMT0dfREFFTU9OKTsKLQlkYWVtb24oMCwwKTsKKwlpZiAoZGFlbW9uKDAsMCkpIHsKKwkJ RFBSSU5URigiZGFlbW9uIGZhaWxlZCAoJWQpXG4iLCBlcnJubyk7CisJCWdvdG8gb3Blbl9mYWls ZWQ7CisJfQogCiAJcHJpbnRfZHJpdmVycygpOwogCWluaXRfZHJpdmVyX2xpc3QoKTsKSW5kZXg6 IHhlbi0zLjEtdGVzdGluZy90b29scy9ibGt0YXAvZHJpdmVycy9ibG9jay12bWRrLmMKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0geGVuLTMuMS10ZXN0aW5nLm9yaWcvdG9vbHMvYmxrdGFwL2RyaXZlcnMvYmxvY2st dm1kay5jCisrKyB4ZW4tMy4xLXRlc3RpbmcvdG9vbHMvYmxrdGFwL2RyaXZlcnMvYmxvY2stdm1k ay5jCkBAIC0yODMsOCArMjgzLDkgQEAgc3RhdGljIHVpbnQ2NF90IGdldF9jbHVzdGVyX29mZnNl dChzdHJ1YwogICAgICAgICAJaWYgKCFhbGxvY2F0ZSkKICAgICAgICAgICAgIAkJcmV0dXJuIDA7 CiAgICAgICAgIAljbHVzdGVyX29mZnNldCA9IGxzZWVrKHBydi0+ZmQsIDAsIFNFRUtfRU5EKTsK LSAgICAgICAgCWZ0cnVuY2F0ZShwcnYtPmZkLCBjbHVzdGVyX29mZnNldCArIAotCQkJICAocHJ2 LT5jbHVzdGVyX3NlY3RvcnMgPDwgOSkpOworICAgICAgICAJaWYgKGZ0cnVuY2F0ZShwcnYtPmZk LCBjbHVzdGVyX29mZnNldCArIAorCQkJICAgICAgKHBydi0+Y2x1c3Rlcl9zZWN0b3JzIDw8IDkp KSkKKwkJCXJldHVybiAwOwogICAgICAgICAJY2x1c3Rlcl9vZmZzZXQgPj49IDk7CiAgICAgICAg IAkvKiB1cGRhdGUgTDIgdGFibGUgKi8KICAgICAgICAgCXRtcCA9IGNwdV90b19sZTMyKGNsdXN0 ZXJfb2Zmc2V0KTsKSW5kZXg6IHhlbi0zLjEtdGVzdGluZy90b29scy9ibGt0YXAvZHJpdmVycy9i bG9jay1xY293LmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0geGVuLTMuMS10ZXN0aW5nLm9yaWcvdG9vbHMvYmxr dGFwL2RyaXZlcnMvYmxvY2stcWNvdy5jCisrKyB4ZW4tMy4xLXRlc3RpbmcvdG9vbHMvYmxrdGFw L2RyaXZlcnMvYmxvY2stcWNvdy5jCkBAIC03NDUsNyArNzQ1LDEwIEBAIGZvdW5kOgogCQl9CiAJ CW1lbWNweSh0bXBfcHRyMiwgbDJfcHRyLCA0MDk2KTsKIAkJbHNlZWsocy0+ZmQsIGwyX29mZnNl dCArIChsMl9zZWN0b3IgPDwgMTIpLCBTRUVLX1NFVCk7Ci0JCXdyaXRlKHMtPmZkLCB0bXBfcHRy MiwgNDA5Nik7CisJCWlmICh3cml0ZShzLT5mZCwgdG1wX3B0cjIsIDQwOTYpICE9IDQwOTYpIHsK KwkJCWZyZWUodG1wX3B0cjIpOworCQkJcmV0dXJuIC0xOworCQl9CiAJCWZyZWUodG1wX3B0cjIp OwogCX0KIAlyZXR1cm4gY2x1c3Rlcl9vZmZzZXQ7CkBAIC0xMjUyLDggKzEyNTUsOCBAQCBpbnQg cWNvd19jcmVhdGUoY29uc3QgY2hhciAqZmlsZW5hbWUsIHVpCiAJCQkJc3RybmNweShiYWNraW5n X2ZpbGVuYW1lLCBiYWNraW5nX2ZpbGUsCiAJCQkJCXNpemVvZihiYWNraW5nX2ZpbGVuYW1lKSk7 CiAJCQl9IGVsc2UgewotCQkJCXJlYWxwYXRoKGJhY2tpbmdfZmlsZSwgYmFja2luZ19maWxlbmFt ZSk7Ci0JCQkJaWYgKHN0YXQoYmFja2luZ19maWxlbmFtZSwgJnN0KSAhPSAwKSB7CisJCQkJaWYg KHJlYWxwYXRoKGJhY2tpbmdfZmlsZSwgYmFja2luZ19maWxlbmFtZSkgPT0gTlVMTCB8fAorCQkJ CSAgICBzdGF0KGJhY2tpbmdfZmlsZW5hbWUsICZzdCkgIT0gMCkgewogCQkJCQlyZXR1cm4gLTE7 CiAJCQkJfQogCQkJfQo= --=__PartECCBEB20.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 --=__PartECCBEB20.0__=--