summaryrefslogtreecommitdiff
path: root/camlibs/dimera
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2001-11-16 02:26:32 +0000
committerDan Fandrich <dan@coneharvesters.com>2001-11-16 02:26:32 +0000
commit9b56ae41ea0178ae3707a82777823ffbe49a0e54 (patch)
treef1c9a870b696b2ae24b0b6aa88115b787cb9628d /camlibs/dimera
parent971693bc0ea74a9aa8b6eef4eb115df89237cfdb (diff)
downloadlibgphoto2-9b56ae41ea0178ae3707a82777823ffbe49a0e54.tar.gz
Propagating more error codes to the caller.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3044 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/dimera')
-rw-r--r--camlibs/dimera/dimera3500.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/camlibs/dimera/dimera3500.c b/camlibs/dimera/dimera3500.c
index 90d9bc029..3aa32a76e 100644
--- a/camlibs/dimera/dimera3500.c
+++ b/camlibs/dimera/dimera3500.c
@@ -21,6 +21,9 @@
*
* History:
* $Log$
+ * Revision 1.30 2001/11/16 02:26:32 dfandrich
+ * Propagating more error codes to the caller.
+ *
* Revision 1.29 2001/11/08 08:09:22 lutz
* Small compile fix (you don't set permissions on thumbnails).
*
@@ -1046,7 +1049,7 @@ int camera_init (Camera *camera) {
debuglog("Checking for modem");
- switch ( mesa_modem_check(camera->port) )
+ switch ( ret = mesa_modem_check(camera->port) )
{
case GP_ERROR_IO:
case GP_ERROR_TIMEOUT:
@@ -1063,6 +1066,9 @@ int camera_init (Camera *camera) {
return GP_ERROR_MODEL_NOT_FOUND;
case GP_OK:
break;
+ default:
+ /* Hopefully, gp_camera_set_error was called for this error */
+ return ret;
}
/* Tell the filesystem where to get listings and info from */