Commit 7672f5a0 authored by Greg Williams's avatar Greg Williams
Browse files

Merge pull request #4 from dalgaaf/wip-da-cgcc-fixes 

Fix some issues from cgcc build
parents 4a781be7 eefbc438

src/lib/kinetic_allocator.c

+3 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static inline void KineticAllocator_Unlock(void) 
    listsLocked = false;

}



void* KineticAllocator_NewItem(KineticList* const list, size_t size)

static void* KineticAllocator_NewItem(KineticList* const list, size_t size)

{

    KineticListItem* newItem = (KineticListItem*)malloc(sizeof(KineticListItem));

    if (newItem == NULL) {
@@ -68,7 +68,7 @@ void* KineticAllocator_NewItem(KineticList* const list, size_t size) 
    return newItem->data;

}



void KineticAllocator_FreeItem(KineticList* const list, void* item)

static void KineticAllocator_FreeItem(KineticList* const list, void* item)

{

    KineticAllocator_Lock();

    KineticListItem* cur = list->start;
@@ -133,7 +133,7 @@ void KineticAllocator_FreeItem(KineticList* const list, void* item) 
    KineticAllocator_Unlock();

}



void KineticAllocator_FreeList(KineticList* const list)

static void KineticAllocator_FreeList(KineticList* const list)

{

    if (list != NULL) {

        LOG("Freeing list of all items");

src/lib/kinetic_client.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ KineticStatus KineticClient_Connect(const KineticSession* config, 
    }



    *handle = KineticConnection_NewConnection(config);

    if (handle == KINETIC_HANDLE_INVALID) {

    if (*handle == KINETIC_HANDLE_INVALID) {

        LOG("Failed connecting to device!");

        return KINETIC_STATUS_SESSION_INVALID;

    }

src/lib/kinetic_logger.c

+2 −2
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ void KineticLogger_LogHeader(const KineticPDUHeader* header) 
    _indent[strlen(_indent) - 2] = '\0'; \

    LOGF("%s}", _indent);



int KineticLogger_u8toa(char* p_buf, uint8_t val)

static int KineticLogger_u8toa(char* p_buf, uint8_t val)

{

    // LOGF("Converting byte=%02u", val);

    const int width = 2;
@@ -142,7 +142,7 @@ int KineticLogger_u8toa(char* p_buf, uint8_t val) 
    return width;

}



int KineticLogger_ByteArraySliceToCString(char* p_buf,

static int KineticLogger_ByteArraySliceToCString(char* p_buf,

        const ByteArray bytes, const int start, const int count)

{

    // LOGF("Converting ByteArray (count=%u)", count);