korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-25 13:14:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplify return value in disconnect_req

Browse Source
This commit is contained in:
Waldemar Rymarkiewicz 2011-05-31 12:46:50 +02:00 committed by Johan Hedberg
parent d77b3e021a
commit 05e51adf10
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sap/server.c
View File

@ -349,11 +349,9 @@ static int disconnect_req(struct sap_connection *conn, uint8_t disc_type)
switch (disc_type) {
case SAP_DISCONNECTION_TYPE_GRACEFUL:
if (conn->state == SAP_STATE_DISCONNECTED)
goto error_req;
if (conn->state == SAP_STATE_CONNECT_IN_PROGRESS)
goto error_req;
if (conn->state == SAP_STATE_DISCONNECTED ||
conn->state == SAP_STATE_CONNECT_IN_PROGRESS)
return -EPERM;
if (conn->state == SAP_STATE_CONNECTED) {
conn->state = SAP_STATE_GRACEFUL_DISCONNECT;
@ -367,11 +365,9 @@ static int disconnect_req(struct sap_connection *conn, uint8_t disc_type)
return 0;
case SAP_DISCONNECTION_TYPE_IMMEDIATE:
if (conn->state == SAP_STATE_DISCONNECTED)
goto error_req;
if (conn->state == SAP_STATE_CONNECT_IN_PROGRESS)
goto error_req;
if (conn->state == SAP_STATE_DISCONNECTED ||
conn->state == SAP_STATE_CONNECT_IN_PROGRESS)
return -EPERM;
if (conn->state == SAP_STATE_CONNECTED ||
conn->state == SAP_STATE_GRACEFUL_DISCONNECT) {
@ -389,7 +385,7 @@ static int disconnect_req(struct sap_connection *conn, uint8_t disc_type)
if (conn->state != SAP_STATE_CONNECTED &&
conn->state != SAP_STATE_GRACEFUL_DISCONNECT) {
sap_error_rsp(conn);
goto error_req;
return -EPERM;
}
conn->state = SAP_STATE_CLIENT_DISCONNECT;
@ -404,9 +400,6 @@ static int disconnect_req(struct sap_connection *conn, uint8_t disc_type)
error("Unknown disconnection type (0x%02x).", disc_type);
return -EINVAL;
}
error_req:
return -EPERM;
}
static void transfer_apdu_req(struct sap_connection *conn,