Refactor usage of osi_free() and osi_freebuf() (7d58c044) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/ag/bta_ag_at.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -61,13 +61,10 @@ void bta_ag_at_init(tBTA_AG_AT_CB *p_cb)
		******************************************************************************/
		void bta_ag_at_reinit(tBTA_AG_AT_CB *p_cb)
		{
		if (p_cb->p_cmd_buf != NULL)
		{
		osi_freebuf(p_cb->p_cmd_buf);
		p_cb->p_cmd_buf = NULL;
		}
		osi_freebuf_and_reset((void **)&p_cb->p_cmd_buf);
		p_cb->cmd_pos = 0;
		}

		/******************************************************************************
		**
		** Function bta_ag_process_at

system/bta/ag/bta_ag_sdp.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -495,10 +495,5 @@ void bta_ag_do_disc(tBTA_AG_SCB *p_scb, tBTA_SERVICE_MASK service)
		void bta_ag_free_db(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		{
		UNUSED(p_data);

		if (p_scb->p_disc_db != NULL)
		{
		osi_freebuf(p_scb->p_disc_db);
		p_scb->p_disc_db = NULL;
		}
		osi_freebuf_and_reset((void **)&p_scb->p_disc_db);
		}

system/bta/av/bta_av_aact.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -1071,8 +1071,8 @@ void bta_av_cleanup(tBTA_AV_SCB p_scb, tBTA_AV_DATA p_data)
		APPL_TRACE_DEBUG("bta_av_cleanup");

		/* free any buffers */
		utl_freebuf((void **) &p_scb->p_cap);
		utl_freebuf((void **) &p_scb->p_disc_db);
		osi_freebuf_and_reset((void **)&p_scb->p_cap);
		osi_freebuf_and_reset((void **)&p_scb->p_disc_db);
		p_scb->avdt_version = 0;

		/* initialize some control block variables */
		@@ -1128,7 +1128,7 @@ void bta_av_cleanup(tBTA_AV_SCB p_scb, tBTA_AV_DATA p_data)
		void bta_av_free_sdb(tBTA_AV_SCB p_scb, tBTA_AV_DATA p_data)
		{
		UNUSED(p_data);
		utl_freebuf((void **) &p_scb->p_disc_db);
		osi_freebuf_and_reset((void **)&p_scb->p_disc_db);
		}

		/*******************************************************************************
		@@ -1578,7 +1578,7 @@ void bta_av_connect_req (tBTA_AV_SCB p_scb, tBTA_AV_DATA p_data)
		{
		UNUSED(p_data);

		utl_freebuf((void **) &p_scb->p_disc_db);
		osi_freebuf_and_reset((void **)&p_scb->p_disc_db);

		if (p_scb->coll_mask & BTA_AV_COLL_INC_TMR)
		{
		@@ -1605,7 +1605,7 @@ void bta_av_sdp_failed (tBTA_AV_SCB p_scb, tBTA_AV_DATA p_data)
		if (!p_scb->open_status)
		p_scb->open_status = BTA_AV_FAIL_SDP;

		utl_freebuf((void **) &p_scb->p_disc_db);
		osi_freebuf_and_reset((void **)&p_scb->p_disc_db);
		bta_av_str_closed(p_scb, p_data);
		}

		@@ -1936,7 +1936,7 @@ void bta_av_getcap_results (tBTA_AV_SCB p_scb, tBTA_AV_DATA p_data)
		if (!bta_av_is_rcfg_sst(p_scb))
		{
		/* free capabilities buffer */
		utl_freebuf((void **) &p_scb->p_cap);
		osi_freebuf_and_reset((void **)&p_scb->p_cap);
		}
		}
		else
		@@ -2725,7 +2725,7 @@ void bta_av_rcfg_str_ok (tBTA_AV_SCB p_scb, tBTA_AV_DATA p_data)

		/* rc listen */
		bta_av_st_rc_timer(p_scb, NULL);
		utl_freebuf((void **)&p_scb->p_cap);
		osi_freebuf_and_reset((void **)&p_scb->p_cap);

		/* No need to keep the role bits once reconfig is done. */
		p_scb->role &= ~BTA_AV_ROLE_AD_ACP;

