From ef5dfb7febd8881158e493451a27a2500ced14cb Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Fri, 18 Mar 2011 11:10:00 +0100 Subject: Initialize all camera fields with NULL to catch errors early on --- src/cameras/ipe.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/cameras/ipe.c') diff --git a/src/cameras/ipe.c b/src/cameras/ipe.c index a9f1ff2..45a619c 100644 --- a/src/cameras/ipe.c +++ b/src/cameras/ipe.c @@ -119,7 +119,7 @@ uint32_t uca_ipe_init(struct uca_camera **cam, struct uca_grabber *grabber) pcilib_set_error_handler(&uca_ipe_handle_error, &uca_ipe_handle_error); model = pcilib_get_model(handle); - struct uca_camera *uca = (struct uca_camera *) malloc(sizeof(struct uca_camera)); + struct uca_camera *uca = uca_cam_new(); /* Camera found, set function pointers... */ uca->destroy = &uca_ipe_destroy; @@ -130,9 +130,6 @@ uint32_t uca_ipe_init(struct uca_camera **cam, struct uca_grabber *grabber) uca->grab = &uca_ipe_grab; uca->register_callback = &uca_ipe_register_callback; - uca->callback = NULL; - uca_>callback_user = NULL; - uca->state = UCA_CAM_CONFIGURABLE; uca->user = handle; *cam = uca; -- cgit v1.2.3