summaryrefslogtreecommitdiff
path: root/camlibs
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2009-12-12 11:26:20 +0000
committerMarcus Meissner <marcus@jet.franken.de>2009-12-12 11:26:20 +0000
commit24d162fe16072a70100bf6ca4dd392b98fc9c127 (patch)
tree68f5afc7cc3ca2f2cf9f8ebd1c9bddd79f2d06b6 /camlibs
parentd0f92ff45ecc93a9f196e8f533f1464324b4b19d (diff)
downloadlibgphoto2-24d162fe16072a70100bf6ca4dd392b98fc9c127.tar.gz
return out of the default branch (Coverity)
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@12552 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs')
-rw-r--r--camlibs/konica/library.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/camlibs/konica/library.c b/camlibs/konica/library.c
index 18f1f7c89..158c91971 100644
--- a/camlibs/konica/library.c
+++ b/camlibs/konica/library.c
@@ -474,16 +474,13 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
&size);
break;
default:
- r = GP_ERROR_NOT_SUPPORTED;
+ return (GP_ERROR_NOT_SUPPORTED);
}
camera->pl->timeout = gp_camera_start_timeout (camera, PING_TIMEOUT,
timeout_func);
- C(r);
C(gp_file_set_data_and_size (file, (char*)fdata, size));
- C(gp_file_set_mime_type (file, GP_MIME_JPEG));
-
- return (GP_OK);
+ return gp_file_set_mime_type (file, GP_MIME_JPEG);
}
static int