[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-278-g400c18a

[Jeremy Allison]

The branch, master has been updated
       via  400c18a8c4098b4ba86d32a236e5d89014774f3f (commit)
      from  c9c3d4312d7281904fc4a1cc9abd4831cdf4bfb9 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 400c18a8c4098b4ba86d32a236e5d89014774f3f
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jul 8 18:05:30 2009 -0700

    Rename update_stat_ex_writetime() -> update_stat_ex_mtime()
    to better describe what we're doing here.
    Jeremy

-----------------------------------------------------------------------

Summary of changes:
 source3/include/proto.h |    2 +-
 source3/lib/system.c    |    4 ++--
 source3/smbd/nttrans.c  |    4 ++--
 source3/smbd/reply.c    |    4 ++--
 source3/smbd/trans2.c   |    4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 25a104d..f835da2 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -911,7 +911,7 @@ ssize_t sys_recv(int fd, void *buf, size_t count, int flags);
 ssize_t sys_recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen);
 int sys_fcntl_ptr(int fd, int cmd, void *arg);
 int sys_fcntl_long(int fd, int cmd, long arg);
-void update_stat_ex_writetime(struct stat_ex *dst, struct timespec write_ts);
+void update_stat_ex_mtime(struct stat_ex *dst, struct timespec write_ts);
 int sys_stat(const char *fname,SMB_STRUCT_STAT *sbuf);
 int sys_fstat(int fd,SMB_STRUCT_STAT *sbuf);
 int sys_lstat(const char *fname,SMB_STRUCT_STAT *sbuf);
diff --git a/source3/lib/system.c b/source3/lib/system.c
index b808a36..ffc236e 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -492,10 +492,10 @@ static void get_create_timespec(const struct stat *pst, struct stat_ex *dst)
 /****************************************************************************
  If we update a timestamp in a stat_ex struct we may have to recalculate
  the birthtime. For now only implement this for write time, but we may
- also need to do it for mtime and ctime. JRA.
+ also need to do it for atime and ctime. JRA.
 ****************************************************************************/
 
-void update_stat_ex_writetime(struct stat_ex *dst,
+void update_stat_ex_mtime(struct stat_ex *dst,
 				struct timespec write_ts)
 {
 	dst->st_ex_mtime = write_ts;
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 4f75b9f..5d67647 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -657,7 +657,7 @@ void reply_ntcreate_and_X(struct smb_request *req)
 	ZERO_STRUCT(write_time_ts);
 	get_file_infos(fsp->file_id, NULL, &write_time_ts);
 	if (!null_timespec(write_time_ts)) {
-		update_stat_ex_writetime(&smb_fname->st, write_time_ts);
+		update_stat_ex_mtime(&smb_fname->st, write_time_ts);
 	}
 
 	/* Create time. */
@@ -1148,7 +1148,7 @@ static void call_nt_transact_create(connection_struct *conn,
 	ZERO_STRUCT(write_time_ts);
 	get_file_infos(fsp->file_id, NULL, &write_time_ts);
 	if (!null_timespec(write_time_ts)) {
-		update_stat_ex_writetime(&smb_fname->st, write_time_ts);
+		update_stat_ex_mtime(&smb_fname->st, write_time_ts);
 	}
 
 	/* Create time. */
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index e02482e..0afaf56 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -1121,7 +1121,7 @@ void reply_getatr(struct smb_request *req)
 			fileid = vfs_file_id_from_sbuf(conn, &smb_fname->st);
 			get_file_infos(fileid, NULL, &write_time_ts);
 			if (!null_timespec(write_time_ts)) {
-				update_stat_ex_writetime(&smb_fname->st, write_time_ts);
+				update_stat_ex_mtime(&smb_fname->st, write_time_ts);
 			}
 		}
 
@@ -1803,7 +1803,7 @@ void reply_open(struct smb_request *req)
 		ZERO_STRUCT(write_time_ts);
 		get_file_infos(fsp->file_id, NULL, &write_time_ts);
 		if (!null_timespec(write_time_ts)) {
-			update_stat_ex_writetime(&smb_fname->st, write_time_ts);
+			update_stat_ex_mtime(&smb_fname->st, write_time_ts);
 		}
 	}
 
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index cb4f10f..0dd2ca2 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -1463,7 +1463,7 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx,
 				fileid = vfs_file_id_from_sbuf(conn, &sbuf);
 				get_file_infos(fileid, NULL, &write_time_ts);
 				if (!null_timespec(write_time_ts)) {
-					update_stat_ex_writetime(&sbuf, write_time_ts);
+					update_stat_ex_mtime(&sbuf, write_time_ts);
 				}
 			}
 
@@ -4258,7 +4258,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 	}
 
 	if (!null_timespec(write_time_ts) && !INFO_LEVEL_IS_UNIX(info_level)) {
-		update_stat_ex_writetime(&sbuf, write_time_ts);
+		update_stat_ex_mtime(&sbuf, write_time_ts);
 	}
 
 	create_time_ts = sbuf.st_ex_btime;


-- 
Samba Shared Repository