Commit 277b6711 authored by Job Vranish's avatar Job Vranish
Browse files

fixed more warnings and broken tests on linux

parent 42390ba5

src/lib/kinetic_controller.c

+4 −2
Original line number Diff line number Diff line
@@ -126,8 +126,6 @@ KineticStatus bus_to_kinetic_status(bus_send_status_t const status) 
    switch(status)

    {

        // TODO fix all these mappings

        case BUS_SEND_UNDEFINED:

            assert(false);

        case BUS_SEND_SUCCESS:

            return KINETIC_STATUS_SUCCESS;

        case BUS_SEND_TX_TIMEOUT:
@@ -140,6 +138,10 @@ KineticStatus bus_to_kinetic_status(bus_send_status_t const status) 
            return KINETIC_STATUS_SOCKET_ERROR;

        case BUS_SEND_BAD_RESPONSE:

            return KINETIC_STATUS_SOCKET_ERROR;

        case BUS_SEND_UNDEFINED:

        default:

            assert(false);

            return KINETIC_STATUS_INVALID;

    }

}

test/support/unity_helper.h

+2 −1
Original line number Diff line number Diff line
@@ -91,7 +91,8 @@ if ((expected) != (actual)) { \ 
        statusDescActual = Kinetic_GetStatusDescription(actual); } \

    sprintf(err, "Expected Kinetic status code of %s(%d), Was %s(%d) ", \

        statusDescExpected, (expected), statusDescActual, (actual)); \

    if (msg != NULL) { strcat(err, " : "); strcat(err, msg); } \

    char * p_msg = msg; \

    if (p_msg != NULL) { strcat(err, " : "); strcat(err, p_msg); } \

    TEST_FAIL_MESSAGE(err); \

}

#define TEST_ASSERT_EQUAL_KineticStatus(expected, actual) \