summaryrefslogtreecommitdiffstats
path: root/src/uca.c
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias@ipepdvpc2>2011-03-07 08:57:42 +0100
committerMatthias Vogelgesang <matthias@ipepdvpc2>2011-03-07 08:57:42 +0100
commitad1d96f2d0771d8657da40c80eea8703111a9e80 (patch)
treeb7347f0063efbad71d26f72bf5b4dd84502c489a /src/uca.c
parentd3276429e07d120b5c18a66d9c6315f5fdf6c254 (diff)
downloaduca-ad1d96f2d0771d8657da40c80eea8703111a9e80.tar.gz
uca-ad1d96f2d0771d8657da40c80eea8703111a9e80.tar.bz2
uca-ad1d96f2d0771d8657da40c80eea8703111a9e80.tar.xz
uca-ad1d96f2d0771d8657da40c80eea8703111a9e80.zip
Specific error return codes for grabbers and cameras
Diffstat (limited to 'src/uca.c')
-rw-r--r--src/uca.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/uca.c b/src/uca.c
index 39b45b4..b70c25a 100644
--- a/src/uca.c
+++ b/src/uca.c
@@ -53,7 +53,7 @@ static struct uca_property_t property_map[UCA_PROP_LAST+1] = {
{ NULL, 0, 0 }
};
-struct uca_t *uca_init()
+struct uca_t *uca_init(void)
{
struct uca_t *uca = (struct uca_t *) malloc(sizeof(struct uca_t));
uca->cameras = NULL;
@@ -89,7 +89,7 @@ struct uca_t *uca_init()
while (grabber_inits[i] != NULL) {
uca_grabber_init init = grabber_inits[i];
/* FIXME: we don't only want to take the first one */
- if (init(&grabber) != UCA_ERR_INIT_NOT_FOUND)
+ if (init(&grabber) != UCA_ERR_GRABBER_NOT_FOUND)
break;
i++;
}
@@ -105,7 +105,7 @@ struct uca_t *uca_init()
while (cam_inits[i] != NULL) {
struct uca_camera_t *cam = NULL;
uca_cam_init init = cam_inits[i];
- if (init(&cam, grabber) != UCA_ERR_INIT_NOT_FOUND) {
+ if (init(&cam, grabber) != UCA_ERR_CAM_NOT_FOUND) {
if (current == NULL)
uca->cameras = current = cam;
else {