Patchwork [4/4] Simplify getrlimit64.c

login
register
mail settings
Submitter Aurelien Jarno
Date Dec. 30, 2017, 6:44 p.m.
Message ID <20171230184441.25392-5-aurelien@aurel32.net>
Download mbox | patch
Permalink /patch/25153/
State New
Headers show

Comments

Aurelien Jarno - Dec. 30, 2017, 6:44 p.m.
Changelog:
	* sysdeps/unix/sysv/linux/alpha/getrlimit64.c (__old_getrlimit64):
	Drop __RLIM_T_MATCHES_RLIM64_T conditional as __old_getrlimit64 is
	never defined in that case.
---
 ChangeLog                             | 6 ++++++
 sysdeps/unix/sysv/linux/getrlimit64.c | 4 ----
 2 files changed, 6 insertions(+), 4 deletions(-)
Adhemerval Zanella Netto - Dec. 31, 2017, 7:34 p.m.
On 30/12/2017 16:44, Aurelien Jarno wrote:
> Changelog:
> 	* sysdeps/unix/sysv/linux/alpha/getrlimit64.c (__old_getrlimit64):
> 	Drop __RLIM_T_MATCHES_RLIM64_T conditional as __old_getrlimit64 is
> 	never defined in that case.

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>

> ---
>  ChangeLog                             | 6 ++++++
>  sysdeps/unix/sysv/linux/getrlimit64.c | 4 ----
>  2 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/ChangeLog b/ChangeLog
> index 663a9186e4..598499fd78 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,9 @@
> +2017-12-30  Aurelien Jarno <aurelien@aurel32.net>
> +
> +	* sysdeps/unix/sysv/linux/alpha/getrlimit64.c (__old_getrlimit64):
> +	Drop __RLIM_T_MATCHES_RLIM64_T conditional as __old_getrlimit64 is
> +	never defined in that case.
> +
>  2017-12-30  Aurelien Jarno <aurelien@aurel32.net>
>  
>  	* sysdeps/unix/sysv/linux/alpha/getrlimit64.c: Fix a typo in the
> diff --git a/sysdeps/unix/sysv/linux/getrlimit64.c b/sysdeps/unix/sysv/linux/getrlimit64.c
> index 53cb4bb4d8..1310d179d0 100644
> --- a/sysdeps/unix/sysv/linux/getrlimit64.c
> +++ b/sysdeps/unix/sysv/linux/getrlimit64.c
> @@ -60,11 +60,7 @@ int
>  attribute_compat_text_section
>  __old_getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits)
>  {
> -# if __RLIM_T_MATCHES_RLIM64_T
> -#  define rlimits32 (*rlimits)
> -# else
>    struct rlimit rlimits32;
> -# endif
>  
>    if (__new_getrlimit (resource, &rlimits32) < 0)
>      return -1;
>

Patch

diff --git a/ChangeLog b/ChangeLog
index 663a9186e4..598499fd78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@ 
+2017-12-30  Aurelien Jarno <aurelien@aurel32.net>
+
+	* sysdeps/unix/sysv/linux/alpha/getrlimit64.c (__old_getrlimit64):
+	Drop __RLIM_T_MATCHES_RLIM64_T conditional as __old_getrlimit64 is
+	never defined in that case.
+
 2017-12-30  Aurelien Jarno <aurelien@aurel32.net>
 
 	* sysdeps/unix/sysv/linux/alpha/getrlimit64.c: Fix a typo in the
diff --git a/sysdeps/unix/sysv/linux/getrlimit64.c b/sysdeps/unix/sysv/linux/getrlimit64.c
index 53cb4bb4d8..1310d179d0 100644
--- a/sysdeps/unix/sysv/linux/getrlimit64.c
+++ b/sysdeps/unix/sysv/linux/getrlimit64.c
@@ -60,11 +60,7 @@  int
 attribute_compat_text_section
 __old_getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits)
 {
-# if __RLIM_T_MATCHES_RLIM64_T
-#  define rlimits32 (*rlimits)
-# else
   struct rlimit rlimits32;
-# endif
 
   if (__new_getrlimit (resource, &rlimits32) < 0)
     return -1;