converted more camlibs to fsfuncs.

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8699 67ed7778-7388-44ab-90cf-0a291f65f57c

1 files changed, 7 insertions, 5 deletions

diff --git a/camlibs/sonydscf1/sonydscf1.c b/camlibs/sonydscf1/sonydscf1.c
index bb31927ab..bc9b81bbb 100644
--- a/camlibs/sonydscf1/sonydscf1.c
+++ b/camlibs/sonydscf1/sonydscf1.c
@@ -150,6 +150,12 @@ static int file_list_func (CameraFilesystem *fs, const char *folder,
         return GP_OK;
 }
 
+static CameraFilesystemFuncs fsfuncs = {
+	.file_list_func = file_list_func,
+	.get_file_func = get_file_func,
+	.del_file_func = delete_file_func,
+};
+
 int camera_init (Camera *camera, GPContext *context) {
         GPPortSettings settings;
 
@@ -169,10 +175,6 @@ int camera_init (Camera *camera, GPContext *context) {
         gp_port_set_settings (camera->port, settings);
 
 	/* Set up the filesystem */
-	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);
 }