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

cleanup to canon_int_directory_operations() - use GP_DEBUG, check results

Browse Source 
more carefully and report failure with gp_camera_set_error().


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3673 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Fredrik
2002-01-03 11:00:47 +00:00
parent 87ca6b8cb4
commit 1850f4e04d
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
camlibs/canon/canon.c
View File

@@ -130,39 +130,41 @@ canon_int_directory_operations (Camera *camera, const char *path, int action)
canon_usb_funct = CANON_USB_FUNCTION_RMDIR;
break;
default:
gp_debug_printf (GP_DEBUG_LOW, "canon",
"canon_int_directory_operations: "
"Bad operation specified : %i\n", action);
GP_DEBUG ("canon_int_directory_operations: "
"Bad operation specified : %i", action);
return GP_ERROR_BAD_PARAMETERS;
break;
}
gp_debug_printf (GP_DEBUG_LOW, "canon", "canon_int_directory_operations() "
"called to %s the directory '%s'",
canon_usb_funct == CANON_USB_FUNCTION_MKDIR ? "create" : "remove",
path);
GP_DEBUG ("canon_int_directory_operations() "
"called to %s the directory '%s'", canon_usb_funct ==
CANON_USB_FUNCTION_MKDIR ? "create" : "remove", path);
switch (camera->port->type) {
case GP_PORT_USB:
msg = canon_usb_dialogue (camera, canon_usb_funct, &len, path,
strlen (path) + 1);
if (! msg)
return GP_ERROR;
break;
case GP_PORT_SERIAL:
msg = canon_serial_dialogue (camera, type, 0x11, &len, path,
strlen (path) + 1, NULL);
if (!msg) {
canon_serial_error_type (camera);
return GP_ERROR;
}
break;
GP_PORT_DEFAULT
}
if (!msg) {
canon_serial_error_type (camera);
return GP_ERROR;
}
if (len != 4)
return GP_ERROR_CORRUPTED_DATA;
if (msg[0] != 0x00) {
gp_debug_printf (GP_DEBUG_LOW, "canon",
"Could not %s directory %s",
canon_usb_funct ==
CANON_USB_FUNCTION_MKDIR ? "create" : "remove", path);
gp_camera_set_error (camera, "Could not %s directory %s",
canon_usb_funct ==
CANON_USB_FUNCTION_MKDIR ? "create" : "remove", path);
return GP_ERROR;
}
@@ -209,7 +211,7 @@ canon_int_identify_camera (Camera *camera)
}
if (len != 0x4c)
return GP_ERROR;
return GP_ERROR_CORRUPTED_DATA;
/* Store these values in our "camera" structure: */
memcpy (camera->pl->firmwrev, (char *) msg + 8, 4);