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.16-ports-merge-187-g67cc348
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 15 Aug 2012 17:11:55 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-187-g67cc348
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 67cc348d55b886eac7c3b3b028d22ec8e8c349a4 (commit)
via a3f95dcc57e5d2e8fb2ec4675475172f75e739ce (commit)
from fdd3affb9761a0783bc2c3c93cc570cb8efe264b (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=67cc348d55b886eac7c3b3b028d22ec8e8c349a4
commit 67cc348d55b886eac7c3b3b028d22ec8e8c349a4
Author: Roland McGrath <roland@hack.frob.com>
Date: Wed Aug 15 10:09:18 2012 -0700
Declare __getdirentries in internal dirent.h.
diff --git a/ChangeLog b/ChangeLog
index 8e0a080..7ab9bc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2012-08-15 Roland McGrath <roland@hack.frob.com>
+ * include/dirent.h: Declare __getdirentries.
+
* sysdeps/posix/system.c (do_system): Cast SUB_REF () to void when not
using its value, to avoid warnings in the [!_LIBC_REENTRANT] case.
diff --git a/include/dirent.h b/include/dirent.h
index 8e4823c..096a977 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -30,6 +30,10 @@ extern int __scandir64 (const char * __dir,
int (*__selector) (const struct dirent64 *),
int (*__cmp) (const struct dirent64 **,
const struct dirent64 **));
+extern __ssize_t __getdirentries (int __fd, char *__restrict __buf,
+ size_t __nbytes,
+ __off_t *__restrict __basep)
+ __THROW __nonnull ((2, 4));
extern __ssize_t __getdents (int __fd, char *__buf, size_t __nbytes)
internal_function;
extern __ssize_t __getdents64 (int __fd, char *__buf, size_t __nbytes)
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a3f95dcc57e5d2e8fb2ec4675475172f75e739ce
commit a3f95dcc57e5d2e8fb2ec4675475172f75e739ce
Author: Roland McGrath <roland@hack.frob.com>
Date: Wed Aug 15 10:08:32 2012 -0700
Add casts to suppress warnings in system.c under [!_LIBC_REENTRANT].
diff --git a/ChangeLog b/ChangeLog
index d6ef5e9..8e0a080 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-15 Roland McGrath <roland@hack.frob.com>
+
+ * sysdeps/posix/system.c (do_system): Cast SUB_REF () to void when not
+ using its value, to avoid warnings in the [!_LIBC_REENTRANT] case.
+
2012-08-14 Mike Frysinger <vapier@gentoo.org>
* config.h.in (HAVE_CPP_ASM_DEBUGINFO): Delete.
diff --git a/sysdeps/posix/system.c b/sysdeps/posix/system.c
index c4d65bf..5973b62 100644
--- a/sysdeps/posix/system.c
+++ b/sysdeps/posix/system.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2000,2002,2003,2005,2007 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -70,13 +70,13 @@ do_system (const char *line)
{
if (__sigaction (SIGINT, &sa, &intr) < 0)
{
- SUB_REF ();
+ (void) SUB_REF ();
goto out;
}
if (__sigaction (SIGQUIT, &sa, &quit) < 0)
{
save = errno;
- SUB_REF ();
+ (void) SUB_REF ();
goto out_restore_sigint;
}
}
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
include/dirent.h | 4 ++++
sysdeps/posix/system.c | 6 +++---
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d6ef5e9..7ab9bc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-08-15 Roland McGrath <roland@hack.frob.com>
+
+ * include/dirent.h: Declare __getdirentries.
+
+ * sysdeps/posix/system.c (do_system): Cast SUB_REF () to void when not
+ using its value, to avoid warnings in the [!_LIBC_REENTRANT] case.
+
2012-08-14 Mike Frysinger <vapier@gentoo.org>
* config.h.in (HAVE_CPP_ASM_DEBUGINFO): Delete.
diff --git a/include/dirent.h b/include/dirent.h
index 8e4823c..096a977 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -30,6 +30,10 @@ extern int __scandir64 (const char * __dir,
int (*__selector) (const struct dirent64 *),
int (*__cmp) (const struct dirent64 **,
const struct dirent64 **));
+extern __ssize_t __getdirentries (int __fd, char *__restrict __buf,
+ size_t __nbytes,
+ __off_t *__restrict __basep)
+ __THROW __nonnull ((2, 4));
extern __ssize_t __getdents (int __fd, char *__buf, size_t __nbytes)
internal_function;
extern __ssize_t __getdents64 (int __fd, char *__buf, size_t __nbytes)
diff --git a/sysdeps/posix/system.c b/sysdeps/posix/system.c
index c4d65bf..5973b62 100644
--- a/sysdeps/posix/system.c
+++ b/sysdeps/posix/system.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2000,2002,2003,2005,2007 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -70,13 +70,13 @@ do_system (const char *line)
{
if (__sigaction (SIGINT, &sa, &intr) < 0)
{
- SUB_REF ();
+ (void) SUB_REF ();
goto out;
}
if (__sigaction (SIGQUIT, &sa, &quit) < 0)
{
save = errno;
- SUB_REF ();
+ (void) SUB_REF ();
goto out_restore_sigint;
}
}
hooks/post-receive
--
GNU C Library master sources