Received-SPF: pass (google.com: domain of linux-bluetooth+bounces-2611-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Vlad Pruteanu <vlad.pruteanu@nxp.com>
To: linux-bluetooth@vger.kernel.org
Cc: mihai-octavian.urzica@nxp.com,
	silviu.barbulescu@nxp.com,
	iulia.tanasescu@nxp.com,
	andrei.istodorescu@nxp.com,
	luiz.dentz@gmail.com,
	Vlad Pruteanu <vlad.pruteanu@nxp.com>
Subject: [PATCH BlueZ 2/3] shared/bap: Use util_iov_append instead of iov_append
Date: Tue, 19 Mar 2024 17:19:16 +0200
Message-Id: <20240319151917.834974-3-vlad.pruteanu@nxp.com>
In-Reply-To: <20240319151917.834974-1-vlad.pruteanu@nxp.com>
References: <20240319151917.834974-1-vlad.pruteanu@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?W6oI0E9wZ6gLl0x9xFG+gE0OI324QR+JzgSkPg9KOS8mYIdE4bWhhc9VzV/D?=
 =?us-ascii?Q?ZtdzZqUk9kfy8uzFNd0gO3hyVhSPqlXG/s7PacJkGD/kehS3+LMQnwcTWUZV?=
 =?us-ascii?Q?LbCy6Os0hrnedxq/XpBwZEVvygtY7xsre6HkZIWKefeqyVx147UcqCCFiYiw?=
 =?us-ascii?Q?lLqLuAlBgYUYZTmZF8G01169gbDX/GG79opeJ7SNk37wDaHfMqfgHeS+1/vs?=
 =?us-ascii?Q?a86wB81QY4eUvdZuIV93SgrlO9Z6LqbhX1vrrKO3qSXfnZqQTHKLp0Z9erpE?=
 =?us-ascii?Q?k+nLDAzIIXl712aUbvhYG6a6usYhaR+SJhQYdPNPuCIuwlr3jrgYoqZBznrk?=
 =?us-ascii?Q?9pNmHzA/bTuCstByVJMRRAbuX3jqCAQrmQugg/JLS9mcg85/ti3PFDl17SK0?=
 =?us-ascii?Q?CInIdMWmkrdxXrORaok37XOrp9jgRcLVK31Ig31JZi6XuXoZoTNFSnJrR1EY?=
 =?us-ascii?Q?20wjTUqGkj0+LOSrVBWpeAlDMbeUWRmvwS69b4q3zF18KR/A90DQJKl88JDk?=
 =?us-ascii?Q?HEQsvGCheNqh7AVXzsVjRpIXQbnO5MzIMUmMf8KXcWDhLWlXIQX64P6maOw2?=
 =?us-ascii?Q?KU3uEx0HXyk5YBgQNjDlhYIm/qVp8RREQvfuChYnnDY0/SFsgVjkI5IvAbJI?=
 =?us-ascii?Q?KBPrC0RIKnMneD+4oWz/QjxtXHkutRHUR6/NBfb6Ap9Xjs+3m1bX964cmDZr?=
 =?us-ascii?Q?gIeOazT9dD1YJoCW0UPfrngdBKiP9TC/x5lY6RaOHx4h547dVJ0g8yToIIzg?=
 =?us-ascii?Q?VKupxuIkUbW4Rt2O5YAxWfizMhUUv2xKIBYPAibVy7M7i/PGkIFQVvW3Zi/g?=
 =?us-ascii?Q?F0VouXvn6xsXjTA6EDQBshdouLaMsNenqYHv86Djz3ZPEXUThvpL6+xXUSBn?=
 =?us-ascii?Q?gFsEWnfCo+c3Hlku053w9PUiUYY+NTUlz/tfeLoAHAYVmHGMNC98mbnWQL+P?=
 =?us-ascii?Q?CJMlmHeYSemV8dwP1BK+YneJA99Fj34taHogK2SX+WxkHQ9D3T3xuQFUS5Ez?=
 =?us-ascii?Q?rg8GR+2+D7/wDgGoQMDMEM++QB6hhYRFCcMKMAnM66XGY2mgv2VPesLDusjq?=
 =?us-ascii?Q?45RZaqyHLoqYx6arycPryGywmSFeK6StwN3HXldu7pFoDj7LLBvLcN7DJQQO?=
 =?us-ascii?Q?wpKTXUUolhn1+RfyzzUGDH6Tyt3gYBmgqVQES2rpB+6a2MHy+zWm0GSirvjs?=
 =?us-ascii?Q?HMXLlEodPSvFm7UfpaK0tftekb0KK1OIsD+z2gPhDYklIjD1z3udaJxvyOl4?=
 =?us-ascii?Q?ZAJfWR5g/3zrVMGFKiqZQQC8Q02hsuh+1htjExziXliX3q4OpZq6LDGtQ/U/?=
 =?us-ascii?Q?HuiVWK6ZojWKY6FKROczRlK6SHI9N+F4Ssk7ijVFW3OhtQkq4ak1Za4WBBl5?=
 =?us-ascii?Q?2ZTp++YR2W2a3w3X7XpgeQd9ZAOHWzUHkcD7PWSdLoKlVYHWBXCrq7Xi6mqi?=
 =?us-ascii?Q?bz/apvPbI5rZlIMJrcJfxO6vWdZGK9/uMNYrV/lMP5dKW8OBvExPDquV8BzS?=
 =?us-ascii?Q?p5GKBGQxGAmqXR0ADT3kXsb93YblFhn4OwD/M+kvVVuIbP6Mdif58pmLFghL?=
 =?us-ascii?Q?Az6RtUvSDguPo1R3FMfJJYoRjLQnqRLDF5jtRHGS?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 54cac218-bfcb-4846-cc19-08dc4828050d
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB5384.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Mar 2024 15:19:50.1980
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: TFuCV34/D1jG6HN3CNkK3jKRruui4GnzTGRcY1LZqJEcjMjti2JpJLOHdKehvFsWqebapMr1z40GZXtRZj6+xg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS5PR04MB9924

Use the newly created util_iov_append function from
src/shared/bap.c.
---
 src/shared/bap.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/shared/bap.c b/src/shared/bap.c
index fd99cbbca..a1749153b 100644
--- a/src/shared/bap.c
+++ b/src/shared/bap.c
@@ -326,12 +326,6 @@ static bool bap_db_match(const void *data, const void *match_data)
 	return (bdb->db == db);
 }
 
