lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-28 00:21:52 +03:00
Code Activity

Revert "Add INLINE_SYSCALL_RETURN/INLINE_SYSCALL_ERROR_RETURN"

Browse Source 
This reverts commit 0c5b8b5941.
This commit is contained in:
H.J. Lu
2015-08-21 09:57:15 -07:00
parent 8c7c251746
commit e5dee2c896
64 changed files with 292 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
sysdeps/unix/sysv/linux/xstatconv.c
View File

@ -96,7 +96,8 @@ __xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
break;
default:
return INLINE_SYSCALL_ERROR_RETURN (-EINVAL, int, -1);
__set_errno (EINVAL);
return -1;
}
return 0;
@ -169,7 +170,8 @@ __xstat64_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
_STAT_VER_KERNEL does not make sense. */
case _STAT_VER_KERNEL:
default:
return INLINE_SYSCALL_ERROR_RETURN (-EINVAL, int, -1);
__set_errno (EINVAL);
return -1;
}
return 0;
@ -199,13 +201,19 @@ __xstat32_conv (int vers, struct stat64 *kbuf, struct stat *buf)
buf->st_ino = kbuf->st_ino;
if (sizeof (buf->st_ino) != sizeof (kbuf->st_ino)
&& buf->st_ino != kbuf->st_ino)
return INLINE_SYSCALL_ERROR_RETURN (-EOVERFLOW, int, -1);
{
__set_errno (EOVERFLOW);
return -1;
}
}
#else
buf->st_ino = kbuf->st_ino;
if (sizeof (buf->st_ino) != sizeof (kbuf->st_ino)
&& buf->st_ino != kbuf->st_ino)
return INLINE_SYSCALL_ERROR_RETURN (-EOVERFLOW, int, -1);
{
__set_errno (EOVERFLOW);
return -1;
}
#endif
buf->st_mode = kbuf->st_mode;
buf->st_nlink = kbuf->st_nlink;
@ -219,13 +227,19 @@ __xstat32_conv (int vers, struct stat64 *kbuf, struct stat *buf)
/* Check for overflow. */
if (sizeof (buf->st_size) != sizeof (kbuf->st_size)
&& buf->st_size != kbuf->st_size)
return INLINE_SYSCALL_ERROR_RETURN (-EOVERFLOW, int, -1);
{
__set_errno (EOVERFLOW);
return -1;
}
buf->st_blksize = kbuf->st_blksize;
buf->st_blocks = kbuf->st_blocks;
/* Check for overflow. */
if (sizeof (buf->st_blocks) != sizeof (kbuf->st_blocks)
&& buf->st_blocks != kbuf->st_blocks)
return INLINE_SYSCALL_ERROR_RETURN (-EOVERFLOW, int, -1);
{
__set_errno (EOVERFLOW);
return -1;
}
#ifdef _HAVE_STAT_NSEC
buf->st_atim.tv_sec = kbuf->st_atim.tv_sec;
buf->st_atim.tv_nsec = kbuf->st_atim.tv_nsec;
@ -261,7 +275,8 @@ __xstat32_conv (int vers, struct stat64 *kbuf, struct stat *buf)
_STAT_VER_KERNEL does not make sense. */
case _STAT_VER_KERNEL:
default:
return INLINE_SYSCALL_ERROR_RETURN (-EINVAL, int, -1);
__set_errno (EINVAL);
return -1;
}
return 0;