X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Funix_capture.c;h=488996aa3a9bafa2db4955cee61a677334dbfbd5;hb=d1284a3b721162794ebd7131d090ab7c0cba92a3;hp=66cb4be20265133a647f425d63b8e3f81723d91b;hpb=c3e9bd8344d97960e8e6cf29cc1ff633e925f986;p=wimlib

diff --git a/src/unix_capture.c b/src/unix_capture.c
index 66cb4be2..488996aa 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;
@@ -388,13 +388,13 @@ unix_build_dentry_tree_recursive(struct wim_dentry **tree_ret,
 		goto out_progress;
 
 #ifdef HAVE_STAT_NANOSECOND_PRECISION
-	inode->i_creation_time = timespec_to_wim_timestamp(stbuf.st_mtim);
-	inode->i_last_write_time = timespec_to_wim_timestamp(stbuf.st_mtim);
-	inode->i_last_access_time = timespec_to_wim_timestamp(stbuf.st_atim);
+	inode->i_creation_time = timespec_to_wim_timestamp(&stbuf.st_mtim);
+	inode->i_last_write_time = timespec_to_wim_timestamp(&stbuf.st_mtim);
+	inode->i_last_access_time = timespec_to_wim_timestamp(&stbuf.st_atim);
 #else
-	inode->i_creation_time = unix_timestamp_to_wim(stbuf.st_mtime);
-	inode->i_last_write_time = unix_timestamp_to_wim(stbuf.st_mtime);
-	inode->i_last_access_time = unix_timestamp_to_wim(stbuf.st_atime);
+	inode->i_creation_time = time_t_to_wim_timestamp(stbuf.st_mtime);
+	inode->i_last_write_time = time_t_to_wim_timestamp(stbuf.st_mtime);
+	inode->i_last_access_time = time_t_to_wim_timestamp(stbuf.st_atime);
 #endif
 	inode->i_resolved = 1;
 	if (params->add_flags & WIMLIB_ADD_FLAG_UNIX_DATA) {
@@ -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;