summaryrefslogtreecommitdiff
path: root/camlibs/fuji
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2006-03-31 19:20:38 +0000
committerMarcus Meissner <marcus@jet.franken.de>2006-03-31 19:20:38 +0000
commit4cc4be909bcb057afd6523e1520c519dc238a591 (patch)
tree3a515b8e18467939070472d598375322b2a1f3e6 /camlibs/fuji
parentb14c17071f0b3dba1ea694fa9d18c6bc6559e14d (diff)
downloadlibgphoto2-4cc4be909bcb057afd6523e1520c519dc238a591.tar.gz
converted to fsfuncs.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8684 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/fuji')
-rw-r--r--camlibs/fuji/library.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/camlibs/fuji/library.c b/camlibs/fuji/library.c
index 730b01658..a3c6ec312 100644
--- a/camlibs/fuji/library.c
+++ b/camlibs/fuji/library.c
@@ -485,6 +485,14 @@ get_info_func (CameraFilesystem *fs, const char *folder, const char *filename,
return (GP_OK);
}
+static CameraFilesystemFuncs fsfuncs = {
+ .file_list_func = file_list_func,
+ .get_file_func = get_file_func,
+ .del_file_func = del_file_func,
+ .put_file_func = put_file_func,
+ .get_info_func = get_info_func
+};
+
int
camera_init (Camera *camera, GPContext *context)
{
@@ -517,18 +525,10 @@ camera_init (Camera *camera, GPContext *context)
CR (gp_port_set_settings (camera->port, settings));
/* Set up the filesystem. */
- CR (gp_filesystem_set_list_funcs (camera->fs, file_list_func, NULL,
- camera));
- CR (gp_filesystem_set_file_funcs (camera->fs, get_file_func,
- del_file_func, camera));
- CR (gp_filesystem_set_info_funcs (camera->fs, get_info_func, NULL,
- camera));
- CR (gp_filesystem_set_folder_funcs (camera->fs, put_file_func, NULL,
- NULL, NULL, camera));
+ CR (gp_filesystem_set_funcs (camera->fs, &fsfuncs, camera));
/* Initialize the connection */
CR (pre_func (camera, context));
-
/*
* What commands does this camera support? The question is not
* easy to answer, as "One issue the DS7 has is that the