GNU C Library master sources branch, master, updated. glibc-2.15-91-g6e4b210

[drepper at sourceware dot org]

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  6e4b210745556ea4d74d4dc6637994756bf2d6b5 (commit)
      from  d77e786926ef8d4af55d978b86cc525e7366acd7 (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=6e4b210745556ea4d74d4dc6637994756bf2d6b5

commit 6e4b210745556ea4d74d4dc6637994756bf2d6b5
Author: Ulrich Drepper <drepper@gmail.com>
Date:   Tue Jan 17 19:21:09 2012 -0500

    More minor malloc cleanups

diff --git a/malloc/malloc.c b/malloc/malloc.c
index 5719148..12d2211 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -1089,11 +1089,10 @@ typedef struct malloc_chunk* mchunkptr;
 static void*  _int_malloc(mstate, size_t);
 static void     _int_free(mstate, mchunkptr, int);
 static void*  _int_realloc(mstate, mchunkptr, INTERNAL_SIZE_T,
-			     INTERNAL_SIZE_T);
+			   INTERNAL_SIZE_T);
 static void*  _int_memalign(mstate, size_t, size_t);
 static void*  _int_valloc(mstate, size_t);
 static void*  _int_pvalloc(mstate, size_t);
-/*static void*  cALLOc(size_t, size_t);*/
 static int      mTRIm(mstate, size_t);
 static size_t   mUSABLe(void*);
 static void     mSTATs(void);
@@ -1140,9 +1139,6 @@ static void      free_atfork(void* mem, const void *caller);
 #if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
 # define MAP_ANONYMOUS MAP_ANON
 #endif
-#if !defined(MAP_FAILED)
-# define MAP_FAILED ((char*)-1)
-#endif
 
 #ifndef MAP_NORESERVE
 # ifdef MAP_AUTORESRV
@@ -1152,28 +1148,9 @@ static void      free_atfork(void* mem, const void *caller);
 # endif
 #endif
 
-/*
-   Nearly all versions of mmap support MAP_ANONYMOUS,
-   so the following is unlikely to be needed, but is
-   supplied just in case.
-*/
-
-#ifndef MAP_ANONYMOUS
-
-static int dev_zero_fd = -1; /* Cached file descriptor for /dev/zero. */
-
-#define MMAP(addr, size, prot, flags) ((dev_zero_fd < 0) ? \
- (dev_zero_fd = open("/dev/zero", O_RDWR), \
-  mmap((addr), (size), (prot), (flags), dev_zero_fd, 0)) : \
-   mmap((addr), (size), (prot), (flags), dev_zero_fd, 0))
-
-#else
-
 #define MMAP(addr, size, prot, flags) \
  (mmap((addr), (size), (prot), (flags)|MAP_ANONYMOUS, -1, 0))
 
-#endif
-
 
 /*
   -----------------------  Chunk representations -----------------------

-----------------------------------------------------------------------

Summary of changes:
 malloc/malloc.c |   25 +------------------------
 1 files changed, 1 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources