From: Eric Biggers Date: Sat, 25 Oct 2014 00:19:47 +0000 (-0500) Subject: Rename add_image_params => capture_params X-Git-Tag: v1.7.3~12 X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=79d279cf4581fc0295576e33a28faf65686bee2c Rename add_image_params => capture_params --- diff --git a/include/wimlib/capture.h b/include/wimlib/capture.h index b2938d51..ae2640a7 100644 --- a/include/wimlib/capture.h +++ b/include/wimlib/capture.h @@ -21,7 +21,7 @@ struct capture_config { /* Common parameters to implementations of building an in-memory dentry tree * from an on-disk directory structure. */ -struct add_image_params { +struct capture_params { /* Pointer to the lookup table of the WIM. */ struct wim_lookup_table *lookup_table; @@ -66,7 +66,7 @@ struct add_image_params { /* capture_common.c */ extern int -do_capture_progress(struct add_image_params *params, int status, +do_capture_progress(struct capture_params *params, int status, const struct wim_inode *inode); extern int @@ -85,17 +85,17 @@ match_pattern_list(const tchar *path, size_t path_nchars, extern int try_exclude(const tchar *full_path, size_t full_path_nchars, - const struct add_image_params *params); + const struct capture_params *params); typedef int (*capture_tree_t)(struct wim_dentry **, const tchar *, - struct add_image_params *); + struct capture_params *); #ifdef WITH_NTFS_3G /* ntfs-3g_capture.c */ extern int build_dentry_tree_ntfs(struct wim_dentry **root_p, const tchar *device, - struct add_image_params *params); + struct capture_params *params); #endif #ifdef __WIN32__ @@ -103,21 +103,21 @@ build_dentry_tree_ntfs(struct wim_dentry **root_p, extern int win32_build_dentry_tree(struct wim_dentry **root_ret, const tchar *root_disk_path, - struct add_image_params *params); + struct capture_params *params); #define platform_default_capture_tree win32_build_dentry_tree #else /* unix_capture.c */ extern int unix_build_dentry_tree(struct wim_dentry **root_ret, const tchar *root_disk_path, - struct add_image_params *params); + struct capture_params *params); #define platform_default_capture_tree unix_build_dentry_tree #endif #define WIMLIB_ADD_FLAG_ROOT 0x80000000 static inline int -report_capture_error(struct add_image_params *params, int error_code, +report_capture_error(struct capture_params *params, int error_code, const tchar *path) { return report_error(params->progfunc, params->progctx, error_code, path); diff --git a/src/capture_common.c b/src/capture_common.c index 4905e351..df45f08f 100644 --- a/src/capture_common.c +++ b/src/capture_common.c @@ -50,7 +50,7 @@ * via additional hard links, inode->i_nlink will be greater than 1. */ int -do_capture_progress(struct add_image_params *params, int status, +do_capture_progress(struct capture_params *params, int status, const struct wim_inode *inode) { switch (status) { @@ -298,7 +298,7 @@ should_exclude_path(const tchar *path, size_t path_nchars, */ int try_exclude(const tchar *full_path, size_t full_path_nchars, - const struct add_image_params *params) + const struct capture_params *params) { int ret; diff --git a/src/ntfs-3g_capture.c b/src/ntfs-3g_capture.c index 6255f09a..78199efa 100644 --- a/src/ntfs-3g_capture.c +++ b/src/ntfs-3g_capture.c @@ -429,7 +429,7 @@ struct readdir_ctx { size_t path_len; struct dos_name_map *dos_name_map; ntfs_volume *vol; - struct add_image_params *params; + struct capture_params *params; int ret; }; @@ -440,7 +440,7 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_p, size_t path_len, int name_type, ntfs_volume *ntfs_vol, - struct add_image_params *params); + struct capture_params *params); static int wim_ntfs_capture_filldir(void *dirent, const ntfschar *name, @@ -527,7 +527,7 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, size_t path_len, int name_type, ntfs_volume *vol, - struct add_image_params *params) + struct capture_params *params) { u32 attributes; int ret; @@ -727,7 +727,7 @@ do_ntfs_umount(struct _ntfs_volume *vol) int build_dentry_tree_ntfs(struct wim_dentry **root_p, const char *device, - struct add_image_params *params) + struct capture_params *params) { ntfs_volume *vol; ntfs_inode *root_ni; diff --git a/src/unix_capture.c b/src/unix_capture.c index 66cb4be2..151b0b47 100644 --- a/src/unix_capture.c +++ b/src/unix_capture.c @@ -133,13 +133,13 @@ static int unix_build_dentry_tree_recursive(struct wim_dentry **tree_ret, char *path, size_t path_len, int dirfd, const char *relpath, - struct add_image_params *params); + struct capture_params *params); static int unix_scan_directory(struct wim_dentry *dir_dentry, char *full_path, size_t full_path_len, int parent_dirfd, const char *dir_relpath, - struct add_image_params *params) + struct capture_params *params) { int dirfd; @@ -251,7 +251,7 @@ unix_fixup_abslink(char *dest, u64 ino, u64 dev) static int unix_scan_symlink(const char *full_path, int dirfd, const char *relpath, - struct wim_inode *inode, struct add_image_params *params) + struct wim_inode *inode, struct capture_params *params) { char deref_name_buf[4096]; ssize_t deref_name_len; @@ -326,7 +326,7 @@ static int unix_build_dentry_tree_recursive(struct wim_dentry **tree_ret, char *full_path, size_t full_path_len, int dirfd, const char *relpath, - struct add_image_params *params) + struct capture_params *params) { struct wim_dentry *tree = NULL; struct wim_inode *inode = NULL; @@ -457,7 +457,7 @@ out: * * @root_disk_path: The path to the root of the directory tree on disk. * - * @params: See doc for `struct add_image_params'. + * @params: See doc for `struct capture_params'. * * @return: 0 on success, nonzero on failure. It is a failure if any of * the files cannot be `stat'ed, or if any of the needed @@ -469,7 +469,7 @@ out: int unix_build_dentry_tree(struct wim_dentry **root_ret, const char *root_disk_path, - struct add_image_params *params) + struct capture_params *params) { size_t path_len; size_t path_bufsz; diff --git a/src/update_image.c b/src/update_image.c index fc149f0a..bb1b6047 100644 --- a/src/update_image.c +++ b/src/update_image.c @@ -765,7 +765,7 @@ execute_add_command(struct update_command_journal *j, tchar *fs_source_path; tchar *wim_target_path; const tchar *config_file; - struct add_image_params params; + struct capture_params params; struct capture_config config; capture_tree_t capture_tree = platform_default_capture_tree; #ifdef WITH_NTFS_3G diff --git a/src/win32_capture.c b/src/win32_capture.c index 449e73e0..4adf3364 100644 --- a/src/win32_capture.c +++ b/src/win32_capture.c @@ -385,7 +385,7 @@ winnt_build_dentry_tree_recursive(struct wim_dentry **root_ret, size_t full_path_nchars, const wchar_t *filename, size_t filename_nchars, - struct add_image_params *params, + struct capture_params *params, struct winnt_scan_stats *stats, u32 vol_flags); @@ -394,7 +394,7 @@ winnt_recurse_directory(HANDLE h, wchar_t *full_path, size_t full_path_nchars, struct wim_dentry *parent, - struct add_image_params *params, + struct capture_params *params, struct winnt_scan_stats *stats, u32 vol_flags) { @@ -610,7 +610,7 @@ out_close_root_dir: } static int -winnt_rpfix_progress(struct add_image_params *params, const wchar_t *path, +winnt_rpfix_progress(struct capture_params *params, const wchar_t *path, const struct reparse_data *rpdata, int scan_status) { size_t print_name_nchars = rpdata->print_name_nbytes / sizeof(wchar_t); @@ -627,7 +627,7 @@ winnt_rpfix_progress(struct add_image_params *params, const wchar_t *path, static int winnt_try_rpfix(u8 *rpbuf, u16 *rpbuflen_p, u64 capture_root_ino, u64 capture_root_dev, - const wchar_t *path, struct add_image_params *params) + const wchar_t *path, struct capture_params *params) { struct reparse_data rpdata; const wchar_t *rel_target; @@ -746,7 +746,7 @@ winnt_try_rpfix(u8 *rpbuf, u16 *rpbuflen_p, */ static int winnt_get_reparse_data(HANDLE h, const wchar_t *path, - struct add_image_params *params, + struct capture_params *params, u8 *rpbuf, u16 *rpbuflen_ret) { DWORD bytes_returned; @@ -1100,7 +1100,7 @@ winnt_build_dentry_tree_recursive(struct wim_dentry **root_ret, size_t full_path_nchars, const wchar_t *filename, size_t filename_nchars, - struct add_image_params *params, + struct capture_params *params, struct winnt_scan_stats *stats, u32 vol_flags) { @@ -1420,7 +1420,7 @@ winnt_do_scan_warnings(const wchar_t *path, const struct winnt_scan_stats *stats int win32_build_dentry_tree(struct wim_dentry **root_ret, const wchar_t *root_disk_path, - struct add_image_params *params) + struct capture_params *params) { wchar_t *path; int ret;