This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, release/2.11/master, updated. glibc-2.11.1-5-g71197fe
- From: pasky at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 10 May 2010 19:38:21 -0000
- Subject: GNU C Library master sources branch, release/2.11/master, updated. glibc-2.11.1-5-g71197fe
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, release/2.11/master has been updated
via 71197fe61ff9e55e4cbfb50cce6a9026e15ddb23 (commit)
from 11c19d374bd4458039d5f8e7e1548d3349bfa3d7 (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=71197fe61ff9e55e4cbfb50cce6a9026e15ddb23
commit 71197fe61ff9e55e4cbfb50cce6a9026e15ddb23
Author: Ryan S. Arnold <rsa@us.ibm.com>
Date: Sat Apr 3 19:20:29 2010 -0700
Remove incorrect paring of /proc/stat etc.
(cherry picked from commit 3ed8e241229e370cca96650ed727f09838c51d67)
diff --git a/ChangeLog b/ChangeLog
index 17dbb62..def693e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-25 Ryan S. Arnold <rsa@us.ibm.com>
+
+ * sysdeps/unix/sysv/linux/getsysstats.c (next_line): Remove
+ redundant and incorrect else block which overwrites current line
+ with the partial next line.
+
2010-01-14 Ulrich Drepper <drepper@redhat.com>
[BZ #11127]
diff --git a/sysdeps/unix/sysv/linux/getsysstats.c b/sysdeps/unix/sysv/linux/getsysstats.c
index 97e20d2..af454b6 100644
--- a/sysdeps/unix/sysv/linux/getsysstats.c
+++ b/sysdeps/unix/sysv/linux/getsysstats.c
@@ -1,5 +1,5 @@
/* Determine various system internal values, Linux version.
- Copyright (C) 1996-2003, 2006, 2007, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1996-2003,2006,2007,2009,2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -117,18 +117,6 @@ next_line (int fd, char *const buffer, char **cp, char **re,
if (nl == NULL)
nl = *re - 1;
}
- else if (nl + 5 >= *re)
- {
- memmove (buffer, nl, *re - nl);
- *re = buffer + (*re - nl);
- nl = *cp = buffer;
-
- ssize_t n = read_not_cancel (fd, *re, buffer_end - *re);
- if (n < 0)
- return NULL;
-
- *re += n;
- }
*cp = nl + 1;
assert (*cp <= *re);
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
sysdeps/unix/sysv/linux/getsysstats.c | 14 +-------------
2 files changed, 7 insertions(+), 13 deletions(-)
hooks/post-receive
--
GNU C Library master sources