From 27bddd1f54202b88fb381b8e74a5a41849d7d770 Mon Sep 17 00:00:00 2001 From: "subham.sen" Date: Thu, 27 Nov 2014 14:55:49 +0530 Subject: [PATCH] Resolved the Memory Leak in the file Change-Id: I9e9094a55d3e06e66042152066c3b7cb395a5a12 Signed-off-by: subham.sen --- framework/Makefile | 27 ++------------------------- framework/Makefile_TPCSSerDaemon | 10 +--------- framework/Makefile_TWPSerDaemon | 13 ++----------- 3 files changed, 5 insertions(+), 45 deletions(-) mode change 100755 => 100644 framework/Makefile_TPCSSerDaemon diff --git a/framework/Makefile b/framework/Makefile index 356621a..c0a14dd 100644 --- a/framework/Makefile +++ b/framework/Makefile @@ -62,42 +62,19 @@ else CFLAGS := -g -fPIC $(INCLUDE) -DUNIX -DDEBUG $(CFLAGS) endif -CFLAGS := $(CFLAGS) $(PKCL_CFLAGS) $(TCS_CFLAGS) -Wall -Werror - -# Define a list of pkg-config packages we want to use -pkg_packages = dlog - -PKG_CFLAGS = $(shell pkg-config --cflags $(pkg_packages)) -PKG_LDFLAGS = $(shell pkg-config --libs $(pkg_packages)) - -# Combine user supplied, additional, and pkg-config flags -ifeq ($(TCS_CFG), release) - PKGLD_FLAGS = - PKGCFLAGS = -else - PKGLD_FLAGS += $(PKG_LDFLAGS) -L./lib - PKGCFLAGS += -Wall -I$(SRCDIR) $(PKCL_CFLAGS) $(PKG_CFLAGS) -endif +CFLAGS := $(CFLAGS) $(PKCL_CFLAGS) $(TCS_CFLAGS) SOURCES = $(SRCDIR)/TCSImpl.c $(SRCDIR)/TWPImpl.c OBJECTS = $(OUTDIR)/TCSImpl.o $(OUTDIR)/TWPImpl.o $(OUTDIR)/%.o: $(SRCDIR)/%.c - $(CC) $(CFLAGS) $(PKGCFLAGS) -I. -o $(OUTDIR)/$*.o -c $(SRCDIR)/$*.c + $(CC) $(CFLAGS) -o $(OUTDIR)/$*.o -c $(SRCDIR)/$*.c all: $(OUTDIR) $(TARGET) $(TARGET): $(OBJECTS) -<<<<<<< HEAD - $(LD) -shared -Wl,-zdefs -o $(TARGET) $(OBJECTS) $(LD_FLAGS) $(PKGLD_FLAGS) - -# $(AR) -cr $(TARGET) $(OBJECTS) - - $(STRIP) $(TARGET) -======= $(CC) -shared -Wl,-zdefs -o $(TARGET) $(OBJECTS) $(LD_FLAGS) ->>>>>>> Fixed the HTTP test code for TWP testing per Samsung report $(OUTDIR): @mkdir $(OUTDIR) diff --git a/framework/Makefile_TPCSSerDaemon b/framework/Makefile_TPCSSerDaemon old mode 100755 new mode 100644 index 7e97e48..4e1f4f1 --- a/framework/Makefile_TPCSSerDaemon +++ b/framework/Makefile_TPCSSerDaemon @@ -71,7 +71,7 @@ PKG_LDFLAGS = $(shell pkg-config --libs $(pkg_packages)) LD_FLAGS += $(PKG_LDFLAGS) -lscserver -L./lib -lxml2 GBS_CFLAGS = -I${SYSROOT}/usr/include/dbus-1.0 -I${SYSROOT}/usr/lib/dbus-1.0/include -I${SYSROOT}/usr/include/libxml2 -CFLAGS += -Wall -Werror -I$(SRCDIR) $(PKCL_CFLAGS) $(GBS_CFLAGS) $(PKG_CFLAGS) +CFLAGS += -Wall -I$(SRCDIR) $(PKCL_CFLAGS) $(GBS_CFLAGS) $(PKG_CFLAGS) SOURCES = $(SRCDIR)/TPCSSerDaemon.c \ $(SRCDIR)/IpcForkDaemon.c @@ -85,15 +85,7 @@ $(OUTDIR)/%.o: $(SRCDIR)/%.c all: $(OUTDIR) $(TARGET) $(TARGET): $(OBJECTS) -<<<<<<< HEAD - $(LD) -Wl,-zdefs -o $(TARGET) $(OBJECTS) $(LD_FLAGS) $(PKG_LDFLAGS) - -# $(AR) -cr $(TARGET) $(OBJECTS) - -# $(STRIP) $(TARGET) -======= $(CC) -Wl,-zdefs -o $(TARGET) $(OBJECTS) $(LD_FLAGS) ->>>>>>> Fixed the HTTP test code for TWP testing per Samsung report $(OUTDIR): @mkdir $(OUTDIR) diff --git a/framework/Makefile_TWPSerDaemon b/framework/Makefile_TWPSerDaemon index 40c618b..f1b896a 100644 --- a/framework/Makefile_TWPSerDaemon +++ b/framework/Makefile_TWPSerDaemon @@ -62,7 +62,7 @@ else CFLAGS := -g -fPIC $(INCLUDE) -DUNIX -DDEBUG $(CFLAGS) endif -CFLAGS := $(CFLAGS) $(PKCL_CFLAGS) $(TCS_CFLAGS) -Wall -Werror +CFLAGS := $(CFLAGS) $(PKCL_CFLAGS) $(TCS_CFLAGS) SOURCES = $(SRCDIR)/TWPSerDaemon.c \ $(SRCDIR)/IpcForkDaemon.c @@ -71,11 +71,7 @@ OBJECTS = $(OUTDIR)/TWPSerDaemon.o \ $(OUTDIR)/IpcForkDaemon.o # Define a list of pkg-config packages we want to use -ifeq ($(TCS_CFG), release) - pkg_packages = dbus-glib-1 -else - pkg_packages = dbus-glib-1 dlog -endif +pkg_packages = dbus-glib-1 dlog PKG_CFLAGS = $(shell pkg-config --cflags $(pkg_packages)) PKG_LDFLAGS = $(shell pkg-config --libs $(pkg_packages)) @@ -104,8 +100,3 @@ clean: @rm -f $(TARGET) @rm -f $(OBJECTS) *~ @rm -f *.bb *.bbg *.da *.gcov -<<<<<<< HEAD - --include .depend -======= ->>>>>>> Fixed the HTTP test code for TWP testing per Samsung report -- 2.7.4