diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de> | 2011-03-18 11:10:00 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de> | 2011-03-18 11:10:00 +0100 |
| commit | ef5dfb7febd8881158e493451a27a2500ced14cb (patch) | |
| tree | 142d3fce467aa076a4f38437058a5e93f1fecdb7 /src/cameras | |
| parent | 750080d576dadb9c29ac5f565b8e16c8b9aa4a7d (diff) | |
| download | uca-ef5dfb7febd8881158e493451a27a2500ced14cb.tar.gz uca-ef5dfb7febd8881158e493451a27a2500ced14cb.tar.bz2 uca-ef5dfb7febd8881158e493451a27a2500ced14cb.tar.xz uca-ef5dfb7febd8881158e493451a27a2500ced14cb.zip | |
Initialize all camera fields with NULL to catch errors early on
Diffstat (limited to 'src/cameras')
| -rw-r--r-- | src/cameras/dummy.c | 6 | ||||
| -rw-r--r-- | src/cameras/ipe.c | 5 | ||||
| -rw-r--r-- | src/cameras/pco.c | 2 | ||||
| -rw-r--r-- | src/cameras/pf.c | 2 |
4 files changed, 4 insertions, 11 deletions
diff --git a/src/cameras/dummy.c b/src/cameras/dummy.c index 2ad2ec9..0d6c9d1 100644 --- a/src/cameras/dummy.c +++ b/src/cameras/dummy.c @@ -283,7 +283,7 @@ static uint32_t uca_dummy_destroy(struct uca_camera *cam) uint32_t uca_dummy_init(struct uca_camera **cam, struct uca_grabber *grabber) { - struct uca_camera *uca = (struct uca_camera *) malloc(sizeof(struct uca_camera)); + struct uca_camera *uca = uca_cam_new(); uca->destroy = &uca_dummy_destroy; uca->set_property = &uca_dummy_set_property; @@ -296,10 +296,6 @@ uint32_t uca_dummy_init(struct uca_camera **cam, struct uca_grabber *grabber) uca->state = UCA_CAM_CONFIGURABLE; uca->frame_width = 320; uca->frame_height = 240; - uca->current_frame = 0; - uca->grabber = NULL; - uca->callback = NULL; - uca->callback_user = NULL; struct dummy_cam *dummy_cam = (struct dummy_cam *) malloc(sizeof(struct dummy_cam)); dummy_cam->bitdepth = 8; 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; diff --git a/src/cameras/pco.c b/src/cameras/pco.c index 59c689d..3801157 100644 --- a/src/cameras/pco.c +++ b/src/cameras/pco.c @@ -250,7 +250,7 @@ uint32_t uca_pco_init(struct uca_camera **cam, struct uca_grabber *grabber) return UCA_ERR_CAM_NOT_FOUND; } - struct uca_camera *uca = (struct uca_camera *) malloc(sizeof(struct uca_camera)); + struct uca_camera *uca = uca_cam_new(); uca->user = pco; uca->grabber = grabber; uca->grabber->asynchronous = true; diff --git a/src/cameras/pf.c b/src/cameras/pf.c index ab6a490..5ae35ab 100644 --- a/src/cameras/pf.c +++ b/src/cameras/pf.c @@ -208,7 +208,7 @@ uint32_t uca_pf_init(struct uca_camera **cam, struct uca_grabber *grabber) /* We could check if a higher baud rate is supported, but... forget about * it. We don't need high speed configuration. */ - struct uca_camera *uca = (struct uca_camera *) malloc(sizeof(struct uca_camera)); + struct uca_camera *uca = uca_cam_new(); uca->grabber = grabber; uca->grabber->asynchronous = true; |