From 05daa7fb3b5efee686d325ec157c4cde2173aa01 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 19 Mar 2006 20:13:08 +0000 Subject: [PATCH] use static fsfuncs git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8630 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/directory/directory.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/camlibs/directory/directory.c b/camlibs/directory/directory.c index 2c80ad34d..d4a672361 100644 --- a/camlibs/directory/directory.c +++ b/camlibs/directory/directory.c @@ -668,22 +668,23 @@ camera_capture (Camera *camera, CameraCaptureType type, CameraFilePath *path, } #endif +static CameraFilesystemFuncs fsfuncs = { + .file_list_func = file_list_func, + .folder_list_func = folder_list_func, + .set_info_func = set_info_func, + .get_info_func = get_info_func, + .get_file_func = get_file_func, + .put_file_func = put_file_func, + .del_file_func = delete_file_func, + .make_dir_func = make_dir_func, + .remove_dir_func = remove_dir_func, +}; + int camera_init (Camera *camera, GPContext *context) { /* First, set up all the function pointers */ camera->functions->manual = camera_manual; camera->functions->about = camera_about; - - gp_filesystem_set_list_funcs (camera->fs, file_list_func, - folder_list_func, camera); - gp_filesystem_set_info_funcs (camera->fs, get_info_func, - set_info_func, camera); - gp_filesystem_set_file_funcs (camera->fs, get_file_func, - delete_file_func, camera); - gp_filesystem_set_folder_funcs (camera->fs, put_file_func, NULL, - make_dir_func, remove_dir_func, camera); - - return (GP_OK); + return gp_filesystem_set_funcs (camera->fs, &fsfuncs, camera); } -