From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Tvrtko Ursulin Date: Mon, 20 May 2019 15:47:25 +0100 Message-Id: <20190520144739.13111-14-tvrtko.ursulin@linux.intel.com> In-Reply-To: <20190520144739.13111-1-tvrtko.ursulin@linux.intel.com> References: <20190520144739.13111-1-tvrtko.ursulin@linux.intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t 13/27] gem_wsim: Save some lines by changing to implicit NULL checking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org Cc: Intel-gfx@lists.freedesktop.org, Tvrtko Ursulin List-ID: RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCldlIGNhbiBp bXByb3ZlIHRoZSBwYXJzaW5nIGxvb3AgcmVhZGFiaWxpdHkgYSBiaXQgbW9yZSBieSBhdm9pZGlu ZyBzb21lCmxpbmUgYnJlYWtzIGNhdXNlZCBieSBleHBsaWNpdCBOVUxMIGNoZWNrcy4KClNpZ25l ZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+ClJldmll d2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBiZW5j aG1hcmtzL2dlbV93c2ltLmMgfCAzOSArKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9iZW5jaG1hcmtzL2dlbV93c2ltLmMgYi9iZW5jaG1hcmtzL2dlbV93c2lt LmMKaW5kZXggZTViMTJlMzc0OTBlLi5iYWEzODljM2YwZTcgMTAwNjQ0Ci0tLSBhL2JlbmNobWFy a3MvZ2VtX3dzaW0uYworKysgYi9iZW5jaG1hcmtzL2dlbV93c2ltLmMKQEAgLTM5MSw3ICszOTEs NyBAQCBwYXJzZV93b3JrbG9hZChzdHJ1Y3Qgd19hcmcgKmFyZywgdW5zaWduZWQgaW50IGZsYWdz LCBzdHJ1Y3Qgd29ya2xvYWQgKmFwcF93KQogCiAJaWd0X2Fzc2VydChkZXNjKTsKIAotCXdoaWxl ICgoX3Rva2VuID0gc3RydG9rX3IodHN0YXJ0LCAiLCIsICZ0Y3R4KSkgIT0gTlVMTCkgeworCXdo aWxlICgoX3Rva2VuID0gc3RydG9rX3IodHN0YXJ0LCAiLCIsICZ0Y3R4KSkpIHsKIAkJdHN0YXJ0 ID0gTlVMTDsKIAkJdG9rZW4gPSBzdHJkdXAoX3Rva2VuKTsKIAkJaWd0X2Fzc2VydCh0b2tlbik7 CkBAIC0zOTksMTIgKzM5OSwxMSBAQCBwYXJzZV93b3JrbG9hZChzdHJ1Y3Qgd19hcmcgKmFyZywg dW5zaWduZWQgaW50IGZsYWdzLCBzdHJ1Y3Qgd29ya2xvYWQgKmFwcF93KQogCQl2YWxpZCA9IDA7 CiAJCW1lbXNldCgmc3RlcCwgMCwgc2l6ZW9mKHN0ZXApKTsKIAotCQlpZiAoKGZpZWxkID0gc3Ry dG9rX3IoZnN0YXJ0LCAiLiIsICZmY3R4KSkgIT0gTlVMTCkgeworCQlpZiAoKGZpZWxkID0gc3Ry dG9rX3IoZnN0YXJ0LCAiLiIsICZmY3R4KSkpIHsKIAkJCWZzdGFydCA9IE5VTEw7CiAKIAkJCWlm ICghc3RyY21wKGZpZWxkLCAiZCIpKSB7Ci0JCQkJaWYgKChmaWVsZCA9IHN0cnRva19yKGZzdGFy dCwgIi4iLCAmZmN0eCkpICE9Ci0JCQkJICAgIE5VTEwpIHsKKwkJCQlpZiAoKGZpZWxkID0gc3Ry dG9rX3IoZnN0YXJ0LCAiLiIsICZmY3R4KSkpIHsKIAkJCQkJdG1wID0gYXRvaShmaWVsZCk7CiAJ CQkJCWNoZWNrX2FyZyh0bXAgPD0gMCwKIAkJCQkJCSAgIkludmFsaWQgZGVsYXkgYXQgc3RlcCAl dSFcbiIsCkBAIC00MTQsOCArNDEzLDcgQEAgcGFyc2Vfd29ya2xvYWQoc3RydWN0IHdfYXJnICph cmcsIHVuc2lnbmVkIGludCBmbGFncywgc3RydWN0IHdvcmtsb2FkICphcHBfdykKIAkJCQkJZ290 byBhZGRfc3RlcDsKIAkJCQl9CiAJCQl9IGVsc2UgaWYgKCFzdHJjbXAoZmllbGQsICJwIikpIHsK LQkJCQlpZiAoKGZpZWxkID0gc3RydG9rX3IoZnN0YXJ0LCAiLiIsICZmY3R4KSkgIT0KLQkJCQkg ICAgTlVMTCkgeworCQkJCWlmICgoZmllbGQgPSBzdHJ0b2tfcihmc3RhcnQsICIuIiwgJmZjdHgp KSkgewogCQkJCQl0bXAgPSBhdG9pKGZpZWxkKTsKIAkJCQkJY2hlY2tfYXJnKHRtcCA8PSAwLAog CQkJCQkJICAiSW52YWxpZCBwZXJpb2QgYXQgc3RlcCAldSFcbiIsCkBAIC00MjYsOCArNDI0LDcg QEAgcGFyc2Vfd29ya2xvYWQoc3RydWN0IHdfYXJnICphcmcsIHVuc2lnbmVkIGludCBmbGFncywg c3RydWN0IHdvcmtsb2FkICphcHBfdykKIAkJCQl9CiAJCQl9IGVsc2UgaWYgKCFzdHJjbXAoZmll bGQsICJQIikpIHsKIAkJCQl1bnNpZ25lZCBpbnQgbnIgPSAwOwotCQkJCXdoaWxlICgoZmllbGQg PSBzdHJ0b2tfcihmc3RhcnQsICIuIiwgJmZjdHgpKSAhPQotCQkJCSAgICBOVUxMKSB7CisJCQkJ d2hpbGUgKChmaWVsZCA9IHN0cnRva19yKGZzdGFydCwgIi4iLCAmZmN0eCkpKSB7CiAJCQkJCXRt cCA9IGF0b2koZmllbGQpOwogCQkJCQljaGVja19hcmcobnIgPT0gMCAmJiB0bXAgPD0gMCwKIAkJ CQkJCSAgIkludmFsaWQgY29udGV4dCBhdCBzdGVwICV1IVxuIiwKQEAgLTQ0Nyw4ICs0NDQsNyBA QCBwYXJzZV93b3JrbG9hZChzdHJ1Y3Qgd19hcmcgKmFyZywgdW5zaWduZWQgaW50IGZsYWdzLCBz dHJ1Y3Qgd29ya2xvYWQgKmFwcF93KQogCQkJCXN0ZXAudHlwZSA9IENUWF9QUklPUklUWTsKIAkJ CQlnb3RvIGFkZF9zdGVwOwogCQkJfSBlbHNlIGlmICghc3RyY21wKGZpZWxkLCAicyIpKSB7Ci0J CQkJaWYgKChmaWVsZCA9IHN0cnRva19yKGZzdGFydCwgIi4iLCAmZmN0eCkpICE9Ci0JCQkJICAg IE5VTEwpIHsKKwkJCQlpZiAoKGZpZWxkID0gc3RydG9rX3IoZnN0YXJ0LCAiLiIsICZmY3R4KSkp IHsKIAkJCQkJdG1wID0gYXRvaShmaWVsZCk7CiAJCQkJCWNoZWNrX2FyZyh0bXAgPj0gMCB8fAog CQkJCQkJICAoKGludClucl9zdGVwcyArIHRtcCkgPCAwLApAQCAtNDU5LDggKzQ1NSw3IEBAIHBh cnNlX3dvcmtsb2FkKHN0cnVjdCB3X2FyZyAqYXJnLCB1bnNpZ25lZCBpbnQgZmxhZ3MsIHN0cnVj dCB3b3JrbG9hZCAqYXBwX3cpCiAJCQkJCWdvdG8gYWRkX3N0ZXA7CiAJCQkJfQogCQkJfSBlbHNl IGlmICghc3RyY21wKGZpZWxkLCAidCIpKSB7Ci0JCQkJaWYgKChmaWVsZCA9IHN0cnRva19yKGZz dGFydCwgIi4iLCAmZmN0eCkpICE9Ci0JCQkJICAgIE5VTEwpIHsKKwkJCQlpZiAoKGZpZWxkID0g c3RydG9rX3IoZnN0YXJ0LCAiLiIsICZmY3R4KSkpIHsKIAkJCQkJdG1wID0gYXRvaShmaWVsZCk7 CiAJCQkJCWNoZWNrX2FyZyh0bXAgPCAwLAogCQkJCQkJICAiSW52YWxpZCB0aHJvdHRsZSBhdCBz dGVwICV1IVxuIiwKQEAgLTQ3MCw4ICs0NjUsNyBAQCBwYXJzZV93b3JrbG9hZChzdHJ1Y3Qgd19h cmcgKmFyZywgdW5zaWduZWQgaW50IGZsYWdzLCBzdHJ1Y3Qgd29ya2xvYWQgKmFwcF93KQogCQkJ CQlnb3RvIGFkZF9zdGVwOwogCQkJCX0KIAkJCX0gZWxzZSBpZiAoIXN0cmNtcChmaWVsZCwgInEi KSkgewotCQkJCWlmICgoZmllbGQgPSBzdHJ0b2tfcihmc3RhcnQsICIuIiwgJmZjdHgpKSAhPQot CQkJCSAgICBOVUxMKSB7CisJCQkJaWYgKChmaWVsZCA9IHN0cnRva19yKGZzdGFydCwgIi4iLCAm ZmN0eCkpKSB7CiAJCQkJCXRtcCA9IGF0b2koZmllbGQpOwogCQkJCQljaGVja19hcmcodG1wIDwg MCwKIAkJCQkJCSAgIkludmFsaWQgcWQgdGhyb3R0bGUgYXQgc3RlcCAldSFcbiIsCkBAIC00ODEs OCArNDc1LDcgQEAgcGFyc2Vfd29ya2xvYWQoc3RydWN0IHdfYXJnICphcmcsIHVuc2lnbmVkIGlu dCBmbGFncywgc3RydWN0IHdvcmtsb2FkICphcHBfdykKIAkJCQkJZ290byBhZGRfc3RlcDsKIAkJ CQl9CiAJCQl9IGVsc2UgaWYgKCFzdHJjbXAoZmllbGQsICJhIikpIHsKLQkJCQlpZiAoKGZpZWxk ID0gc3RydG9rX3IoZnN0YXJ0LCAiLiIsICZmY3R4KSkgIT0KLQkJCQkgICAgTlVMTCkgeworCQkJ CWlmICgoZmllbGQgPSBzdHJ0b2tfcihmc3RhcnQsICIuIiwgJmZjdHgpKSkgewogCQkJCQl0bXAg PSBhdG9pKGZpZWxkKTsKIAkJCQkJY2hlY2tfYXJnKHRtcCA+PSAwLAogCQkJCQkJICAiSW52YWxp ZCBzdyBmZW5jZSBzaWduYWwgYXQgc3RlcCAldSFcbiIsCkBAIC00OTYsOCArNDg5LDcgQEAgcGFy c2Vfd29ya2xvYWQoc3RydWN0IHdfYXJnICphcmcsIHVuc2lnbmVkIGludCBmbGFncywgc3RydWN0 IHdvcmtsb2FkICphcHBfdykKIAkJCQlnb3RvIGFkZF9zdGVwOwogCQkJfSBlbHNlIGlmICghc3Ry Y21wKGZpZWxkLCAiTSIpKSB7CiAJCQkJdW5zaWduZWQgaW50IG5yID0gMDsKLQkJCQl3aGlsZSAo KGZpZWxkID0gc3RydG9rX3IoZnN0YXJ0LCAiLiIsICZmY3R4KSkgIT0KLQkJCQkgICAgTlVMTCkg eworCQkJCXdoaWxlICgoZmllbGQgPSBzdHJ0b2tfcihmc3RhcnQsICIuIiwgJmZjdHgpKSkgewog CQkJCQl0bXAgPSBhdG9pKGZpZWxkKTsKIAkJCQkJY2hlY2tfYXJnKG5yID09IDAgJiYgdG1wIDw9 IDAsCiAJCQkJCQkgICJJbnZhbGlkIGNvbnRleHQgYXQgc3RlcCAldSFcbiIsCkBAIC01MjMsOCAr NTE1LDcgQEAgcGFyc2Vfd29ya2xvYWQoc3RydWN0IHdfYXJnICphcmcsIHVuc2lnbmVkIGludCBm bGFncywgc3RydWN0IHdvcmtsb2FkICphcHBfdykKIAkJCQlnb3RvIGFkZF9zdGVwOwogCQkJfSBl bHNlIGlmICghc3RyY21wKGZpZWxkLCAiWCIpKSB7CiAJCQkJdW5zaWduZWQgaW50IG5yID0gMDsK LQkJCQl3aGlsZSAoKGZpZWxkID0gc3RydG9rX3IoZnN0YXJ0LCAiLiIsICZmY3R4KSkgIT0KLQkJ CQkgICAgTlVMTCkgeworCQkJCXdoaWxlICgoZmllbGQgPSBzdHJ0b2tfcihmc3RhcnQsICIuIiwg JmZjdHgpKSkgewogCQkJCQl0bXAgPSBhdG9pKGZpZWxkKTsKIAkJCQkJY2hlY2tfYXJnKG5yID09 IDAgJiYgdG1wIDw9IDAsCiAJCQkJCQkgICJJbnZhbGlkIGNvbnRleHQgYXQgc3RlcCAldSFcbiIs CkBAIC01NjQsNyArNTU1LDcgQEAgcGFyc2Vfd29ya2xvYWQoc3RydWN0IHdfYXJnICphcmcsIHVu c2lnbmVkIGludCBmbGFncywgc3RydWN0IHdvcmtsb2FkICphcHBfdykKIAkJCXZhbGlkKys7CiAJ CX0KIAotCQlpZiAoKGZpZWxkID0gc3RydG9rX3IoZnN0YXJ0LCAiLiIsICZmY3R4KSkgIT0gTlVM TCkgeworCQlpZiAoKGZpZWxkID0gc3RydG9rX3IoZnN0YXJ0LCAiLiIsICZmY3R4KSkpIHsKIAkJ CWZzdGFydCA9IE5VTEw7CiAKIAkJCWkgPSBzdHJfdG9fZW5naW5lKGZpZWxkKTsKQEAgLTU3OSw3 ICs1NzAsNyBAQCBwYXJzZV93b3JrbG9hZChzdHJ1Y3Qgd19hcmcgKmFyZywgdW5zaWduZWQgaW50 IGZsYWdzLCBzdHJ1Y3Qgd29ya2xvYWQgKmFwcF93KQogCQkJCWJjc191c2VkID0gdHJ1ZTsKIAkJ fQogCi0JCWlmICgoZmllbGQgPSBzdHJ0b2tfcihmc3RhcnQsICIuIiwgJmZjdHgpKSAhPSBOVUxM KSB7CisJCWlmICgoZmllbGQgPSBzdHJ0b2tfcihmc3RhcnQsICIuIiwgJmZjdHgpKSkgewogCQkJ Y2hhciAqc2VwID0gTlVMTDsKIAkJCWxvbmcgaW50IHRtcGw7CiAKQEAgLTYwNyw3ICs1OTgsNyBA QCBwYXJzZV93b3JrbG9hZChzdHJ1Y3Qgd19hcmcgKmFyZywgdW5zaWduZWQgaW50IGZsYWdzLCBz dHJ1Y3Qgd29ya2xvYWQgKmFwcF93KQogCQkJdmFsaWQrKzsKIAkJfQogCi0JCWlmICgoZmllbGQg PSBzdHJ0b2tfcihmc3RhcnQsICIuIiwgJmZjdHgpKSAhPSBOVUxMKSB7CisJCWlmICgoZmllbGQg PSBzdHJ0b2tfcihmc3RhcnQsICIuIiwgJmZjdHgpKSkgewogCQkJZnN0YXJ0ID0gTlVMTDsKIAog CQkJdG1wID0gcGFyc2VfZGVwZW5kZW5jaWVzKG5yX3N0ZXBzLCAmc3RlcCwgZmllbGQpOwpAQCAt NjE3LDcgKzYwOCw3IEBAIHBhcnNlX3dvcmtsb2FkKHN0cnVjdCB3X2FyZyAqYXJnLCB1bnNpZ25l ZCBpbnQgZmxhZ3MsIHN0cnVjdCB3b3JrbG9hZCAqYXBwX3cpCiAJCQl2YWxpZCsrOwogCQl9CiAK LQkJaWYgKChmaWVsZCA9IHN0cnRva19yKGZzdGFydCwgIi4iLCAmZmN0eCkpICE9IE5VTEwpIHsK KwkJaWYgKChmaWVsZCA9IHN0cnRva19yKGZzdGFydCwgIi4iLCAmZmN0eCkpKSB7CiAJCQlmc3Rh cnQgPSBOVUxMOwogCiAJCQljaGVja19hcmcoc3RybGVuKGZpZWxkKSAhPSAxIHx8Ci0tIAoyLjIw LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmlndC1k ZXYgbWFpbGluZyBsaXN0CmlndC1kZXZAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaWd0LWRldg==