michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: GATT: Use __ASSERT for invalid parameters

Browse source 
Instead of returning -EINVAL at runtime assert in case of invalid
parameters.

Change-Id: I40505f06a4c12445bfb1f1846ace1b592b6bc342
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Luiz Augusto von Dentz 2017-02-14 19:55:00 +02:00 • committed by Johan Hedberg
commit a05cea3a22
1 changed files with 27 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

59
subsys/bluetooth/host/gatt.c
View file

@ -47,9 +47,8 @@ int bt_gatt_register(struct bt_gatt_attr *attrs, size_t count)
#endif /* CONFIG_BLUETOOTH_GATT_DYNAMIC_DB */
uint16_t handle;
if (!attrs || !count) {
return -EINVAL;
}
__ASSERT(attrs, "invalid parameters\n");
__ASSERT(count, "invalid parameters\n");
#if !defined(CONFIG_BLUETOOTH_GATT_DYNAMIC_DB)
handle = 0;
@ -559,9 +558,7 @@ int bt_gatt_notify(struct bt_conn *conn, const struct bt_gatt_attr *attr,
{
struct notify_data nfy;
if (!attr || !attr->handle) {
return -EINVAL;
}
__ASSERT(attr && attr->handler, "invalid parameters\n");
if (conn) {
return gatt_notify(conn, attr->handle, data, len);
@ -582,9 +579,8 @@ int bt_gatt_indicate(struct bt_conn *conn,
{
struct notify_data nfy;
if (!params || !params->attr || !params->attr->handle) {
return -EINVAL;
}
__ASSERT(params, "invalid parameters\n");
__ASSERT(params->attr && params->attr->handle, "invalid parameters\n");
if (conn) {
return gatt_indicate(conn, params);
@ -773,9 +769,8 @@ int bt_gatt_exchange_mtu(struct bt_conn *conn,
struct net_buf *buf;
uint16_t mtu;
if (!conn || !params || !params->func) {
return -EINVAL;
}
__ASSERT(conn, "invalid parameter\n");
__ASSERT(params && params->func, "invalid parameters\n");
if (conn->state != BT_CONN_CONNECTED) {
return -ENOTCONN;
@ -1316,10 +1311,12 @@ static int gatt_find_info(struct bt_conn *conn,
int bt_gatt_discover(struct bt_conn *conn,
struct bt_gatt_discover_params *params)
{
if (!conn || !params || !params->func || !params->start_handle ||
!params->end_handle || params->start_handle > params->end_handle) {
return -EINVAL;
}
__ASSERT(conn, "invalid parameters\n");
__ASSERT(params && params->func, "invalid parameters\n");
__ASSERT((params->start_handle && params->end_handle),
"invalid parameters\n");
__ASSERT((params->start_handle < params->end_handle),
"invalid parameters\n");
if (conn->state != BT_CONN_CONNECTED) {
return -ENOTCONN;
@ -1440,9 +1437,9 @@ int bt_gatt_read(struct bt_conn *conn, struct bt_gatt_read_params *params)
struct net_buf *buf;
struct bt_att_read_req *req;
if (!conn || !params || !params->handle_count || !params->func) {
return -EINVAL;
}
__ASSERT(conn, "invalid parameters\n");
__ASSERT(params && params->func, "invalid parameters\n");
__ASSERT(params->handle_count, "invalid parameters\n");
if (conn->state != BT_CONN_CONNECTED) {
return -ENOTCONN;
@ -1494,9 +1491,8 @@ int bt_gatt_write_without_response(struct bt_conn *conn, uint16_t handle,
struct net_buf *buf;
struct bt_att_write_cmd *cmd;
if (!conn || !handle) {
return -EINVAL;
}
__ASSERT(conn, "invalid parameters\n");
__ASSERT(handle, "invalid parameters\n");
if (conn->state != BT_CONN_CONNECTED) {
return -ENOTCONN;
@ -1604,9 +1600,9 @@ int bt_gatt_write(struct bt_conn *conn, struct bt_gatt_write_params *params)
struct net_buf *buf;
struct bt_att_write_req *req;
if (!conn || !params || !params->handle || !params->func) {
return -EINVAL;
}
__ASSERT(conn, "invalid parameters\n");
__ASSERT(params && params->func, "invalid parameters\n");
__ASSERT(params->handle, "invalid parameters\n");
if (conn->state != BT_CONN_CONNECTED) {
return -ENOTCONN;
@ -1694,10 +1690,10 @@ int bt_gatt_subscribe(struct bt_conn *conn,
struct bt_gatt_subscribe_params *tmp;
bool has_subscription = false;
if (!conn || !params || !params->notify ||
!params->value || !params->ccc_handle) {
return -EINVAL;
}
__ASSERT(conn, "invalid parameters\n");
__ASSERT(params && params->notify, "invalid parameters\n");
__ASSERT(params->value, "invalid parameters\n");
__ASSERT(params->ccc_handle, "invalid parameters\n");
if (conn->state != BT_CONN_CONNECTED) {
return -ENOTCONN;
@ -1745,9 +1741,8 @@ int bt_gatt_unsubscribe(struct bt_conn *conn,
bool has_subscription = false, found = false;
sys_snode_t *prev = NULL;
if (!conn || !params) {
return -EINVAL;
}
__ASSERT(conn, "invalid parameters\n");
__ASSERT(params, "invalid parameters\n");
if (conn->state != BT_CONN_CONNECTED) {
return -ENOTCONN;