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.22-649-g45c4f36
- From: vapier at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 7 Jan 2016 09:28:13 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.22-649-g45c4f36
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 45c4f3665aaa63cab148cc9cc96fa07c666c1c38 (commit)
from 48d0341cdd41040714f1e9896efe89d49296bc78 (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=45c4f3665aaa63cab148cc9cc96fa07c666c1c38
commit 45c4f3665aaa63cab148cc9cc96fa07c666c1c38
Author: Khem Raj <raj.khem@gmail.com>
Date: Fri Jan 1 20:20:26 2016 +0000
argp: Use fwrite_unlocked instead of __fxprintf when !_LIBC
__fxprintf is not available when argp is built outside libc.
gnulib has the same logic already.
diff --git a/ChangeLog b/ChangeLog
index 7dc2a94..67f2181 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-07 Khem Raj <raj.khem@gmail.com>
+
+ * argp/argp-fmtstream.c (__argp_fmtstream_free): Use fwrite_unlocked
+ instead of __fxprintf when _LIBC is undefined.
+
2016-01-07 Marko Myllynen <myllynen@redhat.com>
* catgets/test-gencat.sh: Remove space after shebang.
diff --git a/argp/argp-fmtstream.c b/argp/argp-fmtstream.c
index 982db4e..d951a96 100644
--- a/argp/argp-fmtstream.c
+++ b/argp/argp-fmtstream.c
@@ -100,7 +100,11 @@ __argp_fmtstream_free (argp_fmtstream_t fs)
__argp_fmtstream_update (fs);
if (fs->p > fs->buf)
{
+#ifdef _LIBC
__fxprintf (fs->stream, "%.*s", (int) (fs->p - fs->buf), fs->buf);
+#else
+ fwrite_unlocked (fs->buf, 1, fs->p - fs->buf, fs->stream);
+#endif
}
free (fs->buf);
free (fs);
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
argp/argp-fmtstream.c | 4 ++++
2 files changed, 9 insertions(+), 0 deletions(-)
hooks/post-receive
--
GNU C Library master sources