summaryrefslogtreecommitdiffstats
path: root/source/utils
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-03-05 23:40:03 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:18:24 -0500
commit8f3d530c5a748ea90f42ed8fbe68ae92178d4875 (patch)
treed565d4dec26ef1dc17b9f76351138ffdddca58ff /source/utils
parentb73685d20751ac343faab79332552cd7ee92d831 (diff)
downloadsamba-8f3d530c5a748ea90f42ed8fbe68ae92178d4875.tar.gz
samba-8f3d530c5a748ea90f42ed8fbe68ae92178d4875.tar.xz
samba-8f3d530c5a748ea90f42ed8fbe68ae92178d4875.zip
r21714: Change the VFS interface to use struct timespec
for utimes - change the call to ntimes. This preserves nsec timestamps we get from stat (if the system supports it) and only maps back down to usec or sec resolution on time set. Looks bigger than it is as I had to move lots of internal code from using time_t and struct utimebuf to struct timespec. Jeremy.
Diffstat (limited to 'source/utils')
-rw-r--r--source/utils/net_status.c4
-rw-r--r--source/utils/status.c4
-rw-r--r--source/utils/status_profile.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/source/utils/net_status.c b/source/utils/net_status.c
index c68c9f6e2fb..bfc30eac78a 100644
--- a/source/utils/net_status.c
+++ b/source/utils/net_status.c
@@ -104,7 +104,7 @@ static int show_share(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf,
d_printf("%-10.10s %s %-12s %s",
crec.name,procid_str_static(&crec.pid),
crec.machine,
- time_to_asc(&crec.start));
+ time_to_asc(crec.start));
return 0;
}
@@ -173,7 +173,7 @@ static int show_share_parseable(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf,
guest ? "" : gidtoname(ids->entries[i].gid),
crec.machine,
guest ? "" : ids->entries[i].hostname,
- time_to_asc(&crec.start));
+ time_to_asc(crec.start));
return 0;
}
diff --git a/source/utils/status.c b/source/utils/status.c
index 4f66501511b..deba6a9523b 100644
--- a/source/utils/status.c
+++ b/source/utils/status.c
@@ -162,7 +162,7 @@ static void print_share_mode(const struct share_mode_entry *e,
d_printf("NONE ");
}
- d_printf(" %s %s %s",sharepath, fname, time_to_asc((time_t *)&e->time.tv_sec));
+ d_printf(" %s %s %s",sharepath, fname, time_to_asc((time_t)e->time.tv_sec));
}
}
@@ -207,7 +207,7 @@ static int traverse_fn1(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void *st
d_printf("%-10s %s %-12s %s",
crec.name,procid_str_static(&crec.pid),
crec.machine,
- time_to_asc(&crec.start));
+ time_to_asc(crec.start));
return 0;
}
diff --git a/source/utils/status_profile.c b/source/utils/status_profile.c
index 9224fc176cb..b4c4940f3fd 100644
--- a/source/utils/status_profile.c
+++ b/source/utils/status_profile.c
@@ -113,8 +113,8 @@ BOOL status_profile_dump(BOOL verbose)
d_printf("chdir_time: %u\n", profile_p->syscall_chdir_time);
d_printf("getwd_count: %u\n", profile_p->syscall_getwd_count);
d_printf("getwd_time: %u\n", profile_p->syscall_getwd_time);
- d_printf("utime_count: %u\n", profile_p->syscall_utime_count);
- d_printf("utime_time: %u\n", profile_p->syscall_utime_time);
+ d_printf("ntimes_count: %u\n", profile_p->syscall_ntimes_count);
+ d_printf("ntimes_time: %u\n", profile_p->syscall_ntimes_time);
d_printf("ftruncate_count: %u\n", profile_p->syscall_ftruncate_count);
d_printf("ftruncate_time: %u\n", profile_p->syscall_ftruncate_time);
d_printf("fcntl_lock_count: %u\n", profile_p->syscall_fcntl_lock_count);