From 474ea510387144f524e2cf5e2b2140900f88155c Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Mon, 21 Mar 2011 12:43:18 +0100 Subject: Use memset(ptr, 0, sizeof(struct)) instead of manually setting function pointers to NULL --- src/grabbers/me4.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/grabbers/me4.c') diff --git a/src/grabbers/me4.c b/src/grabbers/me4.c index 42632af..874df32 100644 --- a/src/grabbers/me4.c +++ b/src/grabbers/me4.c @@ -191,13 +191,11 @@ uint32_t uca_me4_init(struct uca_grabber **grabber) return UCA_ERR_GRABBER_NOT_FOUND; struct uca_grabber *uca = (struct uca_grabber *) malloc(sizeof(struct uca_grabber)); - struct fg_apc_data *me4 = (struct fg_apc_data *) malloc(sizeof(struct fg_apc_data)); + memset(uca, 0, sizeof(struct uca_grabber)); + struct fg_apc_data *me4 = (struct fg_apc_data *) malloc(sizeof(struct fg_apc_data)); + memset(me4, 0, sizeof(struct fg_apc_data)); me4->fg = fg; - me4->mem = NULL; - me4->callback = NULL; - me4->meta_data = NULL; - me4->user = NULL; uca->user = me4; uca->destroy = &uca_me4_destroy; @@ -208,7 +206,6 @@ uint32_t uca_me4_init(struct uca_grabber **grabber) uca->stop_acquire = &uca_me4_stop_acquire; uca->grab = &uca_me4_grab; uca->register_callback = &uca_me4_register_callback; - uca->callback = NULL; *grabber = uca; return UCA_NO_ERROR; -- cgit v1.2.3