-static void *iov_append(struct iovec *iov, size_t len, const void *d)
-{
-	iov->iov_base = realloc(iov->iov_base, iov->iov_len + len);
-	return util_iov_push_mem(iov, len, d);
-}
-
 unsigned int bt_bap_pac_register(struct bt_bap *bap, bt_bap_pac_func_t added,
 				bt_bap_pac_func_t removed, void *user_data,
 				bt_bap_destroy_func_t destroy)
@@ -3049,9 +3043,9 @@ static void *ltv_merge(struct iovec *data, struct iovec *cont)
 	if (!cont || !cont->iov_len || !cont->iov_base)
 		return data->iov_base;
 
-	iov_append(data, sizeof(delimiter), &delimiter);
+	util_iov_append(data, &delimiter, sizeof(delimiter));
 
-	return iov_append(data, cont->iov_len, cont->iov_base);
+	return util_iov_append(data, cont->iov_base, cont->iov_len);
 }
 
 static void bap_pac_foreach_channel(size_t i, uint8_t l, uint8_t t, uint8_t *v,
@@ -6081,9 +6075,9 @@ static void extract_ltv(size_t i, uint8_t l, uint8_t t, uint8_t *v,
 
 	if (!ltv_match.found) {
 		ltv_len = l + 1;
-		iov_append(ext_data->result, 1, &ltv_len);
-		iov_append(ext_data->result, 1, &t);
-		iov_append(ext_data->result, l, v);
+		util_iov_append(ext_data->result, &ltv_len, 1);
+		util_iov_append(ext_data->result, &t, 1);
+		util_iov_append(ext_data->result, v, l);
 	}
 }
 
-- 
2.39.2