Commit 3424abc4 authored by Job Vranish's avatar Job Vranish
Browse files

moved some asserts so that we only hit them in critical cases. Previously we... 

moved some asserts so that we only hit them in critical cases. Previously we would hit some of them on normal error conditions
parent 7d5a3c16

src/lib/kinetic_controller.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ void KineticController_HandleUnexecpectedResponse(void *msg, 
    (void)seq_id;

    (void)bus_udata;



    KineticLogger_LogProtobuf(3, response->proto);

    KineticLogger_LogProtobuf(2, response->proto);





    // Handle unsolicited status PDUs

src/lib/kinetic_operation.c

+3 −5
Original line number Diff line number Diff line
@@ -243,11 +243,11 @@ static KineticStatus get_cb(const char *cmd_name, KineticOperation* const operat 
    assert(operation->connection != NULL);

    LOGF3("%s callback w/ operation (0x%0llX) on connection (0x%0llX)",

        cmd_name, operation, operation->connection);

    assert(operation->response != NULL);

    assert(operation->entry != NULL);



    if (status == KINETIC_STATUS_SUCCESS)

    {

        assert(operation->response != NULL);

        // Update the entry upon success

        KineticProto_Command_KeyValue* keyValue = KineticPDU_GetKeyValue(operation->response);

        if (keyValue != NULL) {
@@ -351,7 +351,6 @@ KineticStatus KineticOperation_DeleteCallback(KineticOperation* const operation, 
    assert(operation->connection != NULL);

    LOGF3("DELETE callback w/ operation (0x%0llX) on connection (0x%0llX)",

        operation, operation->connection);

    assert(operation->response != NULL);

    assert(operation->entry != NULL);

    return status;

}
@@ -383,12 +382,12 @@ KineticStatus KineticOperation_GetKeyRangeCallback(KineticOperation* const opera 
    assert(operation->connection != NULL);

    LOGF3("GETKEYRANGE callback w/ operation (0x%0llX) on connection (0x%0llX)",

        operation, operation->connection);

    assert(operation->response != NULL);

    assert(operation->buffers != NULL);

    assert(operation->buffers->count > 0);



    if (status == KINETIC_STATUS_SUCCESS)

    {

        assert(operation->response != NULL);

        // Report the key list upon success

        KineticProto_Command_Range* keyRange = KineticPDU_GetKeyRange(operation->response);

        if (keyRange != NULL) {
@@ -426,11 +425,10 @@ KineticStatus KineticOperation_GetLogCallback(KineticOperation* const operation, 
    assert(operation->deviceInfo != NULL);

    LOGF3("GETLOG callback w/ operation (0x%0llX) on connection (0x%0llX)",

        operation, operation->connection);

    assert(operation->response != NULL);

    assert(operation->response->command->body->getLog != NULL);



    if (status == KINETIC_STATUS_SUCCESS)

    {

        assert(operation->response != NULL);

        // Copy the data from the response protobuf into a new info struct

        if (operation->response->command->body->getLog == NULL) {

            return KINETIC_STATUS_OPERATION_FAILED;