diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2006-03-31 21:45:16 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2006-03-31 21:45:16 +0000 |
| commit | 3dcdaabb24f9981ffa6792d726cdda57ea21d181 (patch) | |
| tree | 8372881b4a9ece37c8b3097fbf0388609acf420d /camlibs/iclick | |
| parent | 22ce3b452b2c7110405c11a723559ce3594e883a (diff) | |
| download | libgphoto2-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/iclick')
| -rw-r--r-- | camlibs/iclick/library.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/camlibs/iclick/library.c b/camlibs/iclick/library.c index b91172e00..84d1e2ffa 100644 --- a/camlibs/iclick/library.c +++ b/camlibs/iclick/library.c @@ -324,6 +324,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) { @@ -345,11 +350,7 @@ camera_init(Camera *camera, GPContext *context) if (ret < 0) return ret; /* 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_folder_funcs (camera->fs, NULL, NULL, - NULL, NULL, camera); + gp_filesystem_set_funcs (camera->fs, &fsfuncs, camera); camera->pl = malloc (sizeof (CameraPrivateLibrary)); if (!camera->pl) return GP_ERROR_NO_MEMORY; @@ -363,8 +364,6 @@ camera_init(Camera *camera, GPContext *context) if (ret != GP_OK) { free(camera->pl); return ret; - }; - - + } return GP_OK; } |