system/bta/av/bta_av_act.c

+5 −6

Original line number	Diff line number	Diff line
		@@ -691,7 +691,7 @@ void bta_av_rc_meta_rsp(tBTA_AV_CB p_cb, tBTA_AV_DATA p_data)
		}

		if (do_free)
		osi_freebuf (p_data->api_meta_rsp.p_pkt);
		osi_freebuf_and_reset((void **)&p_data->api_meta_rsp.p_pkt);
		}

		/*******************************************************************************
		@@ -706,8 +706,7 @@ void bta_av_rc_meta_rsp(tBTA_AV_CB p_cb, tBTA_AV_DATA p_data)
		void bta_av_rc_free_rsp (tBTA_AV_CB p_cb, tBTA_AV_DATA p_data)
		{
		UNUSED(p_cb);

		osi_freebuf (p_data->api_meta_rsp.p_pkt);
		osi_freebuf_and_reset((void **)&p_data->api_meta_rsp.p_pkt);
		}

		/*******************************************************************************
		@@ -1412,7 +1411,7 @@ void bta_av_disable(tBTA_AV_CB p_cb, tBTA_AV_DATA p_data)

		bta_av_close_all_rc(p_cb);

		utl_freebuf((void **) &p_cb->p_disc_db);
		osi_freebuf_and_reset((void **)&p_cb->p_disc_db);

		/* disable audio/video - de-register all channels,
		* expect BTA_AV_DEREG_COMP_EVT when deregister is complete */
		@@ -1874,7 +1873,7 @@ void bta_av_rc_disc_done(tBTA_AV_DATA *p_data)
		}

		p_cb->disc = 0;
		utl_freebuf((void **) &p_cb->p_disc_db);
		osi_freebuf_and_reset((void **)&p_cb->p_disc_db);

		APPL_TRACE_DEBUG("peer_features 0x%x, features 0x%x", peer_features, p_cb->features);

		@@ -2181,7 +2180,7 @@ void bta_av_dereg_comp(tBTA_AV_DATA *p_data)

		/* make sure that the timer is not active */
		alarm_cancel(p_scb->avrc_ct_timer);
		utl_freebuf((void **)&p_cb->p_scb[p_scb->hdi]);
		osi_freebuf_and_reset((void **)&p_cb->p_scb[p_scb->hdi]);
		}

		APPL_TRACE_DEBUG("audio 0x%x, video: 0x%x, disable:%d",

system/bta/av/bta_av_api.c

+9 −13

Original line number	Diff line number	Diff line
		@@ -638,10 +638,9 @@ void BTA_AvCloseRc(UINT8 rc_handle)
		void BTA_AvMetaRsp(UINT8 rc_handle, UINT8 label, tBTA_AV_CODE rsp_code,
		BT_HDR *p_pkt)
		{
		tBTA_AV_API_META_RSP *p_buf;
		tBTA_AV_API_META_RSP *p_buf =
		(tBTA_AV_API_META_RSP *)osi_getbuf((UINT16)sizeof(tBTA_AV_API_META_RSP));

		if ((p_buf = (tBTA_AV_API_META_RSP *) osi_getbuf((UINT16) (sizeof(tBTA_AV_API_META_RSP)))) != NULL)
		{
		p_buf->hdr.event = BTA_AV_API_META_RSP_EVT;
		p_buf->hdr.layer_specific = rc_handle;
		p_buf->rsp_code = rsp_code;
		@@ -650,9 +649,6 @@ void BTA_AvMetaRsp(UINT8 rc_handle, UINT8 label, tBTA_AV_CODE rsp_code,
		p_buf->label = label;

		bta_sys_sendmsg(p_buf);
		} else if (p_pkt) {
		osi_freebuf(p_pkt);
		}
		}

		/*******************************************************************************