zblue: fix build warning

Signed-off-by: fangzhenwei <fangzhenwei@xiaomi.com>
open-vela · Jan 13, 2025 · 7a65591 · 7a65591
1 parent 3d44d6f
commit 7a65591
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/port/sections/defines.c b/port/sections/defines.c
@@ -627,8 +627,8 @@ const struct settings_handler_static *_settings_handler_static_list[] = {
 #endif /* CONFIG_BT_GATT_SERVICE_CHANGED */
 #if defined(CONFIG_BT_GATT_CACHING)
 	&settings_handler_bt_cf,
-#endif /* CONFIG_BT_GATT_CACHING */
 	&settings_handler_bt_hash,
+#endif /* CONFIG_BT_GATT_CACHING */
 #if defined(CONFIG_BT_DIS)
 #if defined(CONFIG_BT_DIS_SETTINGS)
 		&settings_handler_bt_dis,

diff --git a/port/subsys/shell/shell.c b/port/subsys/shell/shell.c
@@ -292,7 +292,7 @@ int main(int argc, char *argv[])
 	char* _argv[32];
 	char* buffer = NULL;
 	char* saveptr;
-	int ret;
+	int ret = 0;
 	size_t len, size = 0;
 
 	z_sys_init();

diff --git a/subsys/bluetooth/host/classic/br.c b/subsys/bluetooth/host/classic/br.c
@@ -1264,8 +1264,8 @@ int bt_br_write_local_name(const char *name)
 	}
 
 	name_cp = net_buf_add(buf, sizeof(*name_cp));
-	strncpy((char *)name_cp->local_name, name,
-		sizeof(name_cp->local_name));
+	memset(name_cp, 0, sizeof(*name_cp));
+	memcpy((char *)name_cp->local_name, name, sizeof(name_cp->local_name));
 
 	return bt_hci_cmd_send_sync(BT_HCI_OP_WRITE_LOCAL_NAME, buf, NULL);
 }

diff --git a/subsys/bluetooth/host/classic/ssp.c b/subsys/bluetooth/host/classic/ssp.c
@@ -74,7 +74,8 @@ static int pin_code_reply(struct bt_conn *conn, const char *pin, uint8_t len)
 
 	bt_addr_copy(&cp->bdaddr, &conn->br.dst);
 	cp->pin_len = len;
-	strncpy((char *)cp->pin_code, pin, sizeof(cp->pin_code));
+	memset(cp->pin_code, 0, sizeof(cp->pin_code));
+	memcpy((char *)cp->pin_code, pin, sizeof(cp->pin_code));
 
 	return bt_hci_cmd_send_sync(BT_HCI_OP_PIN_CODE_REPLY, buf, NULL);
 }