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.17-367-g5cc45e1
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 8 Mar 2013 16:48:28 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.17-367-g5cc45e1
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 5cc45e102bdc19dec494e4ae8f0eb832f11af3e5 (commit)
via dd54b8644c60cd7b7bee27ecaae4138e7c056c01 (commit)
via 1ba4f03035faabd9090f61ec5514e2abced5ca29 (commit)
from edf66e57fc2bac083ecc9756a5fe47f9041ed3bb (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=5cc45e102bdc19dec494e4ae8f0eb832f11af3e5
commit 5cc45e102bdc19dec494e4ae8f0eb832f11af3e5
Author: Joseph Myers <joseph@codesourcery.com>
Date: Fri Mar 8 16:47:43 2013 +0000
Use ISO C prototype for __default_morecore.
diff --git a/ChangeLog b/ChangeLog
index 721fedb..651374b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2013-03-08 Joseph Myers <joseph@codesourcery.com>
+ * malloc/morecore.c (__default_morecore): Use ISO C prototype.
+
* malloc/malloc.h (__malloc_ptrdiff_t): Remove macro.
* malloc/morecore.c (__default_morecore): Use ptrdiff_t instead of
__malloc_ptrdiff_t.
diff --git a/malloc/morecore.c b/malloc/morecore.c
index 57284e0..e391732 100644
--- a/malloc/morecore.c
+++ b/malloc/morecore.c
@@ -42,8 +42,7 @@ libc_hidden_proto (__sbrk)
and return the start of data space, or NULL on errors.
If INCREMENT is negative, shrink data space. */
__malloc_ptr_t
-__default_morecore (increment)
- ptrdiff_t increment;
+__default_morecore (ptrdiff_t increment)
{
__malloc_ptr_t result = (__malloc_ptr_t) __sbrk (increment);
if (result == (__malloc_ptr_t) -1)
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=dd54b8644c60cd7b7bee27ecaae4138e7c056c01
commit dd54b8644c60cd7b7bee27ecaae4138e7c056c01
Author: Joseph Myers <joseph@codesourcery.com>
Date: Fri Mar 8 16:46:45 2013 +0000
Remove __malloc_ptrdiff_t.
diff --git a/ChangeLog b/ChangeLog
index 4d9aac9..721fedb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2013-03-08 Joseph Myers <joseph@codesourcery.com>
+ * malloc/malloc.h (__malloc_ptrdiff_t): Remove macro.
+ * malloc/morecore.c (__default_morecore): Use ptrdiff_t instead of
+ __malloc_ptrdiff_t.
+
* malloc/malloc.h (__malloc_size_t): Remove macro.
* malloc/mcheck.c (old_malloc_hook): Use size_t instead of
__malloc_size_t.
diff --git a/malloc/malloc.h b/malloc/malloc.h
index 4695b7d..cd691f1 100644
--- a/malloc/malloc.h
+++ b/malloc/malloc.h
@@ -24,9 +24,6 @@
#include <stdio.h>
# define __malloc_ptr_t void *
-/* Used by GNU libc internals. */
-#define __malloc_ptrdiff_t ptrdiff_t
-
#ifdef _LIBC
# define __MALLOC_HOOK_VOLATILE
# define __MALLOC_DEPRECATED
diff --git a/malloc/morecore.c b/malloc/morecore.c
index 3b19406..57284e0 100644
--- a/malloc/morecore.c
+++ b/malloc/morecore.c
@@ -43,7 +43,7 @@ libc_hidden_proto (__sbrk)
If INCREMENT is negative, shrink data space. */
__malloc_ptr_t
__default_morecore (increment)
- __malloc_ptrdiff_t increment;
+ ptrdiff_t increment;
{
__malloc_ptr_t result = (__malloc_ptr_t) __sbrk (increment);
if (result == (__malloc_ptr_t) -1)
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=1ba4f03035faabd9090f61ec5514e2abced5ca29
commit 1ba4f03035faabd9090f61ec5514e2abced5ca29
Author: Joseph Myers <joseph@codesourcery.com>
Date: Fri Mar 8 16:46:07 2013 +0000
Remove __malloc_size_t.
diff --git a/ChangeLog b/ChangeLog
index 6019060..4d9aac9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2013-03-08 Joseph Myers <joseph@codesourcery.com>
+
+ * malloc/malloc.h (__malloc_size_t): Remove macro.
+ * malloc/mcheck.c (old_malloc_hook): Use size_t instead of
+ __malloc_size_t.
+ (old_memalign_hook): Likewise.
+ (old_realloc_hook): Likewise.
+ (struct hdr): Likewise.
+ (flood): Likewise.
+ (mallochook): Likewise.
+ (memalignhook): Likewise.
+ (reallochook): Likewise.
+ * malloc/mtrace.c (tr_old_malloc_hook): Likewise.
+ (tr_old_realloc_hook): Likewise.
+ (tr_old_memalign_hook): Likewise.
+ (tr_mallochook): Likewise.
+ (tr_reallochook): Likewise.
+ (tr_memalignhook): Likewise.
+
2013-03-08 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
* sysdeps/ieee754/ldbl-128ibm/math_ldbl.h (ldbl_pack): Rename to
diff --git a/malloc/malloc.h b/malloc/malloc.h
index 9fe7ab2..4695b7d 100644
--- a/malloc/malloc.h
+++ b/malloc/malloc.h
@@ -25,7 +25,6 @@
# define __malloc_ptr_t void *
/* Used by GNU libc internals. */
-#define __malloc_size_t size_t
#define __malloc_ptrdiff_t ptrdiff_t
#ifdef _LIBC
diff --git a/malloc/mcheck.c b/malloc/mcheck.c
index b6eb3b3..2e5eadd 100644
--- a/malloc/mcheck.c
+++ b/malloc/mcheck.c
@@ -29,11 +29,10 @@
/* Old hook values. */
static void (*old_free_hook) (__ptr_t ptr, const __ptr_t);
-static __ptr_t (*old_malloc_hook) (__malloc_size_t size, const __ptr_t);
-static __ptr_t (*old_memalign_hook) (__malloc_size_t alignment,
- __malloc_size_t size,
+static __ptr_t (*old_malloc_hook) (size_t size, const __ptr_t);
+static __ptr_t (*old_memalign_hook) (size_t alignment, size_t size,
const __ptr_t);
-static __ptr_t (*old_realloc_hook) (__ptr_t ptr, __malloc_size_t size,
+static __ptr_t (*old_realloc_hook) (__ptr_t ptr, size_t size,
const __ptr_t);
/* Function to call when something awful happens. */
@@ -48,7 +47,7 @@ static void (*abortfunc) (enum mcheck_status);
struct hdr
{
- __malloc_size_t size; /* Exact size requested by user. */
+ size_t size; /* Exact size requested by user. */
unsigned long int magic; /* Magic number to check header integrity. */
struct hdr *prev;
struct hdr *next;
@@ -69,12 +68,12 @@ static int pedantic;
# include <string.h>
# define flood memset
#else
-static void flood (__ptr_t, int, __malloc_size_t);
+static void flood (__ptr_t, int, size_t);
static void
flood (ptr, val, size)
__ptr_t ptr;
int val;
- __malloc_size_t size;
+ size_t size;
{
char *cp = ptr;
while (size--)
@@ -202,7 +201,7 @@ freehook (__ptr_t ptr, const __ptr_t caller)
}
static __ptr_t
-mallochook (__malloc_size_t size, const __ptr_t caller)
+mallochook (size_t size, const __ptr_t caller)
{
struct hdr *hdr;
@@ -235,11 +234,11 @@ mallochook (__malloc_size_t size, const __ptr_t caller)
}
static __ptr_t
-memalignhook (__malloc_size_t alignment, __malloc_size_t size,
+memalignhook (size_t alignment, size_t size,
const __ptr_t caller)
{
struct hdr *hdr;
- __malloc_size_t slop;
+ size_t slop;
char *block;
if (pedantic)
@@ -274,7 +273,7 @@ memalignhook (__malloc_size_t alignment, __malloc_size_t size,
}
static __ptr_t
-reallochook (__ptr_t ptr, __malloc_size_t size, const __ptr_t caller)
+reallochook (__ptr_t ptr, size_t size, const __ptr_t caller)
{
if (size == 0)
{
@@ -283,7 +282,7 @@ reallochook (__ptr_t ptr, __malloc_size_t size, const __ptr_t caller)
}
struct hdr *hdr;
- __malloc_size_t osize;
+ size_t osize;
if (pedantic)
mcheck_check_all ();
diff --git a/malloc/mtrace.c b/malloc/mtrace.c
index e9ccfa2..62867b1 100644
--- a/malloc/mtrace.c
+++ b/malloc/mtrace.c
@@ -58,11 +58,10 @@ __ptr_t mallwatch;
/* Old hook values. */
static void (*tr_old_free_hook) (__ptr_t ptr, const __ptr_t);
-static __ptr_t (*tr_old_malloc_hook) (__malloc_size_t size, const __ptr_t);
-static __ptr_t (*tr_old_realloc_hook) (__ptr_t ptr, __malloc_size_t size,
+static __ptr_t (*tr_old_malloc_hook) (size_t size, const __ptr_t);
+static __ptr_t (*tr_old_realloc_hook) (__ptr_t ptr, size_t size,
const __ptr_t);
-static __ptr_t (*tr_old_memalign_hook) (__malloc_size_t __alignment,
- __malloc_size_t __size,
+static __ptr_t (*tr_old_memalign_hook) (size_t __alignment, size_t __size,
const __ptr_t);
/* This function is called when the block being alloc'd, realloc'd, or
@@ -160,10 +159,10 @@ tr_freehook (ptr, caller)
__libc_lock_unlock (lock);
}
-static __ptr_t tr_mallochook (__malloc_size_t, const __ptr_t) __THROW;
+static __ptr_t tr_mallochook (size_t, const __ptr_t) __THROW;
static __ptr_t
tr_mallochook (size, caller)
- __malloc_size_t size;
+ size_t size;
const __ptr_t caller;
{
__ptr_t hdr;
@@ -190,12 +189,12 @@ tr_mallochook (size, caller)
return hdr;
}
-static __ptr_t tr_reallochook (__ptr_t, __malloc_size_t, const __ptr_t)
+static __ptr_t tr_reallochook (__ptr_t, size_t, const __ptr_t)
__THROW;
static __ptr_t
tr_reallochook (ptr, size, caller)
__ptr_t ptr;
- __malloc_size_t size;
+ size_t size;
const __ptr_t caller;
{
__ptr_t hdr;
@@ -243,11 +242,11 @@ tr_reallochook (ptr, size, caller)
return hdr;
}
-static __ptr_t tr_memalignhook (__malloc_size_t, __malloc_size_t,
+static __ptr_t tr_memalignhook (size_t, size_t,
const __ptr_t) __THROW;
static __ptr_t
tr_memalignhook (alignment, size, caller)
- __malloc_size_t alignment, size;
+ size_t alignment, size;
const __ptr_t caller;
{
__ptr_t hdr;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 25 +++++++++++++++++++++++++
malloc/malloc.h | 4 ----
malloc/mcheck.c | 23 +++++++++++------------
malloc/morecore.c | 3 +--
malloc/mtrace.c | 19 +++++++++----------
5 files changed, 46 insertions(+), 28 deletions(-)
hooks/post-receive
--
GNU C Library master sources