This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.12-101-g052fa7b
- From: schwab at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 14 Aug 2010 11:22:40 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.12-101-g052fa7b
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 052fa7b33ef5deeb4987e5264cf397b3161d8a01 (commit)
from 962dba7828cf251a9025ccb43bc6effa30379b72 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=052fa7b33ef5deeb4987e5264cf397b3161d8a01
commit 052fa7b33ef5deeb4987e5264cf397b3161d8a01
Author: Andreas Schwab <schwab@linux-m68k.org>
Date: Sat Aug 14 13:16:04 2010 +0200
Fix compilation
diff --git a/ChangeLog b/ChangeLog
index c69c4c4..02afab1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-14 Andreas Schwab <schwab@linux-m68k.org>
+
+ * sysdeps/unix/sysv/linux/prlimit.c: Make it compile.
+
2010-08-12 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/bits/termios.h: Define EXTPROC.
diff --git a/sysdeps/unix/sysv/linux/prlimit.c b/sysdeps/unix/sysv/linux/prlimit.c
index 6d61e9a..5f7a197 100644
--- a/sysdeps/unix/sysv/linux/prlimit.c
+++ b/sysdeps/unix/sysv/linux/prlimit.c
@@ -24,12 +24,12 @@
#ifdef __NR_prlimit64
int
prlimit (__pid_t pid, enum __rlimit_resource resource,
- __const struct rlimit *new_limit, struct rlimit *old_limit)
+ __const struct rlimit *new_rlimit, struct rlimit *old_rlimit)
{
struct rlimit64 new_rlimit64_mem;
struct rlimit64 *new_rlimit64 = NULL;
struct rlimit64 old_rlimit64_mem;
- struct rlimit64 *old_rlimit64 = (old_rlimiit != NULL
+ struct rlimit64 *old_rlimit64 = (old_rlimit != NULL
? &old_rlimit64_mem : NULL);
if (new_rlimit != NULL)
@@ -39,7 +39,7 @@ prlimit (__pid_t pid, enum __rlimit_resource resource,
else
new_rlimit64_mem.rlim_cur = new_rlimit->rlim_cur;
if (new_rlimit->rlim_max == RLIM_INFINITY)
- new_rlimit64_mem.rlim_max = = RLIM64_INFINITY;
+ new_rlimit64_mem.rlim_max = RLIM64_INFINITY;
else
new_rlimit64_mem.rlim_max = new_rlimit->rlim_max;
new_rlimit64 = &new_rlimit64_mem;
@@ -48,7 +48,7 @@ prlimit (__pid_t pid, enum __rlimit_resource resource,
int res = INLINE_SYSCALL (prlimit64, 4, pid, resource, new_rlimit64,
old_rlimit64);
- if (res == 0 && old_limit != NULL)
+ if (res == 0 && old_rlimit != NULL)
{
/* The prlimit64 syscall is ill-designed for 32-bit machines.
We have to provide a 32-bit variant since otherwise the LFS
@@ -59,7 +59,7 @@ prlimit (__pid_t pid, enum __rlimit_resource resource,
old_rlimit->rlim_cur = old_rlimit64_mem.rlim_cur;
if (old_rlimit->rlim_cur != old_rlimit64_mem.rlim_cur)
{
- if (new_limit == NULL)
+ if (new_rlimit == NULL)
{
__set_errno (EOVERFLOW);
return -1;
@@ -69,7 +69,7 @@ prlimit (__pid_t pid, enum __rlimit_resource resource,
old_rlimit->rlim_max = old_rlimit64_mem.rlim_max;
if (old_rlimit->rlim_max != old_rlimit64_mem.rlim_max)
{
- if (new_limit == NULL)
+ if (new_rlimit == NULL)
{
__set_errno (EOVERFLOW);
return -1;
@@ -83,7 +83,7 @@ prlimit (__pid_t pid, enum __rlimit_resource resource,
#else
int
prlimit (__pid_t pid, enum __rlimit_resource resource,
- __const struct rlimit *new_limit, struct rlimit *old_limit)
+ __const struct rlimit *new_rlimit, struct rlimit *old_rlimit)
{
__set_errno (ENOSYS);
return -1;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 ++++
sysdeps/unix/sysv/linux/prlimit.c | 14 +++++++-------
2 files changed, 11 insertions(+), 7 deletions(-)
hooks/post-receive
--
GNU C Library master sources