summaryrefslogtreecommitdiff
path: root/camlibs/smal
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2006-03-31 21:43:18 +0000
committerMarcus Meissner <marcus@jet.franken.de>2006-03-31 21:43:18 +0000
commit22ce3b452b2c7110405c11a723559ce3594e883a (patch)
treee84a2cdc45e58da5891d082b1155aeb0daa76ce4 /camlibs/smal
parent6ec5c187fff1e0887fd4d8d6b0052d9184ad718f (diff)
downloadlibgphoto2-22ce3b452b2c7110405c11a723559ce3594e883a.tar.gz
converted more camlibs to fsfuncs.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8699 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/smal')
-rw-r--r--camlibs/smal/smal.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/camlibs/smal/smal.c b/camlibs/smal/smal.c
index 7111835d7..1b0db3906 100644
--- a/camlibs/smal/smal.c
+++ b/camlibs/smal/smal.c
@@ -186,6 +186,13 @@ file_list_func (CameraFilesystem *fs, const char *folder, CameraList *list,
return (GP_OK);
}
+static CameraFilesystemFuncs fsfuncs = {
+ .file_list_func = file_list_func,
+ .get_file_func = get_file_func,
+ .del_file_func = delete_file_func,
+ .delete_all_func = delete_all_func,
+};
+
int
camera_init (Camera *camera, GPContext *context)
{
@@ -194,10 +201,7 @@ camera_init (Camera *camera, GPContext *context)
camera->functions->exit = camera_exit;
camera->functions->about = camera_about;
- 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);
- gp_filesystem_set_folder_funcs (camera->fs,NULL,delete_all_func, NULL,NULL,camera);
-
+ gp_filesystem_set_funcs (camera->fs, &fsfuncs, camera);
badge = BADGE_UNKNOWN;
gp_camera_get_abilities(camera, &cab);
switch (cab.usb_vendor) {