commit bff3472e2eb2099e8d9e6e54af73030f25372fb7
author Bryce Harrington <bryce@osg.samsung.com> Thu Nov 20 22:21:56 2014 -0800
committer Pekka Paalanen <pekka.paalanen@collabora.co.uk> Fri Nov 28 16:10:04 2014 +0200
tree 51eee6c6298067c07b38330d5863c03e27919a04
parent de44761a1a51a7fb79f7d239b802fd3f1660f744

Setting members to 0/NULL after a zalloc or calloc is redundant

calloc (and zalloc) set the allocated memory to 0, so there's really no
need to do it manually.

Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Marek Chalupa <mchqwerty@gmail.com>
[Pekka: dropped the src/evdev.c hunk.]
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>

src/compositor-fbdev.c

diff --git a/src/compositor-fbdev.c b/src/compositor-fbdev.c
index bbc7176..55b7d3c 100644
--- a/src/compositor-fbdev.c
+++ b/src/compositor-fbdev.c
@@ -533,10 +533,6 @@
 	output->base.start_repaint_loop = fbdev_output_start_repaint_loop;
 	output->base.repaint = fbdev_output_repaint;
 	output->base.destroy = fbdev_output_destroy;
-	output->base.assign_planes = NULL;
-	output->base.set_backlight = NULL;
-	output->base.set_dpms = NULL;
-	output->base.switch_mode = NULL;
 
 	/* only one static mode in list */
 	output->mode.flags =

src/compositor.c

diff --git a/src/compositor.c b/src/compositor.c
index 17e930c..10a2169 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -440,10 +440,6 @@
 	wl_list_init(&view->link);
 	wl_list_init(&view->layer_link.link);
 
-	view->plane = NULL;
-	view->layer_link.layer = NULL;
-	view->parent_view = NULL;
-
 	pixman_region32_init(&view->clip);
 	pixman_region32_init(&view->transform.masked_boundingbox);
 	pixman_region32_init(&view->transform.masked_opaque);
@@ -459,8 +455,6 @@
 	pixman_region32_init(&view->transform.boundingbox);
 	view->transform.dirty = 1;
 
-	view->output = NULL;
-
 	return view;
 }
 
@@ -617,8 +611,6 @@
 
 	wl_signal_init(&surface->destroy_signal);
 
-	surface->resource = NULL;
-
 	surface->compositor = compositor;
 	surface->ref_count = 1;
 
@@ -629,10 +621,6 @@
 
 	weston_surface_state_init(&surface->pending);
 
-	surface->output = NULL;
-
-	surface->viewport_resource = NULL;
-
 	pixman_region32_init(&surface->damage);
 	pixman_region32_init(&surface->opaque);
 	region_init_infinite(&surface->input);

src/gl-renderer.c

diff --git a/src/gl-renderer.c b/src/gl-renderer.c
index 40447c7..938d4fa 100644
--- a/src/gl-renderer.c
+++ b/src/gl-renderer.c
@@ -1841,8 +1841,6 @@
 	for (i = 0; i < BUFFER_DAMAGE_COUNT; i++)
 		pixman_region32_init(&go->buffer_damage[i]);
 
-	go->buffer_damage_index = 0;
-
 	output->renderer_state = go;
 
 	log_egl_config_info(gr->egl_display, egl_config);

src/rpi-renderer.c

diff --git a/src/rpi-renderer.c b/src/rpi-renderer.c
index c222eb6..4d0f522 100644
--- a/src/rpi-renderer.c
+++ b/src/rpi-renderer.c
@@ -497,7 +497,6 @@
 		return NULL;
 
 	wl_list_init(&surface->views);
-	surface->visible_views = 0;
 	surface->single_buffer = renderer->single_buffer;
 	surface->enable_opaque_regions = renderer->enable_opaque_regions;
 	rpi_resource_init(&surface->resources[0]);