summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2006-03-31 19:59:33 +0000
committerMarcus Meissner <marcus@jet.franken.de>2006-03-31 19:59:33 +0000
commitadb3a3318494142cb5951bf15f689fabbe56f046 (patch)
treed3ed965cd5ea2cb154f70d6be704fcde2778b665
parented692ea58f072b70e14cd1d0e3695509b6cc4969 (diff)
downloadlibgphoto2-adb3a3318494142cb5951bf15f689fabbe56f046.tar.gz
converted to fsfuncs.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8695 67ed7778-7388-44ab-90cf-0a291f65f57c
-rw-r--r--camlibs/polaroid/pdc700.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/camlibs/polaroid/pdc700.c b/camlibs/polaroid/pdc700.c
index e243351e7..c370215d5 100644
--- a/camlibs/polaroid/pdc700.c
+++ b/camlibs/polaroid/pdc700.c
@@ -1175,6 +1175,13 @@ get_info_func (CameraFilesystem *fs, const char *folder, const char *file,
return (GP_OK);
}
+static CameraFilesystemFuncs fsfuncs = {
+ .file_list_func = file_list_func,
+ .get_info_func = get_info_func,
+ .get_file_func = get_file_func,
+ .del_file_func = del_file_func
+};
+
int
camera_init (Camera *camera, GPContext *context)
{
@@ -1190,10 +1197,7 @@ camera_init (Camera *camera, GPContext *context)
camera->functions->set_config = camera_set_config;
/* Now, tell the filesystem where to get lists and info */
- gp_filesystem_set_list_funcs (camera->fs, file_list_func, NULL, camera);
- gp_filesystem_set_info_funcs (camera->fs, get_info_func, NULL, camera);
- gp_filesystem_set_file_funcs (camera->fs, get_file_func,
- del_file_func, camera);
+ gp_filesystem_set_funcs (camera->fs, &fsfuncs, camera);
/* Check if the camera is really there */
CR (gp_port_get_settings (camera->port, &settings));