From 8a2ac67b4f992a95abbf9666ab839937302d7143 Mon Sep 17 00:00:00 2001 From: tomoaki Date: Thu, 28 Sep 2017 16:01:50 +0900 Subject: [PATCH 1/2] Update Makefile to add command line parameters Parameters are additional include and lib directories for future useage. e.g. make INCLUDE="-I/foo" LIB="-L/bar" Signed-off-by: tomoaki --- MQTTSNGateway/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/MQTTSNGateway/Makefile b/MQTTSNGateway/Makefile index 0591067..fa5ad97 100644 --- a/MQTTSNGateway/Makefile +++ b/MQTTSNGateway/Makefile @@ -62,14 +62,16 @@ $(SUBDIR)/MQTTSNUnsubscribeServer.c CXX := g++ CPPFLAGS += -INCLUDES += -I$(SRCDIR) \ +INCLUDE := +INCLUDES += $(INCLUDE) -I$(SRCDIR) \ -I$(SRCDIR)/$(OS) \ -I$(SRCDIR)/$(OS)/$(SENSORNET) \ -I$(SUBDIR) \ -I$(SRCDIR)/$(TEST) DEFS := -LIBS += -L/usr/local/lib +LIB := +LIBS += $(LIB) -L/usr/local/lib LDFLAGS := CXXFLAGS := -Wall -O3 -std=c++11 LDADD := -lpthread -lssl -lcrypto -lrt From 9d258cf53a59192bf85b14009905aa93c7ab5218 Mon Sep 17 00:00:00 2001 From: tomoaki Date: Thu, 28 Sep 2017 22:13:23 +0900 Subject: [PATCH 2/2] Update: change codes simple #86 Signed-off-by: tomoaki --- MQTTSNGateway/src/MQTTSNGWClient.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/MQTTSNGateway/src/MQTTSNGWClient.cpp b/MQTTSNGateway/src/MQTTSNGWClient.cpp index 19c7b91..9a8a043 100644 --- a/MQTTSNGateway/src/MQTTSNGWClient.cpp +++ b/MQTTSNGateway/src/MQTTSNGWClient.cpp @@ -230,12 +230,10 @@ Client* ClientList::createClient(SensorNetAddress* addr, MQTTSNString* clientId, else { MQTTSNString dummyId; - char* id = (char*)malloc(1); - *id = 0; - dummyId.cstring = id; + dummyId.cstring = strdup(""); dummyId.lenstring.len = 0; client->setClientId(dummyId); - free(id); + free(dummyId.cstring); } /* add the list */