2002-01-13 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* *.[c,h]: Replase last call to gp_camera_set_error (I oversaw one
hidden in the header file).
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3858 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
@@ -1,3 +1,8 @@
|
||||
2002-01-13 Lutz Müller <urc8@rz.uni-karlsruhe.de>
|
||||
|
||||
* *.[c,h]: Replase last call to gp_camera_set_error (I oversaw one
|
||||
hidden in the header file).
|
||||
|
||||
2002-01-13 Lutz Müller <urc8@rz.uni-karlsruhe.de>
|
||||
|
||||
* *.[c,h]: Replace calls to gp_camera_set_error by gp_context_error.
|
||||
|
||||
@@ -289,7 +289,7 @@ canon_int_directory_operations (Camera *camera, const char *path, int action,
|
||||
* This function also gets the firmware revision in the camera struct.
|
||||
**/
|
||||
int
|
||||
canon_int_identify_camera (Camera *camera)
|
||||
canon_int_identify_camera (Camera *camera, GPContext *context)
|
||||
{
|
||||
unsigned char *msg;
|
||||
int len;
|
||||
@@ -342,7 +342,7 @@ canon_int_identify_camera (Camera *camera)
|
||||
* Gets battery status.
|
||||
**/
|
||||
int
|
||||
canon_int_get_battery (Camera *camera, int *pwr_status, int *pwr_source)
|
||||
canon_int_get_battery (Camera *camera, int *pwr_status, int *pwr_source, GPContext *context)
|
||||
{
|
||||
unsigned char *msg;
|
||||
int len;
|
||||
@@ -397,7 +397,7 @@ canon_int_get_battery (Camera *camera, int *pwr_status, int *pwr_source)
|
||||
**/
|
||||
int
|
||||
canon_int_set_file_attributes (Camera *camera, const char *file, const char *dir,
|
||||
unsigned char attrs)
|
||||
unsigned char attrs, GPContext *context)
|
||||
{
|
||||
unsigned char payload[300];
|
||||
unsigned char *msg;
|
||||
@@ -469,7 +469,7 @@ canon_int_set_file_attributes (Camera *camera, const char *file, const char *dir
|
||||
* check that everything went fine.
|
||||
**/
|
||||
int
|
||||
canon_int_set_owner_name (Camera *camera, const char *name)
|
||||
canon_int_set_owner_name (Camera *camera, const char *name, GPContext *context)
|
||||
{
|
||||
unsigned char *msg;
|
||||
int len;
|
||||
@@ -508,7 +508,7 @@ canon_int_set_owner_name (Camera *camera, const char *name)
|
||||
return GP_ERROR_CORRUPTED_DATA;
|
||||
}
|
||||
|
||||
return canon_int_identify_camera (camera);
|
||||
return canon_int_identify_camera (camera, context);
|
||||
}
|
||||
|
||||
|
||||
@@ -527,7 +527,7 @@ canon_int_set_owner_name (Camera *camera, const char *name)
|
||||
* elsewhere.
|
||||
**/
|
||||
time_t
|
||||
canon_int_get_time (Camera *camera)
|
||||
canon_int_get_time (Camera *camera, GPContext *context)
|
||||
{
|
||||
unsigned char *msg;
|
||||
int len;
|
||||
@@ -581,7 +581,7 @@ canon_int_get_time (Camera *camera)
|
||||
*/
|
||||
|
||||
int
|
||||
canon_int_set_time (Camera *camera, time_t date)
|
||||
canon_int_set_time (Camera *camera, time_t date, GPContext *context)
|
||||
{
|
||||
unsigned char *msg;
|
||||
int len;
|
||||
@@ -737,16 +737,16 @@ canon_int_get_disk_name (Camera *camera, GPContext *context)
|
||||
* Gets available room and max capacity of a disk given by @name.
|
||||
**/
|
||||
int
|
||||
canon_int_get_disk_name_info (Camera *camera, const char *name, int *capacity, int *available)
|
||||
canon_int_get_disk_name_info (Camera *camera, const char *name, int *capacity, int *available, GPContext *context)
|
||||
{
|
||||
unsigned char *msg = NULL;
|
||||
int len, cap, ava;
|
||||
|
||||
GP_DEBUG ("canon_int_get_disk_name_info() name '%s'", name);
|
||||
|
||||
CAM_CHECK_PARAM_NULL(name);
|
||||
CAM_CHECK_PARAM_NULL(capacity);
|
||||
CAM_CHECK_PARAM_NULL(available);
|
||||
CON_CHECK_PARAM_NULL(name);
|
||||
CON_CHECK_PARAM_NULL(capacity);
|
||||
CON_CHECK_PARAM_NULL(available);
|
||||
|
||||
switch (camera->port->type) {
|
||||
case GP_PORT_USB:
|
||||
@@ -1298,8 +1298,8 @@ canon_int_get_thumbnail (Camera *camera, const char *name, unsigned char **retda
|
||||
|
||||
GP_DEBUG ("canon_int_get_thumbnail() called for file '%s'", name);
|
||||
|
||||
CAM_CHECK_PARAM_NULL(retdata);
|
||||
CAM_CHECK_PARAM_NULL(length);
|
||||
CON_CHECK_PARAM_NULL(retdata);
|
||||
CON_CHECK_PARAM_NULL(length);
|
||||
|
||||
switch (camera->port->type) {
|
||||
case GP_PORT_USB:
|
||||
@@ -1517,7 +1517,7 @@ old_canon_int_get_thumbnail (Camera *camera, const char *name, int *length)
|
||||
#endif
|
||||
|
||||
int
|
||||
canon_int_delete_file (Camera *camera, const char *name, const char *dir)
|
||||
canon_int_delete_file (Camera *camera, const char *name, const char *dir, GPContext *context)
|
||||
{
|
||||
unsigned char payload[300];
|
||||
unsigned char *msg;
|
||||
|
||||
@@ -65,9 +65,9 @@ typedef enum {
|
||||
CANON_PS_PRO90_IS
|
||||
} canonCamModel;
|
||||
|
||||
#define CAM_CHECK_PARAM_NULL(param) \
|
||||
#define CON_CHECK_PARAM_NULL(param) \
|
||||
if (param == NULL) { \
|
||||
gp_camera_set_error (camera, "NULL param \"%s\" in %s line %i", #param, __FILE__, __LINE__); \
|
||||
gp_context_error (context, "NULL param \"%s\" in %s line %i", #param, __FILE__, __LINE__); \
|
||||
return GP_ERROR_BAD_PARAMETERS; \
|
||||
}
|
||||
|
||||
@@ -157,7 +157,7 @@ struct _CameraPrivateLibrary
|
||||
*/
|
||||
#define GP_PORT_DEFAULT_RETURN_INTERNAL(return_statement) \
|
||||
default: \
|
||||
gp_camera_set_error (camera, "Don't know how to handle " \
|
||||
gp_context_error (context, "Don't know how to handle " \
|
||||
"camera->port->type value %i aka 0x%x" \
|
||||
"in %s line %i.", camera->port->type, \
|
||||
camera->port->type, __FILE__, __LINE__); \
|
||||
@@ -186,12 +186,12 @@ char *canon_int_get_disk_name(Camera *camera, GPContext *context);
|
||||
/*
|
||||
*
|
||||
*/
|
||||
int canon_int_get_battery(Camera *camera, int *pwr_status, int *pwr_source);
|
||||
int canon_int_get_battery(Camera *camera, int *pwr_status, int *pwr_source, GPContext *context);
|
||||
|
||||
/*
|
||||
*
|
||||
*/
|
||||
int canon_int_get_disk_name_info(Camera *camera, const char *name,int *capacity,int *available);
|
||||
int canon_int_get_disk_name_info(Camera *camera, const char *name,int *capacity,int *available, GPContext *context);
|
||||
|
||||
/*
|
||||
*
|
||||
@@ -201,15 +201,15 @@ void canon_int_free_dir(Camera *camera, struct canon_dir *list);
|
||||
int canon_int_get_file(Camera *camera, const char *name, unsigned char **data, int *length, GPContext *context);
|
||||
int canon_int_get_thumbnail(Camera *camera, const char *name, unsigned char **retdata, int *length, GPContext *context);
|
||||
int canon_int_put_file(Camera *camera, CameraFile *file, char *destname, char *destpath, GPContext *context);
|
||||
int canon_int_set_file_attributes(Camera *camera, const char *file, const char *dir, unsigned char attrs);
|
||||
int canon_int_delete_file(Camera *camera, const char *name, const char *dir);
|
||||
int canon_int_set_file_attributes(Camera *camera, const char *file, const char *dir, unsigned char attrs, GPContext *context);
|
||||
int canon_int_delete_file(Camera *camera, const char *name, const char *dir, GPContext *context);
|
||||
int canon_serial_end(Camera *camera);
|
||||
int canon_serial_off(Camera *camera);
|
||||
time_t canon_int_get_time(Camera *camera);
|
||||
int canon_int_set_time(Camera *camera, time_t date);
|
||||
time_t canon_int_get_time(Camera *camera, GPContext *context);
|
||||
int canon_int_set_time(Camera *camera, time_t date, GPContext *context);
|
||||
int canon_int_directory_operations(Camera *camera, const char *path, int action, GPContext *context);
|
||||
int canon_int_identify_camera(Camera *camera);
|
||||
int canon_int_set_owner_name(Camera *camera, const char *name);
|
||||
int canon_int_identify_camera(Camera *camera, GPContext *context);
|
||||
int canon_int_set_owner_name(Camera *camera, const char *name, GPContext *context);
|
||||
|
||||
/* path conversion - needs drive letter, and can therefor not be moved to util.c */
|
||||
const char *canon2gphotopath(Camera *camera, const char *path);
|
||||
|
||||
@@ -156,7 +156,7 @@ check_readiness (Camera *camera, GPContext *context)
|
||||
}
|
||||
|
||||
static void
|
||||
canon_int_switch_camera_off (Camera *camera)
|
||||
canon_int_switch_camera_off (Camera *camera, GPContext *context)
|
||||
{
|
||||
GP_DEBUG ("switch_camera_off()");
|
||||
|
||||
@@ -181,7 +181,7 @@ camera_exit (Camera *camera, GPContext *context)
|
||||
}
|
||||
|
||||
if (camera->pl) {
|
||||
canon_int_switch_camera_off (camera);
|
||||
canon_int_switch_camera_off (camera, context);
|
||||
free (camera->pl);
|
||||
camera->pl = NULL;
|
||||
}
|
||||
@@ -197,7 +197,7 @@ canon_get_batt_status (Camera *camera, int *pwr_status, int *pwr_source, GPConte
|
||||
if (!check_readiness (camera, context))
|
||||
return -1;
|
||||
|
||||
return canon_int_get_battery (camera, pwr_status, pwr_source);
|
||||
return canon_int_get_battery (camera, pwr_status, pwr_source, context);
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -220,7 +220,7 @@ update_disk_cache (Camera *camera, GPContext *context)
|
||||
snprintf (root, sizeof (root), "%s\\", camera->pl->cached_drive);
|
||||
res = canon_int_get_disk_name_info (camera, root,
|
||||
&camera->pl->cached_capacity,
|
||||
&camera->pl->cached_available);
|
||||
&camera->pl->cached_available, context);
|
||||
if (res != GP_OK) {
|
||||
gp_context_error (context, _("Could not get disk info: %s"), gp_result_as_string (res));
|
||||
return 0;
|
||||
@@ -436,7 +436,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
|
||||
attr |= CANON_ATTR_WRITE_PROTECTED;
|
||||
canon_int_set_file_attributes (camera, filename,
|
||||
gphoto2canonpath (camera, folder, context),
|
||||
attr);
|
||||
attr, context);
|
||||
}
|
||||
break;
|
||||
case GP_FILE_TYPE_PREVIEW:
|
||||
@@ -717,7 +717,7 @@ camera_summary (Camera *camera, CameraText *summary, GPContext *context)
|
||||
snprintf (power_str, sizeof (power_str), _("not available: %s"), gp_result_as_string (res));
|
||||
}
|
||||
|
||||
camera_time = canon_int_get_time (camera);
|
||||
camera_time = canon_int_get_time (camera, context);
|
||||
if (camera_time > 0) {
|
||||
time_diff = difftime(camera_time, time(NULL));
|
||||
|
||||
@@ -796,7 +796,7 @@ delete_file_func (CameraFilesystem *fs, const char *folder,
|
||||
|
||||
GP_DEBUG ("delete_file_func: "
|
||||
"filename: %s\nfolder: %s\n", filename, canonfolder);
|
||||
if (canon_int_delete_file (camera, filename, canonfolder) != GP_OK) {
|
||||
if (canon_int_delete_file (camera, filename, canonfolder, context) != GP_OK) {
|
||||
gp_context_error (context, _("Error deleting file"));
|
||||
return GP_ERROR;
|
||||
}
|
||||
@@ -807,7 +807,7 @@ delete_file_func (CameraFilesystem *fs, const char *folder,
|
||||
if ((thumbname != NULL) && (*thumbname != '\0')) {
|
||||
GP_DEBUG ("delete_file_func: "
|
||||
"thumbname: %s\n folder: %s\n", thumbname, canonfolder);
|
||||
if (canon_int_delete_file (camera, thumbname, canonfolder) != GP_OK) {
|
||||
if (canon_int_delete_file (camera, thumbname, canonfolder, context) != GP_OK) {
|
||||
/* XXX should we handle this as an error?
|
||||
* Probably only in case the camera link died,
|
||||
* but not if the file just had already been
|
||||
@@ -958,7 +958,7 @@ camera_get_config (Camera *camera, CameraWidget **window, GPContext *context)
|
||||
gp_widget_append (section, t);
|
||||
|
||||
if (camera->pl->cached_ready == 1) {
|
||||
camtime = canon_int_get_time (camera);
|
||||
camtime = canon_int_get_time (camera, context);
|
||||
if (camtime >= 0) {
|
||||
gp_widget_new (GP_WIDGET_DATE, _("Date and Time (readonly)"), &t);
|
||||
gp_widget_set_value (t, &camtime);
|
||||
@@ -1027,7 +1027,7 @@ camera_set_config (Camera *camera, CameraWidget *window, GPContext *context)
|
||||
if (!check_readiness (camera, context)) {
|
||||
gp_camera_status (camera, _("Camera unavailable"));
|
||||
} else {
|
||||
if (canon_int_set_owner_name (camera, wvalue) == GP_OK)
|
||||
if (canon_int_set_owner_name (camera, wvalue, context) == GP_OK)
|
||||
gp_camera_status (camera, _("Owner name changed"));
|
||||
else
|
||||
gp_camera_status (camera, _("could not change owner name"));
|
||||
@@ -1040,7 +1040,7 @@ camera_set_config (Camera *camera, CameraWidget *window, GPContext *context)
|
||||
if (!check_readiness (camera, context)) {
|
||||
gp_camera_status (camera, _("Camera unavailable"));
|
||||
} else {
|
||||
if (canon_int_set_time (camera, time(NULL)) == GP_OK) {
|
||||
if (canon_int_set_time (camera, time(NULL), context) == GP_OK) {
|
||||
gp_camera_status (camera, _("time set"));
|
||||
} else {
|
||||
gp_camera_status (camera, _("could not set time"));
|
||||
|
||||
@@ -1349,8 +1349,8 @@ canon_serial_ready (Camera *camera, GPContext *context)
|
||||
gp_camera_status (camera, _("Connected to camera"));
|
||||
/* Now is a good time to ask the camera for its owner
|
||||
* name (and Model String as well) */
|
||||
canon_int_identify_camera (camera);
|
||||
canon_int_get_time (camera);
|
||||
canon_int_identify_camera (camera, context);
|
||||
canon_int_get_time (camera, context);
|
||||
|
||||
return GP_OK;
|
||||
}
|
||||
@@ -1374,8 +1374,8 @@ canon_serial_get_thumbnail (Camera *camera, const char *name, unsigned char **da
|
||||
unsigned int total = 0, id;
|
||||
unsigned char *msg;
|
||||
|
||||
CAM_CHECK_PARAM_NULL(length);
|
||||
CAM_CHECK_PARAM_NULL(data);
|
||||
CON_CHECK_PARAM_NULL(length);
|
||||
CON_CHECK_PARAM_NULL(data);
|
||||
*length = 0;
|
||||
*data = NULL;
|
||||
|
||||
|
||||
@@ -222,7 +222,7 @@ canon_usb_init (Camera *camera, GPContext *context)
|
||||
if (res != GP_OK)
|
||||
return res;
|
||||
|
||||
res = canon_int_identify_camera (camera);
|
||||
res = canon_int_identify_camera (camera, context);
|
||||
if (res != GP_OK) {
|
||||
gp_context_error (context, _("Camera not ready, "
|
||||
"identify camera request failed: %s"),
|
||||
|
||||
Reference in New Issue
Block a user