Merge branch 'master' of github.com:Seagate/kinetic-c (73962c9e) · Commits · kinetic-archive / kinetic-c

Makefile

+37 −8

Original line number	Diff line number	Diff line
		@@ -21,6 +21,9 @@ LDFLAGS += -lm -l crypto -l ssl

		PROJECT = kinetic-c-client

		PREFIX ?= /usr/local
		LIBDIR ?= /lib

		LIB_DIR = ./src/lib
		VENDOR = ./vendor
		PROTOBUFC = $(VENDOR)/protobuf-c
		@@ -31,9 +34,36 @@ VERSION = ${shell head -n1 $(VERSION_FILE)}
		KINETIC_LIB_NAME = $(PROJECT).$(VERSION)
		KINETIC_LIB = $(BIN_DIR)/lib$(KINETIC_LIB_NAME).a
		LIB_INCS = -I$(LIB_DIR) -I$(PUB_INC) -I$(PROTOBUFC) -I$(VENDOR)
		LIB_DEPS = $(PUB_INC)/kinetic_client.h $(PUB_INC)/byte_array.h $(PUB_INC)/kinetic_types.h $(LIB_DIR)/kinetic_connection.h $(LIB_DIR)/kinetic_hmac.h $(LIB_DIR)/kinetic_logger.h $(LIB_DIR)/kinetic_message.h $(LIB_DIR)/kinetic_nbo.h $(LIB_DIR)/kinetic_operation.h $(LIB_DIR)/kinetic_pdu.h $(LIB_DIR)/kinetic_proto.h $(LIB_DIR)/kinetic_socket.h $(LIB_DIR)/kinetic_types_internal.h
		LIB_DEPS = $(PUB_INC)/kinetic_client.h \
		$(PUB_INC)/byte_array.h \
		$(PUB_INC)/kinetic_types.h \
		$(LIB_DIR)/kinetic_connection.h \
		$(LIB_DIR)/kinetic_hmac.h \
		$(LIB_DIR)/kinetic_logger.h \
		$(LIB_DIR)/kinetic_message.h \
		$(LIB_DIR)/kinetic_nbo.h \
		$(LIB_DIR)/kinetic_operation.h \
		$(LIB_DIR)/kinetic_pdu.h \
		$(LIB_DIR)/kinetic_proto.h \
		$(LIB_DIR)/kinetic_socket.h \
		$(LIB_DIR)/kinetic_types_internal.h
		# LIB_OBJ = $(patsubst %,$(OUT_DIR)/%,$(LIB_OBJS))
		LIB_OBJS = $(OUT_DIR)/kinetic_allocator.o $(OUT_DIR)/kinetic_nbo.o $(OUT_DIR)/kinetic_operation.o $(OUT_DIR)/kinetic_pdu.o $(OUT_DIR)/kinetic_proto.o $(OUT_DIR)/kinetic_socket.o $(OUT_DIR)/kinetic_message.o $(OUT_DIR)/kinetic_logger.o $(OUT_DIR)/kinetic_hmac.o $(OUT_DIR)/kinetic_connection.o $(OUT_DIR)/kinetic_types.o $(OUT_DIR)/kinetic_types_internal.o $(OUT_DIR)/byte_array.o $(OUT_DIR)/kinetic_client.o $(OUT_DIR)/socket99.o $(OUT_DIR)/protobuf-c.o
		LIB_OBJS = $(OUT_DIR)/kinetic_allocator.o \
		$(OUT_DIR)/kinetic_nbo.o \
		$(OUT_DIR)/kinetic_operation.o \
		$(OUT_DIR)/kinetic_pdu.o \
		$(OUT_DIR)/kinetic_proto.o \
		$(OUT_DIR)/kinetic_socket.o \
		$(OUT_DIR)/kinetic_message.o \
		$(OUT_DIR)/kinetic_logger.o \
		$(OUT_DIR)/kinetic_hmac.o \
		$(OUT_DIR)/kinetic_connection.o \
		$(OUT_DIR)/kinetic_types.o \
		$(OUT_DIR)/kinetic_types_internal.o \
		$(OUT_DIR)/byte_array.o \
		$(OUT_DIR)/kinetic_client.o \
		$(OUT_DIR)/socket99.o \
		$(OUT_DIR)/protobuf-c.o
		KINETIC_LIB_OTHER_DEPS = Makefile Rakefile $(VERSION_FILE)

		default: $(KINETIC_LIB)
		@@ -103,7 +133,6 @@ $(OUT_DIR)/kinetic_client.o: $(LIB_DIR)/kinetic_client.c $(LIB_DEPS)
		# Static and Dynamic Library Build Support
		#-------------------------------------------------------------------------------

		PREFIX ?= /usr/local
		KINETIC_SO_DEV = $(BIN_DIR)/lib$(KINETIC_LIB_NAME).so
		KINETIC_SO_RELEASE = $(PREFIX)/lib$(KINETIC_LIB_NAME).so

		@@ -138,8 +167,8 @@ install: $(KINETIC_LIB) $(KINETIC_SO_DEV)
		@echo Installing $(PROJECT) v$(VERSION) into $(PREFIX)
		@echo --------------------------------------------------------------------------------
		@echo
		$(INSTALL) -d $(PREFIX)/lib/
		$(INSTALL) -c $(KINETIC_LIB) $(PREFIX)/lib/
		$(INSTALL) -d $(PREFIX)${LIBDIR}
		$(INSTALL) -c $(KINETIC_LIB) $(PREFIX)${LIBDIR}/
		$(INSTALL) -d $(PREFIX)/include/
		$(INSTALL) -c $(PUB_INC)/$(API_NAME).h $(PREFIX)/include/
		$(INSTALL) -c $(PUB_INC)/kinetic_types.h $(PREFIX)/include/
		@@ -150,9 +179,9 @@ uninstall:
		@echo Uninstalling $(PROJECT) from $(PREFIX)
		@echo --------------------------------------------------------------------------------
		@echo
		$(RM) -f $(PREFIX)/lib/lib$(PROJECT)*.a
		$(RM) -f $(PREFIX)/lib/lib$(PROJECT)*.so
		$(RM) -f $(PREFIX)/include/${PUBLIC_API}.h
		$(RM) -f $(PREFIX)${LIBDIR}/lib$(PROJECT)*.a
		$(RM) -f $(PREFIX)${LIBDIR}/lib$(PROJECT)*.so
		$(RM) -f $(PREFIX)/include/${API_NAME}.h
		$(RM) -f $(PREFIX)/include/kinetic_types.h
		$(RM) -f $(PREFIX)/include/kinetic_proto.h
		$(RM) -f $(PREFIX)/include/protobuf-c/protobuf-c.h

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);