Fix get/set_hfp_active to match name conventions
PATCH v2 1/1 Fix get/set_hfp_active to match name conventions
VGhlc2UgdHdvIGZ1bmN0aW9ucyBhcmUgZGVmaW5lZCBleGNsdXNpdmVseSBmb3IgaGVhZHNldHMs IHNvDQpmb2xsb3cgZXN0YWJsaXNoZWQgbmFtZSBjb252ZW50aW9ucy4NCi0tLQ0KDQp2MjogQ29t bWl0IHdhcyBtaXNzaW5nIGEgZmlsZQ0KDQogYXVkaW8vaGVhZHNldC5jIHwgICAgNCArKy0tDQog YXVkaW8vaGVhZHNldC5oIHwgICAgNCArKy0tDQogYXVkaW8vbWFpbi5jICAgIHwgICAgMiArLQ0K IGF1ZGlvL21hbmFnZXIuYyB8ICAgIDIgKy0NCiA0IGZpbGVzIGNoYW5nZWQsIDYgaW5zZXJ0aW9u cygrKSwgNiBkZWxldGlvbnMoLSkNCg0KZGlmZiAtLWdpdCBhL2F1ZGlvL2hlYWRzZXQuYyBiL2F1 ZGlvL2hlYWRzZXQuYw0KaW5kZXggYmRjOTFkYS4uZWU3OGI1ZCAxMDA2NDQNCi0tLSBhL2F1ZGlv L2hlYWRzZXQuYw0KKysrIGIvYXVkaW8vaGVhZHNldC5jDQpAQCAtMjQzMCwxNCArMjQzMCwxNCBA QCB1bnNpZ25lZCBpbnQgaGVhZHNldF9zdXNwZW5kX3N0cmVhbShzdHJ1Y3QgYXVkaW9fZGV2aWNl ICpkZXYsDQogCXJldHVybiBpZDsNCiB9DQogDQotZ2Jvb2xlYW4gZ2V0X2hmcF9hY3RpdmUoc3Ry dWN0IGF1ZGlvX2RldmljZSAqZGV2KQ0KK2dib29sZWFuIGhlYWRzZXRfZ2V0X2hmcF9hY3RpdmUo c3RydWN0IGF1ZGlvX2RldmljZSAqZGV2KQ0KIHsNCiAJc3RydWN0IGhlYWRzZXQgKmhzID0gZGV2 LT5oZWFkc2V0Ow0KIA0KIAlyZXR1cm4gaHMtPmhmcF9hY3RpdmU7DQogfQ0KIA0KLXZvaWQgc2V0 X2hmcF9hY3RpdmUoc3RydWN0IGF1ZGlvX2RldmljZSAqZGV2LCBnYm9vbGVhbiBhY3RpdmUpDQor dm9pZCBoZWFkc2V0X3NldF9oZnBfYWN0aXZlKHN0cnVjdCBhdWRpb19kZXZpY2UgKmRldiwgZ2Jv b2xlYW4gYWN0aXZlKQ0KIHsNCiAJc3RydWN0IGhlYWRzZXQgKmhzID0gZGV2LT5oZWFkc2V0Ow0K IA0KZGlmZiAtLWdpdCBhL2F1ZGlvL2hlYWRzZXQuaCBiL2F1ZGlvL2hlYWRzZXQuaA0KaW5kZXgg ODE4MGQ2OS4uOTllZWNhOCAxMDA2NDQNCi0tLSBhL2F1ZGlvL2hlYWRzZXQuaA0KKysrIGIvYXVk aW8vaGVhZHNldC5oDQpAQCAtNzksOCArNzksOCBAQCB1bnNpZ25lZCBpbnQgaGVhZHNldF9zdXNw ZW5kX3N0cmVhbShzdHJ1Y3QgYXVkaW9fZGV2aWNlICpkZXYsDQogCQkJCQl2b2lkICp1c2VyX2Rh dGEpOw0KIGdib29sZWFuIGhlYWRzZXRfY2FuY2VsX3N0cmVhbShzdHJ1Y3QgYXVkaW9fZGV2aWNl ICpkZXYsIHVuc2lnbmVkIGludCBpZCk7DQogDQotZ2Jvb2xlYW4gZ2V0X2hmcF9hY3RpdmUoc3Ry dWN0IGF1ZGlvX2RldmljZSAqZGV2KTsNCi12b2lkIHNldF9oZnBfYWN0aXZlKHN0cnVjdCBhdWRp b19kZXZpY2UgKmRldiwgZ2Jvb2xlYW4gYWN0aXZlKTsNCitnYm9vbGVhbiBoZWFkc2V0X2dldF9o ZnBfYWN0aXZlKHN0cnVjdCBhdWRpb19kZXZpY2UgKmRldik7DQordm9pZCBoZWFkc2V0X3NldF9o ZnBfYWN0aXZlKHN0cnVjdCBhdWRpb19kZXZpY2UgKmRldiwgZ2Jvb2xlYW4gYWN0aXZlKTsNCiAN CiBnYm9vbGVhbiBoZWFkc2V0X2dldF9yZmNvbW1faW5pdGlhdG9yKHN0cnVjdCBhdWRpb19kZXZp Y2UgKmRldik7DQogdm9pZCBoZWFkc2V0X3NldF9yZmNvbW1faW5pdGlhdG9yKHN0cnVjdCBhdWRp b19kZXZpY2UgKmRldiwNCmRpZmYgLS1naXQgYS9hdWRpby9tYWluLmMgYi9hdWRpby9tYWluLmMN CmluZGV4IDc0NWMzMDcuLjVjNzUxYWYgMTAwNjQ0DQotLS0gYS9hdWRpby9tYWluLmMNCisrKyBi L2F1ZGlvL21haW4uYw0KQEAgLTEwNSw3ICsxMDUsNyBAQCBzdGF0aWMgdm9pZCBzY29fc2VydmVy X2NiKEdJT0NoYW5uZWwgKmNoYW4sIEdFcnJvciAqZXJyLCBncG9pbnRlciBkYXRhKQ0KIAkJCWdv dG8gZHJvcDsNCiAJCX0NCiANCi0JCWlmICghZ2V0X2hmcF9hY3RpdmUoZGV2aWNlKSkgew0KKwkJ aWYgKCFoZWFkc2V0X2dldF9oZnBfYWN0aXZlKGRldmljZSkpIHsNCiAJCQllcnJvcigiUmVmdXNp bmcgbm9uLUhGUCBTQ08gY29ubmVjdCBhdHRlbXB0IGZyb20gJXMiLA0KIAkJCQkJCQkJCWFkZHIp Ow0KIAkJCWdvdG8gZHJvcDsNCmRpZmYgLS1naXQgYS9hdWRpby9tYW5hZ2VyLmMgYi9hdWRpby9t YW5hZ2VyLmMNCmluZGV4IDRlNGNjYTUuLjI4YzZhZDMgMTAwNjQ0DQotLS0gYS9hdWRpby9tYW5h Z2VyLmMNCisrKyBiL2F1ZGlvL21hbmFnZXIuYw0KQEAgLTUwNyw3ICs1MDcsNyBAQCBzdGF0aWMg dm9pZCBhZ19jb25maXJtKEdJT0NoYW5uZWwgKmNoYW4sIGdwb2ludGVyIGRhdGEpDQogCQlnb3Rv IGRyb3A7DQogCX0NCiANCi0Jc2V0X2hmcF9hY3RpdmUoZGV2aWNlLCBoZnBfYWN0aXZlKTsNCisJ aGVhZHNldF9zZXRfaGZwX2FjdGl2ZShkZXZpY2UsIGhmcF9hY3RpdmUpOw0KIAloZWFkc2V0X3Nl dF9yZmNvbW1faW5pdGlhdG9yKGRldmljZSwgVFJVRSk7DQogDQogCWlmIChoZWFkc2V0X2Nvbm5l Y3RfcmZjb21tKGRldmljZSwgY2hhbikgPCAwKSB7DQotLSANCjEuNy40LjENCg0K
Johan Hedberg
AppliedHi Peter,
Quoted 11 lines · Peter Hurley
These two functions are defined exclusively for headsets, so follow established name conventions.
---v2: Commit was missing a file
audio/headset.c | 4 ++-- audio/headset.h | 4 ++-- audio/main.c | 2 +- audio/manager.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
Applied, but again the patch wasn't clean. You really need to fix your editor settings to show you whitespace errors as well as check yourself with "git am" if you're still unsure if the patch is clean or not:
/home/jh/src/bluez/.git/rebase-apply/patch:20: trailing whitespace. gboolean headset_get_hfp_active(struct audio_device *dev) /home/jh/src/bluez/.git/rebase-apply/patch:28: trailing whitespace. void headset_set_hfp_active(struct audio_device *dev, gboolean active) /home/jh/src/bluez/.git/rebase-apply/patch:42: trailing whitespace. gboolean headset_get_hfp_active(struct audio_device *dev); /home/jh/src/bluez/.git/rebase-apply/patch:43: trailing whitespace. void headset_set_hfp_active(struct audio_device *dev, gboolean active); /home/jh/src/bluez/.git/rebase-apply/patch:56: trailing whitespace.
if (!headset_get_hfp_active(device)) {warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.
Johan
SGkgSm9oYW4sDQoNCk9uIE1vbiwgMjAxMS0wOC0yMiBhdCAwNDowNyAtMDQwMCwgSm9oYW4gSGVk YmVyZyB3cm90ZToNCj4gQXBwbGllZCwgYnV0IGFnYWluIHRoZSBwYXRjaCB3YXNuJ3QgY2xlYW4u IFlvdSByZWFsbHkgbmVlZCB0byBmaXggeW91cg0KPiBlZGl0b3Igc2V0dGluZ3MgdG8gc2hvdyB5 b3Ugd2hpdGVzcGFjZSBlcnJvcnMgYXMgd2VsbCBhcyBjaGVjayB5b3Vyc2VsZg0KPiB3aXRoICJn aXQgYW0iIGlmIHlvdSdyZSBzdGlsbCB1bnN1cmUgaWYgdGhlIHBhdGNoIGlzIGNsZWFuIG9yIG5v dDoNCg0KVGhhbmtzIGZvciBsZXR0aW5nIG1lIGtub3cuIEkgb2J2aW91c2x5IHdhc24ndCBhd2Fy ZSB0aGUgcGF0Y2hlcyB3ZXJlbid0DQpjbGVhbi4gSSdsbCBtYWtlIGFuIGV4dHJhIGVmZm9ydCB0 byBlbnN1cmUgdGhleSBhcmUgaW4gdGhlIGZ1dHVyZS4NCg0KUmVnYXJkcywNClBldGVyIEh1cmxl eQ0KDQo=
SGkgSm9oYW4gYW5kIEd1c3Rhdm8sDQoNCk9uIE1vbiwgMjAxMS0wOC0yMiBhdCAwNzowMCAtMDQw MCwgUGV0ZXIgSHVybGV5IHdyb3RlOg0KPiBIaSBKb2hhbiwNCj4gDQo+IE9uIE1vbiwgMjAxMS0w OC0yMiBhdCAwNDowNyAtMDQwMCwgSm9oYW4gSGVkYmVyZyB3cm90ZToNCj4gPiBBcHBsaWVkLCBi dXQgYWdhaW4gdGhlIHBhdGNoIHdhc24ndCBjbGVhbi4gWW91IHJlYWxseSBuZWVkIHRvIGZpeCB5 b3VyDQo+ID4gZWRpdG9yIHNldHRpbmdzIHRvIHNob3cgeW91IHdoaXRlc3BhY2UgZXJyb3JzIGFz IHdlbGwgYXMgY2hlY2sgeW91cnNlbGYNCj4gPiB3aXRoICJnaXQgYW0iIGlmIHlvdSdyZSBzdGls bCB1bnN1cmUgaWYgdGhlIHBhdGNoIGlzIGNsZWFuIG9yIG5vdDoNCj4gDQo+IFRoYW5rcyBmb3Ig bGV0dGluZyBtZSBrbm93LiBJIG9idmlvdXNseSB3YXNuJ3QgYXdhcmUgdGhlIHBhdGNoZXMgd2Vy ZW4ndA0KPiBjbGVhbi4gSSdsbCBtYWtlIGFuIGV4dHJhIGVmZm9ydCB0byBlbnN1cmUgdGhleSBh cmUgaW4gdGhlIGZ1dHVyZS4NCg0KV2VsbCwgYWZ0ZXIgc29tZSB0cm91Ymxlc2hvb3RpbmcgaGVy ZSwgaXQgdHVybnMgb3V0IHRoZSBwcm9ibGVtIGlzIHdpdGgNCm15IGNvbW1lcmNpYWwgYW5kIHdl bGwta25vd24gYnV0IGJyb2tlbiBtYWlsIHRyYW5zcG9ydCBzZXJ2ZXIuIFRoZQ0KYm91bmRhcnkg c2VydmVyICphbHdheXMqIGVuY29kZXMgQ2hhclNldD0idXRmLTgiIGFzIGJhc2U2NC1lbmNvZGVk DQood2hpY2ggaXMgd2h5IHRoZSBsaXN0c2VydiB0YWcgaXMgZ2FyYmxlZCkuDQoNCklzIGl0IG9r IGlmIEkgdXNlIGlzbyA4ODU5LTEgaW5zdGVhZD8NCg0KUmVnYXJkcywNClBldGVyIEh1cmxleQ0K
Hi Peter,
Quoted 6 lines · Peter Hurley
Well, after some troubleshooting here, it turns out the problem is with my commercial and well-known but broken mail transport server. The boundary server *always* encodes CharSet="utf-8" as base64-encoded (which is why the listserv tag is garbled).
Is it ok if I use iso 8859-1 instead?
I suppose it doesn't make much of a difference since we're using English here. Another option that could work is to use attachments, and yet another (what I'd actually prefer if it's possible) to switch to an un-broken mail server.
Johan