diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2008-07-31 15:21:24 +0000 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2008-07-31 15:21:24 +0000 |
| commit | dd7d7e3f138d1835d153c316f3d771e40dc641ba (patch) | |
| tree | 7427232d1e9759028490f843152a83a4bbbab7db /libc/sysdeps/linux/common/getdents64.c | |
| parent | 89ed2cccba266f7738ceb445e4d43103c08cbe75 (diff) | |
| download | uClibc-alpine-dd7d7e3f138d1835d153c316f3d771e40dc641ba.tar.bz2 uClibc-alpine-dd7d7e3f138d1835d153c316f3d771e40dc641ba.tar.xz | |
Synch with trunk at rev 22997.
Basically trailing whitespaces removal, fix non standard keywords
asm -> __asm__ inline -> __inline__ and some minor changes on trunk.
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'libc/sysdeps/linux/common/getdents64.c')
| -rw-r--r-- | libc/sysdeps/linux/common/getdents64.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libc/sysdeps/linux/common/getdents64.c b/libc/sysdeps/linux/common/getdents64.c index 2328df29e..e695b969c 100644 --- a/libc/sysdeps/linux/common/getdents64.c +++ b/libc/sysdeps/linux/common/getdents64.c @@ -27,7 +27,7 @@ libc_hidden_proto(lseek64) # define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) # endif -struct kernel_dirent64 +struct kernel_dirent64 { uint64_t d_ino; int64_t d_off; @@ -38,7 +38,7 @@ struct kernel_dirent64 # define __NR___syscall_getdents64 __NR_getdents64 -static inline _syscall3(int, __syscall_getdents64, int, fd, unsigned char *, dirp, size_t, count); +static __inline__ _syscall3(int, __syscall_getdents64, int, fd, unsigned char *, dirp, size_t, count); ssize_t __getdents64 (int fd, char *buf, size_t nbytes) attribute_hidden; ssize_t __getdents64 (int fd, char *buf, size_t nbytes) @@ -51,8 +51,8 @@ ssize_t __getdents64 (int fd, char *buf, size_t nbytes) const size_t size_diff = (offsetof (struct dirent64, d_name) - offsetof (struct kernel_dirent64, d_name)); - red_nbytes = MIN (nbytes - ((nbytes / - (offsetof (struct dirent64, d_name) + 14)) * size_diff), + red_nbytes = MIN (nbytes - ((nbytes / + (offsetof (struct dirent64, d_name) + 14)) * size_diff), nbytes - size_diff); dp = (struct dirent64 *) buf; |