From 89b0db35db10a8beccaf83909c7f62f127fb5821 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Fri, 17 Sep 2010 15:08:29 -0600 Subject: fdutimens, fdutimensat: update signature, again In general, merging: f(fd,args) and at(dir,name,args) should produce: fdat(fd,dir,name,args) * lib/utimens.h (gl_futimens): Delete, and move signature... (fdutimens): ...here. (fdutimensat): Rearrange signature. (lutimensat): Rename variable for clarity. * lib/fdutimensat.c (fdutimensat): Update signature. * lib/utimens.c (fdutimens): Likewise. (gl_futimens): Delete. (utimens, lutimens): Update callers. * lib/futimens.c (futimens): Likewise. * tests/test-fdutimensat.c: Likewise. * tests/test-utimens.c: Likewise. * tests/test-futimens.h: Update comment. * NEWS: Mention this. Suggested by Paul Eggert. Signed-off-by: Eric Blake --- lib/utimens.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'lib/utimens.h') diff --git a/lib/utimens.h b/lib/utimens.h index f651beebad..8c47cf93f8 100644 --- a/lib/utimens.h +++ b/lib/utimens.h @@ -1,6 +1,5 @@ #include -int fdutimens (char const *, int, struct timespec const [2]); -int gl_futimens (int, char const *, struct timespec const [2]); +int fdutimens (int, char const *, struct timespec const [2]); int utimens (char const *, struct timespec const [2]); int lutimens (char const *, struct timespec const [2]); @@ -8,13 +7,13 @@ int lutimens (char const *, struct timespec const [2]); # include # include -int fdutimensat (int dir, char const *name, int fd, struct timespec const [2], +int fdutimensat (int fd, int dir, char const *name, struct timespec const [2], int atflag); /* Using this function makes application code slightly more readable. */ static inline int -lutimensat (int fd, char const *file, struct timespec const times[2]) +lutimensat (int dir, char const *file, struct timespec const times[2]) { - return utimensat (fd, file, times, AT_SYMLINK_NOFOLLOW); + return utimensat (dir, file, times, AT_SYMLINK_NOFOLLOW); } #endif -- cgit v1.2.1