Remove unnecessary checks of BTM_MAX_LOC_BD_NAME_LEN (217e9d16) · Commits · e / os / android_packages_modules_Bluetooth

system/include/bt_target.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -424,8 +424,7 @@
		#define BTM_MAX_REM_BD_NAME_LEN 248
		#endif

		/* Maximum local device name length stored btm database.
		'0' disables storage of the local name in BTM */
		/* Maximum local device name length stored btm database */
		#ifndef BTM_MAX_LOC_BD_NAME_LEN
		#define BTM_MAX_LOC_BD_NAME_LEN 248
		#endif

+0 −2

Original line number	Diff line number	Diff line
		@@ -1395,7 +1395,6 @@ uint8_t btm_ble_build_adv_data(tBTM_BLE_AD_MASK p_data_mask, uint8_t **p_dst,
		data_mask &= ~BTM_BLE_AD_BIT_APPEARANCE;
		}
		/* device name */
		#if BTM_MAX_LOC_BD_NAME_LEN > 0
		if (len > MIN_ADV_LENGTH && data_mask & BTM_BLE_AD_BIT_DEV_NAME)
		{
		if (strlen(btm_cb.cfg.bd_name) > (uint16_t)(len - MIN_ADV_LENGTH))
		@@ -1414,7 +1413,6 @@ uint8_t btm_ble_build_adv_data(tBTM_BLE_AD_MASK p_data_mask, uint8_t **p_dst,
		len -= (cp_len + MIN_ADV_LENGTH);
		data_mask &= ~BTM_BLE_AD_BIT_DEV_NAME;
		}
		#endif
		/* manufacturer data */
		if (len > MIN_ADV_LENGTH && data_mask & BTM_BLE_AD_BIT_MANU &&
		p_data && p_data->manu.len != 0)

+0 −12

Original line number	Diff line number	Diff line
		@@ -82,9 +82,7 @@ void btm_dev_init (void)
		#endif

		/* Initialize nonzero defaults */
		#if (BTM_MAX_LOC_BD_NAME_LEN > 0)
		memset(btm_cb.cfg.bd_name, 0, sizeof(tBTM_LOC_BD_NAME));
		#endif

		btm_cb.devcb.read_local_name_timer =
		alarm_new("btm.read_local_name_timer");
		@@ -449,15 +447,10 @@ tBTM_STATUS BTM_SetLocalDeviceName (char *p_name)

		if (!controller_get_interface()->get_is_ready())
		return (BTM_DEV_RESET);

		#if BTM_MAX_LOC_BD_NAME_LEN > 0
		/* Save the device name if local storage is enabled */
		p = (uint8_t *)btm_cb.cfg.bd_name;
		if (p != (uint8_t *)p_name)
		strlcpy(btm_cb.cfg.bd_name, p_name, BTM_MAX_LOC_BD_NAME_LEN);
		#else
		p = (uint8_t *)p_name;
		#endif

		if (btsnd_hcic_change_name(p))
		return (BTM_CMD_STARTED);
		@@ -482,13 +475,8 @@ tBTM_STATUS BTM_SetLocalDeviceName (char *p_name)
		*******************************************************************************/
		tBTM_STATUS BTM_ReadLocalDeviceName (char **p_name)
		{
		#if BTM_MAX_LOC_BD_NAME_LEN > 0
		*p_name = btm_cb.cfg.bd_name;
		return(BTM_SUCCESS);
		#else
		*p_name = NULL;
		return(BTM_NO_RESOURCES);
		#endif
		}

+0 −4

Original line number	Diff line number	Diff line
		@@ -30,9 +30,7 @@
		extern "C" {
		#endif

		#if BTM_MAX_LOC_BD_NAME_LEN > 0
		typedef char tBTM_LOC_BD_NAME[BTM_MAX_LOC_BD_NAME_LEN + 1];
		#endif

		#define BTM_ACL_IS_CONNECTED(bda) (btm_bda_to_acl (bda, BT_TRANSPORT_BR_EDR) != NULL)

		@@ -615,9 +613,7 @@ typedef struct
		*/
		typedef struct
		{
		#if BTM_MAX_LOC_BD_NAME_LEN > 0
		tBTM_LOC_BD_NAME bd_name; /* local Bluetooth device name */
		#endif
		bool pin_type; /* true if PIN type is fixed */
		uint8_t pin_code_len; /* Bonding information */
		PIN_CODE pin_code; /* PIN CODE if pin type is fixed */

+0 −4

Original line number	Diff line number	Diff line
		@@ -1760,10 +1760,8 @@ uint16_t BTM_BuildOobData(uint8_t *p_data, uint16_t max_len, BT_OCTET16 c,
		{
		uint8_t *p = p_data;
		uint16_t len = 0;
		#if BTM_MAX_LOC_BD_NAME_LEN > 0
		uint16_t name_size;
		uint8_t name_type = BTM_EIR_SHORTENED_LOCAL_NAME_TYPE;
		#endif

		if (p_data && max_len >= BTM_OOB_MANDATORY_SIZE)
		{
		@@ -1808,7 +1806,6 @@ uint16_t BTM_BuildOobData(uint8_t *p_data, uint16_t max_len, BT_OCTET16 c,
		len += delta;
		max_len -= delta;
		}
		#if BTM_MAX_LOC_BD_NAME_LEN > 0
		name_size = name_len;
		if (name_size > strlen(btm_cb.cfg.bd_name))
		{
		@@ -1824,7 +1821,6 @@ uint16_t BTM_BuildOobData(uint8_t *p_data, uint16_t max_len, BT_OCTET16 c,
		len += delta;
		max_len -= delta;
		}
		#endif
		/* update len */
		p = p_data;
		UINT16_TO_STREAM(p, len);