DeforaOS/Camera
DeforaOS/Camera
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapt to the new API for the Error class

Browse Source
This commit is contained in:
Pierre Pronchery 2015-11-23 00:06:50 +01:00
parent 132dd10a65
commit d9da521d3f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/camera.c
View File

@ -1004,7 +1004,7 @@ static int _snapshot_dcim(Camera * camera, char const * homedir,
error_set_code(1, "%s: %s: %s", _("Could not save picture"), error_set_code(1, "%s: %s: %s", _("Could not save picture"),
path, strerror(errno)); path, strerror(errno));
free(path); free(path);
return -_camera_error(camera, error_get(), 1); return -_camera_error(camera, error_get(NULL), 1);
} }
free(path); free(path);
return 0; return 0;
@ -1023,7 +1023,7 @@ static char * _snapshot_path(Camera * camera, char const * homedir,
{ {
error_set_code(1, "%s: %s", _("Could not save picture"), error_set_code(1, "%s: %s", _("Could not save picture"),
strerror(errno)); strerror(errno));
_camera_error(camera, error_get(), 1); _camera_error(camera, error_get(NULL), 1);
return NULL; return NULL;
} }
for(i = 0; i < 64; i++) for(i = 0; i < 64; i++)
@ -1090,7 +1090,7 @@ static int _snapshot_save(Camera * camera, char const * path,
(error != NULL) ? error->message (error != NULL) ? error->message
: _("Unknown error")); : _("Unknown error"));
g_error_free(error); g_error_free(error);
return -_camera_error(camera, error_get(), 1); return -_camera_error(camera, error_get(NULL), 1);
} }
return 0; return 0;
} }
@ -1376,12 +1376,12 @@ static gboolean _camera_on_open(gpointer data)
error_set_code(1, "%s: %s (%s)", camera->device, error_set_code(1, "%s: %s (%s)", camera->device,
_("Could not open the video capture device"), _("Could not open the video capture device"),
strerror(errno)); strerror(errno));
_camera_error(camera, error_get(), 1); _camera_error(camera, error_get(NULL), 1);
return FALSE; return FALSE;
} }
if(_open_setup(camera) != 0) if(_open_setup(camera) != 0)
{ {
_camera_error(camera, error_get(), 1); _camera_error(camera, error_get(NULL), 1);
close(camera->fd); close(camera->fd);
camera->fd = -1; camera->fd = -1;
/* FIXME also free camera->buffers */ /* FIXME also free camera->buffers */