commit d225ab0eaecac84e5fd7199968a433a462af0196
author Sean Paul <seanpaul@chromium.org> Mon Feb 09 02:31:58 2015 -0500
committer Tomasz Figa <tfiga@google.com> Sat May 30 15:51:12 2015 +0900
tree 7af9ee765dc171207366bf2007d4da667f3f0ffe
parent 9b27aa890b10d27733dd6f4dc40fe006a2a87ad2

drm_gralloc: Move gralloc.c and gralloc_drm.c to cpp

Change-Id: Id08a921c74fc431328ed92bb94bfeaa5764c3e5c
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Tomasz Figa <tfiga@google.com>

Android.mk

diff --git a/Android.mk b/Android.mk
index dcceda6..f4d4483 100644
--- a/Android.mk
+++ b/Android.mk
@@ -82,7 +82,7 @@
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := \
-	gralloc_drm.c
+	gralloc_drm.cpp
 
 LOCAL_C_INCLUDES := \
 	external/libdrm \
@@ -150,7 +150,7 @@
 
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := \
-	gralloc.c \
+	gralloc.cpp
 
 LOCAL_C_INCLUDES := \
 	external/libdrm \

gralloc.cpp

diff --git a/gralloc.c b/gralloc.cpp
similarity index 98%
rename from gralloc.c
rename to gralloc.cpp
index 3ac3995..3c377c6 100644
--- a/gralloc.c
+++ b/gralloc.cpp
@@ -152,7 +152,7 @@
 {
 	struct alloc_device_t *alloc = (struct alloc_device_t *) dev;
 
-	free(alloc);
+	delete alloc;
 
 	return 0;
 }
@@ -203,7 +203,7 @@
 	if (err)
 		return err;
 
-	alloc = calloc(1, sizeof(*alloc));
+	alloc = new alloc_device_t;
 	if (!alloc)
 		return -EINVAL;
 

gralloc_drm.cpp

diff --git a/gralloc_drm.c b/gralloc_drm.cpp
similarity index 98%
rename from gralloc_drm.c
rename to gralloc_drm.cpp
index e74b423..8826f73 100644
--- a/gralloc_drm.c
+++ b/gralloc_drm.cpp
@@ -104,7 +104,7 @@
 	struct gralloc_drm_t *drm;
 	int err;
 
-	drm = calloc(1, sizeof(*drm));
+	drm = new gralloc_drm_t;
 	if (!drm)
 		return NULL;
 
@@ -117,7 +117,7 @@
 	drm->drv = init_drv_from_fd(drm->fd);
 	if (!drm->drv) {
 		close(drm->fd);
-		free(drm);
+		delete drm;
 		return NULL;
 	}
 
@@ -132,7 +132,7 @@
 	if (drm->drv)
 		drm->drv->destroy(drm->drv);
 	close(drm->fd);
-	free(drm);
+	delete drm;
 }
 
 /*
@@ -250,7 +250,7 @@
 {
 	struct gralloc_drm_handle_t *handle;
 
-	handle = calloc(1, sizeof(*handle));
+	handle = new gralloc_drm_handle_t;
 	if (!handle)
 		return NULL;
 
@@ -282,7 +282,7 @@
 
 	bo = drm->drv->alloc(drm->drv, handle);
 	if (!bo) {
-		free(handle);
+		delete handle;
 		return NULL;
 	}
 
@@ -316,7 +316,7 @@
 		handle->data = 0;
 	}
 	else {
-		free(handle);
+		delete handle;
 	}
 }