darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some obvious fixes to canon_serial_get_dirents(). Must have missed those

Browse Source 
when I implemented the code a few days ago. Sorry about that.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3367 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Fredrik
2001-12-03 12:33:07 +00:00
parent 9eb04f3af3
commit db52afe7db
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
camlibs/canon/serial.c
View File

@@ -1025,7 +1025,7 @@ canon_serial_get_dirents (Camera *camera, unsigned char **dirent_data,
gp_camera_set_error (camera, "canon_serial_get_dirents: "
"Initial dirent packet too short (only %i bytes)",
*dirents_length);
return NULL;
return GP_ERROR;
}
/* don't use GP_DEBUG since we log this with GP_LOG_DATA */
@@ -1057,12 +1057,12 @@ canon_serial_get_dirents (Camera *camera, unsigned char **dirent_data,
*/
while (!p[4]) {
GP_DEBUG ("p[4] is %i", (int) p[4]);
p = canon_serial_recv_msg (camera, 0xb, 0x21, *dirents_length);
p = canon_serial_recv_msg (camera, 0xb, 0x21, dirents_length);
if (p == NULL) {
gp_camera_set_error (camera, "canon_serial_get_dirents: "
"Failed to read another directory entry");
free (data);
return NULL;
return GP_ERROR;
}
/* don't use GP_DEBUG since we log this with GP_LOG_DATA */
@@ -1077,7 +1077,7 @@ canon_serial_get_dirents (Camera *camera, unsigned char **dirent_data,
gp_camera_set_error (camera, "canon_serial_get_dirents: "
"Truncated directory entry received");
free (data);
return NULL;
return GP_ERROR;
}
/* check if we need to allocate some more memory,
@@ -1102,7 +1102,7 @@ canon_serial_get_dirents (Camera *camera, unsigned char **dirent_data,
gp_camera_set_error (camera, "canon_serial_get_dirents: "
"Too many dirents, we must be looping.");
free (data);
return NULL;
return GP_ERROR;
}
temp_ch = realloc (data, mallocd_bytes);
@@ -1112,7 +1112,7 @@ canon_serial_get_dirents (Camera *camera, unsigned char **dirent_data,
"Could not resize dirent buffer "
"to %i bytes", mallocd_bytes);
free (data);
return NULL;
return GP_ERROR;
}
data = temp_ch;
}