OSDN Git Service

Add the appropriate statement to "case:" without "break"
authorPavlin Radoslavov <pavlin@google.com>
Tue, 18 Oct 2016 17:12:26 +0000 (10:12 -0700)
committerPavlin Radoslavov <pavlin@google.com>
Tue, 18 Oct 2016 17:41:15 +0000 (10:41 -0700)
Test: code compilation
Change-Id: Ia43d7530a598a526764023c47bb20fdedda6fe64

stack/gatt/gatt_api.cc
stack/gatt/gatt_db.cc
stack/gatt/gatt_utils.cc

index 4391edf..3a6b576 100644 (file)
@@ -803,7 +803,7 @@ tGATT_STATUS GATTC_Read (uint16_t conn_id, tGATT_READ_TYPE type, tGATT_READ_PARA
                     (tGATT_READ_MULTI *)osi_malloc(sizeof(tGATT_READ_MULTI));
                 p_clcb->p_attr_buf = (uint8_t*)p_read_multi;
                 memcpy(p_read_multi, &p_read->read_multiple, sizeof(tGATT_READ_MULTI));
-                /* TODO: Missing "break" statement! */
+                break;
             }
             case GATT_READ_BY_HANDLE:
             case GATT_READ_PARTIAL:
index 9eb2794..37ae94b 100644 (file)
@@ -821,16 +821,15 @@ tGATT_STATUS gatts_write_attr_perm_check (tGATT_SVC_DB *p_db, uint8_t op_code,
                         case GATT_UUID_CHAR_PRESENT_FORMAT:/* should be readable only */
                         case GATT_UUID_CHAR_EXT_PROP:/* should be readable only */
                         case GATT_UUID_CHAR_AGG_FORMAT: /* should be readable only */
-                            case GATT_UUID_CHAR_VALID_RANGE:
+                        case GATT_UUID_CHAR_VALID_RANGE:
                             status = GATT_WRITE_NOT_PERMIT;
                             break;
 
                         case GATT_UUID_CHAR_CLIENT_CONFIG:
-/* coverity[MISSING_BREAK] */
-/* intnended fall through, ignored */
                             /* fall through */
                         case GATT_UUID_CHAR_SRVR_CONFIG:
                             max_size = 2;
+                            /* fall through */
                         case GATT_UUID_CHAR_DESCRIPTION:
                         default: /* any other must be character value declaration */
                             status = GATT_SUCCESS;
index 146a069..267f427 100644 (file)
@@ -1121,6 +1121,7 @@ bool    gatt_parse_uuid_from_cmd(tBT_UUID *p_uuid_rec, uint16_t uuid_size, uint8
         /* do not allow 32 bits UUID in ATT PDU now */
         case LEN_UUID_32:
             GATT_TRACE_ERROR("DO NOT ALLOW 32 BITS UUID IN ATT PDU");
+            return false;
         case 0:
         default:
             if (uuid_size != 0) ret = false;