summaryrefslogtreecommitdiff
path: root/camlibs/pccam600
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2006-03-31 19:49:31 +0000
committerMarcus Meissner <marcus@jet.franken.de>2006-03-31 19:49:31 +0000
commitc80bcadc6ec24d2b376559f35bf147dc1ee80cd4 (patch)
tree3e9b0b47f8cee153398d4c4b95a11234287ef963 /camlibs/pccam600
parentae7c0f3aceaa049bbc94b01bc1410b2f90756cd9 (diff)
downloadlibgphoto2-c80bcadc6ec24d2b376559f35bf147dc1ee80cd4.tar.gz
converted to fsfuncs.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8693 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/pccam600')
-rw-r--r--camlibs/pccam600/library.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/camlibs/pccam600/library.c b/camlibs/pccam600/library.c
index 2801e4e9c..b9049c065 100644
--- a/camlibs/pccam600/library.c
+++ b/camlibs/pccam600/library.c
@@ -276,6 +276,13 @@ static int delete_file_func(CameraFilesystem *fs, const char *folder,
return GP_OK;
}
+static CameraFilesystemFuncs fsfuncs = {
+ .get_info_func = get_info_func,
+ .get_file_func = get_file_func,
+ .file_list_func = file_list_func,
+ .del_file_func = delete_file_func,
+};
+
int camera_init(Camera *camera, GPContext *context){
GPPortSettings settings;
int ret = 0;
@@ -304,9 +311,5 @@ int camera_init(Camera *camera, GPContext *context){
}
ret = pccam600_init(camera->port, context);
if (ret < 0) return ret;
- gp_filesystem_set_info_funcs (camera->fs, get_info_func,NULL, camera);
- gp_filesystem_set_list_funcs (camera->fs, file_list_func, NULL, camera);
- gp_filesystem_set_file_funcs (camera->fs, get_file_func, delete_file_func,
- camera);
- return GP_OK;
+ return gp_filesystem_set_funcs (camera->fs, &fsfuncs, camera);
}