summaryrefslogtreecommitdiff
path: root/camlibs/lg_gsm
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2006-03-31 21:45:16 +0000
committerMarcus Meissner <marcus@jet.franken.de>2006-03-31 21:45:16 +0000
commit3dcdaabb24f9981ffa6792d726cdda57ea21d181 (patch)
tree8372881b4a9ece37c8b3097fbf0388609acf420d /camlibs/lg_gsm
parent22ce3b452b2c7110405c11a723559ce3594e883a (diff)
downloadlibgphoto2-3dcdaabb24f9981ffa6792d726cdda57ea21d181.tar.gz
converted more camlibs to fsfuncs.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8700 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/lg_gsm')
-rw-r--r--camlibs/lg_gsm/library.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/camlibs/lg_gsm/library.c b/camlibs/lg_gsm/library.c
index 82190be36..ae1a12bba 100644
--- a/camlibs/lg_gsm/library.c
+++ b/camlibs/lg_gsm/library.c
@@ -179,6 +179,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)
{
@@ -218,8 +223,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)
@@ -228,6 +232,5 @@ camera_init(Camera *camera, GPContext *context)
/* Connect to the camera */
lg_gsm_init (camera->port, &camera->pl->model, camera->pl->info);
-
return GP_OK;
}