summaryrefslogtreecommitdiff
path: root/camlibs/aox
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2006-03-19 20:46:21 +0000
committerMarcus Meissner <marcus@jet.franken.de>2006-03-19 20:46:21 +0000
commitf3cd9b5b01ba4d8878c7b9b5db5b1b9c6961cc1d (patch)
tree44c944c978698ced4a8f0b8597a8ac1afe987a08 /camlibs/aox
parent278937a9b5406e110ecd8b526d5538ffb40d470b (diff)
downloadlibgphoto2-f3cd9b5b01ba4d8878c7b9b5db5b1b9c6961cc1d.tar.gz
use gp_fs_set_funcs() and static funcs.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8635 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/aox')
-rw-r--r--camlibs/aox/library.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/camlibs/aox/library.c b/camlibs/aox/library.c
index 8d42702d4..f4972464c 100644
--- a/camlibs/aox/library.c
+++ b/camlibs/aox/library.c
@@ -274,6 +274,11 @@ camera_exit (Camera *camera, GPContext *context)
return GP_OK;
}
+static CameraFilesystemFuncs fsfuncs = {
+ .file_list_func = file_list_func,
+ .get_file_func = get_file_func
+};
+
int
camera_init(Camera *camera, GPContext *context)
{
@@ -311,8 +316,7 @@ camera_init(Camera *camera, GPContext *context)
GP_DEBUG("outep = %x\n", settings.usb.outep);
/* Tell the CameraFilesystem where to get lists from */
- gp_filesystem_set_list_funcs (camera->fs, file_list_func, NULL, camera);
- gp_filesystem_set_file_funcs (camera->fs, get_file_func, NULL, camera);
+ gp_filesystem_set_funcs (camera->fs, &fsfuncs, camera);
camera->pl = malloc (sizeof (CameraPrivateLibrary));
if (!camera->pl) return GP_ERROR_NO_MEMORY;