diff options
| author | Szymon Janc <szymon.janc@tieto.com> | 2012-03-28 12:03:19 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-03-28 13:17:39 +0300 |
| commit | e26b01d25b70b629aaa0f90a801636b6d193385e (patch) | |
| tree | cc347d42432afc24eb25c0e41c9dce214d85737c /tools/sdptool.c | |
| parent | b45b981202c0d84b1dc1edc4501849f194243d08 (diff) | |
| download | bluez-e26b01d25b70b629aaa0f90a801636b6d193385e.tar.gz | |
Move common code to sdp to avoid duplication
LanguageBaseAttributeIDList is set from few places and each time static
function was copied and used for that. Move this funtion to sdp code
and use that instead of copying code.
Diffstat (limited to 'tools/sdptool.c')
| -rw-r--r-- | tools/sdptool.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/tools/sdptool.c b/tools/sdptool.c index 1a89245aa..db9ac0d05 100644 --- a/tools/sdptool.c +++ b/tools/sdptool.c @@ -1148,20 +1148,6 @@ typedef struct { uint8_t network; } svc_info_t; -static void add_lang_attr(sdp_record_t *r) -{ - sdp_lang_attr_t base_lang; - sdp_list_t *langs = 0; - - /* UTF-8 MIBenum (http://www.iana.org/assignments/character-sets) */ - base_lang.code_ISO639 = (0x65 << 8) | 0x6e; - base_lang.encoding = 106; - base_lang.base_offset = SDP_PRIMARY_LANG_BASE; - langs = sdp_list_append(0, &base_lang); - sdp_set_lang_attr(r, langs); - sdp_list_free(langs, 0); -} - static int add_sp(sdp_session_t *session, svc_info_t *si) { sdp_list_t *svclass_id, *apseq, *proto[2], *profiles, *root, *aproto; @@ -1203,7 +1189,7 @@ static int add_sp(sdp_session_t *session, svc_info_t *si) aproto = sdp_list_append(0, apseq); sdp_set_access_protos(&record, aproto); - add_lang_attr(&record); + sdp_add_lang_attr(&record); sdp_set_info_attr(&record, "Serial Port", "BlueZ", "COM Port"); @@ -2312,7 +2298,7 @@ static int add_hid_keyb(sdp_session_t *session, svc_info_t *si) root = sdp_list_append(0, &root_uuid); sdp_set_browse_groups(&record, root); - add_lang_attr(&record); + sdp_add_lang_attr(&record); sdp_uuid16_create(&hidkb_uuid, HID_SVCLASS_ID); svclass_id = sdp_list_append(0, &hidkb_uuid); @@ -2490,7 +2476,7 @@ static int add_hid_wiimote(sdp_session_t *session, svc_info_t *si) aproto = sdp_list_append(0, apseq); sdp_set_add_access_protos(&record, aproto); - add_lang_attr(&record); + sdp_add_lang_attr(&record); sdp_set_info_attr(&record, "Nintendo RVL-CNT-01", "Nintendo", "Nintendo RVL-CNT-01"); |