From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: MIME-Version: 1.0 Date: Thu, 11 Feb 2010 19:06:32 -0200 Message-ID: Subject: [PATCH] g_dbus_remove_watch function From: Claudio Takahasi To: BlueZ development Content-Type: multipart/mixed; boundary=000e0cd70ca882a821047f598625 Sender: linux-bluetooth-owner@vger.kernel.org List-ID: --000e0cd70ca882a821047f598625 Content-Type: text/plain; charset=UTF-8 this patch removes an unnecessary argument(D-Bus connection) of g_dbus_remove_watch. Cheers, Claudio --000e0cd70ca882a821047f598625 Content-Type: application/octet-stream; name="0001-Remove-D-Bus-connection-argument-of-g_dbus_remove_wa.patch" Content-Disposition: attachment; filename="0001-Remove-D-Bus-connection-argument-of-g_dbus_remove_wa.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_g5k1emz70 RnJvbSAxOWExYTE4YzNlZTg2MjdmMjBkN2EyOGRkMjY2Nzc4YzA3NTQ2YjhmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDbGF1ZGlvIFRha2FoYXNpIDxjbGF1ZGlvLnRha2FoYXNpQG9w ZW5ib3NzYS5vcmc+CkRhdGU6IFRodSwgMTEgRmViIDIwMTAgMTY6NDc6MzcgLTAyMDAKU3ViamVj dDogW1BBVENIIDEvMV0gUmVtb3ZlIEQtQnVzIGNvbm5lY3Rpb24gYXJndW1lbnQgb2YgZ19kYnVz X3JlbW92ZV93YXRjaCBmdW5jdGlvbgoKLS0tCiBhdWRpby9nYXRld2F5LmMgICAgICAgICB8ICAg IDIgKy0KIGF1ZGlvL3RlbGVwaG9ueS1vZm9uby5jIHwgICAgOCArKysrLS0tLQogZ2RidXMvZ2Ri dXMuaCAgICAgICAgICAgfCAgICAyICstCiBnZGJ1cy93YXRjaC5jICAgICAgICAgICB8ICAgIDIg Ky0KIG5ldHdvcmsvY29ubmVjdGlvbi5jICAgIHwgICAgNCArKy0tCiBwbHVnaW5zL3NlcnZpY2Uu YyAgICAgICB8ICAgIDQgKystLQogc2VyaWFsL3BvcnQuYyAgICAgICAgICAgfCAgIDEwICsrKysr LS0tLS0KIHNlcmlhbC9wcm94eS5jICAgICAgICAgIHwgICAgMiArLQogc3JjL2FkYXB0ZXIuYyAg ICAgICAgICAgfCAgICAyICstCiBzcmMvYWdlbnQuYyAgICAgICAgICAgICB8ICAgIDIgKy0KIHNy Yy9kZXZpY2UuYyAgICAgICAgICAgIHwgICAgNCArKy0tCiAxMSBmaWxlcyBjaGFuZ2VkLCAyMSBp bnNlcnRpb25zKCspLCAyMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9hdWRpby9nYXRld2F5 LmMgYi9hdWRpby9nYXRld2F5LmMKaW5kZXggNDZmYmI2My4uZjllMDQyOSAxMDA2NDQKLS0tIGEv YXVkaW8vZ2F0ZXdheS5jCisrKyBiL2F1ZGlvL2dhdGV3YXkuYwpAQCAtNTM0LDcgKzUzNCw3IEBA IHN0YXRpYyBEQnVzTWVzc2FnZSAqdW5yZWdpc3Rlcl9hZ2VudChEQnVzQ29ubmVjdGlvbiAqY29u biwKIAkJCQlFUlJPUl9JTlRFUkZBQ0UgIi5GYWlsZWQiLAogCQkJCSJVbmtub3duIG9iamVjdCBw YXRoIik7CiAKLQlnX2RidXNfcmVtb3ZlX3dhdGNoKGRldmljZS0+Y29ubiwgZ3ctPmFnZW50LT53 YXRjaCk7CisJZ19kYnVzX3JlbW92ZV93YXRjaChndy0+YWdlbnQtPndhdGNoKTsKIAogCWFnZW50 X2ZyZWUoZ3ctPmFnZW50KTsKIAlndy0+YWdlbnQgPSBOVUxMOwpkaWZmIC0tZ2l0IGEvYXVkaW8v dGVsZXBob255LW9mb25vLmMgYi9hdWRpby90ZWxlcGhvbnktb2Zvbm8uYwppbmRleCAzZGY3NmMz Li5jY2YzYzgwIDEwMDY0NAotLS0gYS9hdWRpby90ZWxlcGhvbnktb2Zvbm8uYworKysgYi9hdWRp by90ZWxlcGhvbnktb2Zvbm8uYwpAQCAtNzM5LDcgKzczOSw3IEBAIHN0YXRpYyB2b2lkIHZjX2Zy ZWUoc3RydWN0IHZvaWNlX2NhbGwgKnZjKQogCWlmICghdmMpCiAJCXJldHVybjsKIAotCWdfZGJ1 c19yZW1vdmVfd2F0Y2goY29ubmVjdGlvbiwgdmMtPndhdGNoKTsKKwlnX2RidXNfcmVtb3ZlX3dh dGNoKHZjLT53YXRjaCk7CiAJZ19mcmVlKHZjLT5vYmpfcGF0aCk7CiAJZ19mcmVlKHZjLT5udW1i ZXIpOwogCWdfZnJlZSh2Yyk7CkBAIC0xMDkwLDkgKzEwOTAsOSBAQCB2b2lkIHRlbGVwaG9ueV9l eGl0KHZvaWQpCiAJZ19zbGlzdF9mcmVlKGNhbGxzKTsKIAljYWxscyA9IE5VTEw7CiAKLQlnX2Ri dXNfcmVtb3ZlX3dhdGNoKGNvbm5lY3Rpb24sIHJlZ2lzdHJhdGlvbl93YXRjaCk7Ci0JZ19kYnVz X3JlbW92ZV93YXRjaChjb25uZWN0aW9uLCB2b2ljZV93YXRjaCk7Ci0JZ19kYnVzX3JlbW92ZV93 YXRjaChjb25uZWN0aW9uLCBkZXZpY2Vfd2F0Y2gpOworCWdfZGJ1c19yZW1vdmVfd2F0Y2gocmVn aXN0cmF0aW9uX3dhdGNoKTsKKwlnX2RidXNfcmVtb3ZlX3dhdGNoKHZvaWNlX3dhdGNoKTsKKwln X2RidXNfcmVtb3ZlX3dhdGNoKGRldmljZV93YXRjaCk7CiAKIAlkYnVzX2Nvbm5lY3Rpb25fdW5y ZWYoY29ubmVjdGlvbik7CiAJY29ubmVjdGlvbiA9IE5VTEw7CmRpZmYgLS1naXQgYS9nZGJ1cy9n ZGJ1cy5oIGIvZ2RidXMvZ2RidXMuaAppbmRleCA3N2I4YWVlLi5jYjgyYzdjIDEwMDY0NAotLS0g YS9nZGJ1cy9nZGJ1cy5oCisrKyBiL2dkYnVzL2dkYnVzLmgKQEAgLTEzMiw3ICsxMzIsNyBAQCBn dWludCBnX2RidXNfYWRkX3NpZ25hbF93YXRjaChEQnVzQ29ubmVjdGlvbiAqY29ubmVjdGlvbiwK IAkJCQljb25zdCBjaGFyICppbnRlcmZhY2UsIGNvbnN0IGNoYXIgKm1lbWJlciwKIAkJCQlHREJ1 c1NpZ25hbEZ1bmN0aW9uIGZ1bmN0aW9uLCB2b2lkICp1c2VyX2RhdGEsCiAJCQkJR0RCdXNEZXN0 cm95RnVuY3Rpb24gZGVzdHJveSk7Ci1nYm9vbGVhbiBnX2RidXNfcmVtb3ZlX3dhdGNoKERCdXND b25uZWN0aW9uICpjb25uZWN0aW9uLCBndWludCB0YWcpOworZ2Jvb2xlYW4gZ19kYnVzX3JlbW92 ZV93YXRjaChndWludCB0YWcpOwogdm9pZCBnX2RidXNfcmVtb3ZlX2FsbF93YXRjaGVzKERCdXND b25uZWN0aW9uICpjb25uZWN0aW9uKTsKIAogI2lmZGVmIF9fY3BsdXNwbHVzCmRpZmYgLS1naXQg YS9nZGJ1cy93YXRjaC5jIGIvZ2RidXMvd2F0Y2guYwppbmRleCA3NWU0MjEwLi40MzgyOTVkIDEw MDY0NAotLS0gYS9nZGJ1cy93YXRjaC5jCisrKyBiL2dkYnVzL3dhdGNoLmMKQEAgLTU5Nyw3ICs1 OTcsNyBAQCBndWludCBnX2RidXNfYWRkX3NpZ25hbF93YXRjaChEQnVzQ29ubmVjdGlvbiAqY29u bmVjdGlvbiwKIAlyZXR1cm4gY2ItPmlkOwogfQogCi1nYm9vbGVhbiBnX2RidXNfcmVtb3ZlX3dh dGNoKERCdXNDb25uZWN0aW9uICpjb25uZWN0aW9uLCBndWludCBpZCkKK2dib29sZWFuIGdfZGJ1 c19yZW1vdmVfd2F0Y2goZ3VpbnQgaWQpCiB7CiAJc3RydWN0IGZpbHRlcl9kYXRhICpkYXRhOwog CXN0cnVjdCBmaWx0ZXJfY2FsbGJhY2sgKmNiOwpkaWZmIC0tZ2l0IGEvbmV0d29yay9jb25uZWN0 aW9uLmMgYi9uZXR3b3JrL2Nvbm5lY3Rpb24uYwppbmRleCAzZTUyZDJhLi4xYjNjMjdjIDEwMDY0 NAotLS0gYS9uZXR3b3JrL2Nvbm5lY3Rpb24uYworKysgYi9uZXR3b3JrL2Nvbm5lY3Rpb24uYwpA QCAtMTY1LDcgKzE2NSw3IEBAIHN0YXRpYyBnYm9vbGVhbiBibmVwX3dhdGNoZG9nX2NiKEdJT0No YW5uZWwgKmNoYW4sIEdJT0NvbmRpdGlvbiBjb25kLAogCQlkZXZpY2VfcmVtb3ZlX2Rpc2Nvbm5l Y3Rfd2F0Y2gobmMtPnBlZXItPmRldmljZSwgbmMtPmRjX2lkKTsKIAkJbmMtPmRjX2lkID0gMDsK IAkJaWYgKG5jLT53YXRjaCkgewotCQkJZ19kYnVzX3JlbW92ZV93YXRjaChjb25uZWN0aW9uLCBu Yy0+d2F0Y2gpOworCQkJZ19kYnVzX3JlbW92ZV93YXRjaChuYy0+d2F0Y2gpOwogCQkJbmMtPndh dGNoID0gMDsKIAkJfQogCX0KQEAgLTE4NSw3ICsxODUsNyBAQCBzdGF0aWMgdm9pZCBjYW5jZWxf Y29ubmVjdGlvbihzdHJ1Y3QgbmV0d29ya19jb25uICpuYywgY29uc3QgY2hhciAqZXJyX21zZykK IAlEQnVzTWVzc2FnZSAqcmVwbHk7CiAKIAlpZiAobmMtPndhdGNoKSB7Ci0JCWdfZGJ1c19yZW1v dmVfd2F0Y2goY29ubmVjdGlvbiwgbmMtPndhdGNoKTsKKwkJZ19kYnVzX3JlbW92ZV93YXRjaChu Yy0+d2F0Y2gpOwogCQluYy0+d2F0Y2ggPSAwOwogCX0KIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9z ZXJ2aWNlLmMgYi9wbHVnaW5zL3NlcnZpY2UuYwppbmRleCA3N2Y4YzFhLi5lZGI0YWI3IDEwMDY0 NAotLS0gYS9wbHVnaW5zL3NlcnZpY2UuYworKysgYi9wbHVnaW5zL3NlcnZpY2UuYwpAQCAtNTAx LDcgKzUwMSw3IEBAIHN0YXRpYyBpbnQgcmVtb3ZlX3JlY29yZChEQnVzQ29ubmVjdGlvbiAqY29u biwgY29uc3QgY2hhciAqc2VuZGVyLAogCiAJZGVidWcoImxpc3RuZXJfaWQgJWQiLCB1c2VyX3Jl Y29yZC0+bGlzdGVuZXJfaWQpOwogCi0JZ19kYnVzX3JlbW92ZV93YXRjaChjb25uLCB1c2VyX3Jl Y29yZC0+bGlzdGVuZXJfaWQpOworCWdfZGJ1c19yZW1vdmVfd2F0Y2godXNlcl9yZWNvcmQtPmxp c3RlbmVyX2lkKTsKIAogCWV4aXRfY2FsbGJhY2soY29ubiwgdXNlcl9yZWNvcmQpOwogCkBAIC03 NTgsNyArNzU4LDcgQEAgc3RhdGljIHZvaWQgcGF0aF91bnJlZ2lzdGVyKHZvaWQgKmRhdGEpCiAK IAkJbmV4dCA9IGwtPm5leHQ7CiAKLQkJZ19kYnVzX3JlbW92ZV93YXRjaChjb25uZWN0aW9uLCB1 c2VyX3JlY29yZC0+bGlzdGVuZXJfaWQpOworCQlnX2RidXNfcmVtb3ZlX3dhdGNoKHVzZXJfcmVj b3JkLT5saXN0ZW5lcl9pZCk7CiAJCWV4aXRfY2FsbGJhY2soY29ubmVjdGlvbiwgdXNlcl9yZWNv cmQpOwogCX0KIApkaWZmIC0tZ2l0IGEvc2VyaWFsL3BvcnQuYyBiL3NlcmlhbC9wb3J0LmMKaW5k ZXggYjI5YWFiMy4uMjczMmNmNSAxMDA2NDQKLS0tIGEvc2VyaWFsL3BvcnQuYworKysgYi9zZXJp YWwvcG9ydC5jCkBAIC0xOTQsNyArMTk0LDcgQEAgc3RhdGljIHZvaWQgc2VyaWFsX3BvcnRfZnJl ZShzdHJ1Y3Qgc2VyaWFsX3BvcnQgKnBvcnQpCiAJc3RydWN0IHNlcmlhbF9kZXZpY2UgKmRldmlj ZSA9IHBvcnQtPmRldmljZTsKIAogCWlmIChkZXZpY2UgJiYgcG9ydC0+bGlzdGVuZXJfaWQgPiAw KQotCQlnX2RidXNfcmVtb3ZlX3dhdGNoKGRldmljZS0+Y29ubiwgcG9ydC0+bGlzdGVuZXJfaWQp OworCQlnX2RidXNfcmVtb3ZlX3dhdGNoKHBvcnQtPmxpc3RlbmVyX2lkKTsKIAogCXBvcnRfcmVs ZWFzZShwb3J0KTsKIApAQCAtMzczLDcgKzM3Myw3IEBAIHN0YXRpYyB2b2lkIHJmY29tbV9jb25u ZWN0X2NiKEdJT0NoYW5uZWwgKmNoYW4sIEdFcnJvciAqY29ubl9lcnIsCiAKIGZhaWw6CiAJZ19k YnVzX3NlbmRfbWVzc2FnZShkZXZpY2UtPmNvbm4sIHJlcGx5KTsKLQlnX2RidXNfcmVtb3ZlX3dh dGNoKGRldmljZS0+Y29ubiwgcG9ydC0+bGlzdGVuZXJfaWQpOworCWdfZGJ1c19yZW1vdmVfd2F0 Y2gocG9ydC0+bGlzdGVuZXJfaWQpOwogCXBvcnQtPmxpc3RlbmVyX2lkID0gMDsKIH0KIApAQCAt NDMzLDcgKzQzMyw3IEBAIHN0YXRpYyB2b2lkIGdldF9yZWNvcmRfY2Ioc2RwX2xpc3RfdCAqcmVj cywgaW50IGVyciwgZ3BvaW50ZXIgdXNlcl9kYXRhKQogCXJldHVybjsKIAogZmFpbGVkOgotCWdf ZGJ1c19yZW1vdmVfd2F0Y2goZGV2aWNlLT5jb25uLCBwb3J0LT5saXN0ZW5lcl9pZCk7CisJZ19k YnVzX3JlbW92ZV93YXRjaChwb3J0LT5saXN0ZW5lcl9pZCk7CiAJcG9ydC0+bGlzdGVuZXJfaWQg PSAwOwogCWdfZGJ1c19zZW5kX21lc3NhZ2UoZGV2aWNlLT5jb25uLCByZXBseSk7CiB9CkBAIC01 MjQsNyArNTI0LDcgQEAgc3RhdGljIERCdXNNZXNzYWdlICpwb3J0X2Nvbm5lY3QoREJ1c0Nvbm5l Y3Rpb24gKmNvbm4sCiAJCURCdXNNZXNzYWdlICpyZXBseTsKIAogCQllcnJvcigiJXMiLCBzdHJl cnJvcigtZXJyKSk7Ci0JCWdfZGJ1c19yZW1vdmVfd2F0Y2goY29ubiwgcG9ydC0+bGlzdGVuZXJf aWQpOworCQlnX2RidXNfcmVtb3ZlX3dhdGNoKHBvcnQtPmxpc3RlbmVyX2lkKTsKIAkJcG9ydC0+ bGlzdGVuZXJfaWQgPSAwOwogCQlyZXBseSA9IGZhaWxlZChtc2csIHN0cmVycm9yKC1lcnIpKTsK IAkJcmV0dXJuIHJlcGx5OwpAQCAtNTU4LDcgKzU1OCw3IEBAIHN0YXRpYyBEQnVzTWVzc2FnZSAq cG9ydF9kaXNjb25uZWN0KERCdXNDb25uZWN0aW9uICpjb25uLAogCiAJcG9ydF9yZWxlYXNlKHBv cnQpOwogCi0JZ19kYnVzX3JlbW92ZV93YXRjaChjb25uLCBwb3J0LT5saXN0ZW5lcl9pZCk7CisJ Z19kYnVzX3JlbW92ZV93YXRjaChwb3J0LT5saXN0ZW5lcl9pZCk7CiAJcG9ydC0+bGlzdGVuZXJf aWQgPSAwOwogCiAJcmV0dXJuIGdfZGJ1c19jcmVhdGVfcmVwbHkobXNnLCBEQlVTX1RZUEVfSU5W QUxJRCk7CmRpZmYgLS1naXQgYS9zZXJpYWwvcHJveHkuYyBiL3NlcmlhbC9wcm94eS5jCmluZGV4 IDQxYmQzMzEuLjY2MjljMjAgMTAwNjQ0Ci0tLSBhL3NlcmlhbC9wcm94eS5jCisrKyBiL3Nlcmlh bC9wcm94eS5jCkBAIC0xMDIyLDcgKzEwMjIsNyBAQCBzdGF0aWMgdm9pZCB1bnJlZ2lzdGVyX3By b3h5KHN0cnVjdCBzZXJpYWxfcHJveHkgKnByb3h5KQogCWNoYXIgKnBhdGggPSBnX3N0cmR1cChw cm94eS0+cGF0aCk7CiAKIAlpZiAocHJveHktPndhdGNoID4gMCkKLQkJZ19kYnVzX3JlbW92ZV93 YXRjaChhZGFwdGVyLT5jb25uLCBwcm94eS0+d2F0Y2gpOworCQlnX2RidXNfcmVtb3ZlX3dhdGNo KHByb3h5LT53YXRjaCk7CiAKIAlnX2RidXNfZW1pdF9zaWduYWwoYWRhcHRlci0+Y29ubiwKIAkJ CWFkYXB0ZXJfZ2V0X3BhdGgoYWRhcHRlci0+YnRkX2FkYXB0ZXIpLApkaWZmIC0tZ2l0IGEvc3Jj L2FkYXB0ZXIuYyBiL3NyYy9hZGFwdGVyLmMKaW5kZXggNWZkMDczNi4uODE4YTRiMCAxMDA2NDQK LS0tIGEvc3JjL2FkYXB0ZXIuYworKysgYi9zcmMvYWRhcHRlci5jCkBAIC02NDgsNyArNjQ4LDcg QEAgc3RhdGljIHZvaWQgc2Vzc2lvbl9mcmVlKHN0cnVjdCBzZXNzaW9uX3JlcSAqcmVxKQogCQly ZXEtPm1vZGUgPyAiTW9kZSIgOiAiRGlzY292ZXJ5IiwgcmVxLCByZXEtPm93bmVyKTsKIAogCWlm IChyZXEtPmlkKQotCQlnX2RidXNfcmVtb3ZlX3dhdGNoKHJlcS0+Y29ubiwgcmVxLT5pZCk7CisJ CWdfZGJ1c19yZW1vdmVfd2F0Y2gocmVxLT5pZCk7CiAKIAlzZXNzaW9uX3JlbW92ZShyZXEpOwog CmRpZmYgLS1naXQgYS9zcmMvYWdlbnQuYyBiL3NyYy9hZ2VudC5jCmluZGV4IDQ5ZTAxNWMuLjNi NDcyZDUgMTAwNjQ0Ci0tLSBhL3NyYy9hZ2VudC5jCisrKyBiL3NyYy9hZ2VudC5jCkBAIC0xNzYs NyArMTc2LDcgQEAgdm9pZCBhZ2VudF9mcmVlKHN0cnVjdCBhZ2VudCAqYWdlbnQpCiAJfQogCiAJ aWYgKCFhZ2VudC0+ZXhpdGVkKSB7Ci0JCWdfZGJ1c19yZW1vdmVfd2F0Y2goY29ubmVjdGlvbiwg YWdlbnQtPmxpc3RlbmVyX2lkKTsKKwkJZ19kYnVzX3JlbW92ZV93YXRjaChhZ2VudC0+bGlzdGVu ZXJfaWQpOwogCQlhZ2VudF9yZWxlYXNlKGFnZW50KTsKIAl9CiAKZGlmZiAtLWdpdCBhL3NyYy9k ZXZpY2UuYyBiL3NyYy9kZXZpY2UuYwppbmRleCBkZmRhY2Q4Li4zMWY0YzdlIDEwMDY0NAotLS0g YS9zcmMvZGV2aWNlLmMKKysrIGIvc3JjL2RldmljZS5jCkBAIC0xODYsNyArMTg2LDcgQEAgc3Rh dGljIGlubGluZSBEQnVzTWVzc2FnZSAqaW5fcHJvZ3Jlc3MoREJ1c01lc3NhZ2UgKm1zZywgY29u c3QgY2hhciAqc3RyKQogc3RhdGljIHZvaWQgYnJvd3NlX3JlcXVlc3RfZnJlZShzdHJ1Y3QgYnJv d3NlX3JlcSAqcmVxKQogewogCWlmIChyZXEtPmxpc3RlbmVyX2lkKQotCQlnX2RidXNfcmVtb3Zl X3dhdGNoKHJlcS0+Y29ubiwgcmVxLT5saXN0ZW5lcl9pZCk7CisJCWdfZGJ1c19yZW1vdmVfd2F0 Y2gocmVxLT5saXN0ZW5lcl9pZCk7CiAJaWYgKHJlcS0+bXNnKQogCQlkYnVzX21lc3NhZ2VfdW5y ZWYocmVxLT5tc2cpOwogCWlmIChyZXEtPmNvbm4pCkBAIC0xNjM5LDcgKzE2MzksNyBAQCBzdGF0 aWMgdm9pZCBib25kaW5nX3JlcXVlc3RfZnJlZShzdHJ1Y3QgYm9uZGluZ19yZXEgKmJvbmRpbmcp CiAJCXJldHVybjsKIAogCWlmIChib25kaW5nLT5saXN0ZW5lcl9pZCkKLQkJZ19kYnVzX3JlbW92 ZV93YXRjaChib25kaW5nLT5jb25uLCBib25kaW5nLT5saXN0ZW5lcl9pZCk7CisJCWdfZGJ1c19y ZW1vdmVfd2F0Y2goYm9uZGluZy0+bGlzdGVuZXJfaWQpOwogCiAJaWYgKGJvbmRpbmctPm1zZykK IAkJZGJ1c19tZXNzYWdlX3VucmVmKGJvbmRpbmctPm1zZyk7Ci0tIAoxLjYuNi4xCgo= --000e0cd70ca882a821047f598625--