summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Pinkham <cpinkham@infi.net>2002-01-05 13:56:58 +0000
committerChris Pinkham <cpinkham@infi.net>2002-01-05 13:56:58 +0000
commit34b57e6523fe942dc46889915ce187ab729e9f4a (patch)
tree412c1bfbe53b3b33439dc2237dc7cd4139cea418
parenta175df21f5e3965fdfe7f73422312ea3c025ef8c (diff)
downloadlibgphoto2-34b57e6523fe942dc46889915ce187ab729e9f4a.tar.gz
fixed bug in jamcam.c introduced in gp_camera_progress->gp_file_progress
code conversion. git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3730 67ed7778-7388-44ab-90cf-0a291f65f57c
-rw-r--r--camlibs/jamcam/jamcam.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/camlibs/jamcam/jamcam.c b/camlibs/jamcam/jamcam.c
index ac2e26f31..d407b4acc 100644
--- a/camlibs/jamcam/jamcam.c
+++ b/camlibs/jamcam/jamcam.c
@@ -171,6 +171,7 @@ static int get_file_func (CameraFilesystem *fs, const char *folder,
unsigned char gtable[256];
char *ptr;
int size = 0, n = 0;
+ int res;
int width, height;
struct jamcam_file *jc_file;
@@ -181,9 +182,9 @@ static int get_file_func (CameraFilesystem *fs, const char *folder,
CHECK (n = gp_filesystem_number (camera->fs, folder, filename));
- n = gp_file_progress( file, 0 );
- if ( n < 0 ) {
- return( n );
+ res = gp_file_progress( file, 0 );
+ if ( res < 0 ) {
+ return( res );
}
switch (type) {