From 474ea510387144f524e2cf5e2b2140900f88155c Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de>
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 +++------
 src/uca-cam.c      | 19 ++-----------------
 2 files changed, 5 insertions(+), 23 deletions(-)

(limited to 'src')

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;
diff --git a/src/uca-cam.c b/src/uca-cam.c
index b26b826..7b80f56 100644
--- a/src/uca-cam.c
+++ b/src/uca-cam.c
@@ -1,5 +1,6 @@
 
 #include <stdlib.h>
+#include <string.h>
 #include "uca.h"
 #include "uca-cam.h"
 #include "uca-grabber.h"
@@ -23,27 +24,11 @@ struct uca_camera *uca_cam_new(void)
 {
     struct uca_camera *cam = (struct uca_camera *) malloc(sizeof(struct uca_camera));
 
-    cam->next = NULL;
-
     /* Set all function pointers to NULL so we know early on, if something has
      * not been implemented. */
-    cam->set_property = NULL;
-    cam->get_property = NULL;
-    cam->start_recording = NULL;
-    cam->stop_recording = NULL;
-    cam->grab = NULL;
-    cam->register_callback = NULL;
-    cam->destroy = NULL;
-
-    cam->user = NULL;
+    memset(cam, 0, sizeof(struct uca_camera));
 
-    cam->grabber = NULL;
     cam->state = UCA_CAM_CONFIGURABLE;
     cam->current_frame = 0;
-
-    /* No callbacks and user data associated yet */
-    cam->callback = NULL;
-    cam->callback_user = NULL;
-
     return cam;
 }
-- 
cgit v1.2.3