From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 8 Sep 2003 16:33:12 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2_3_3~249
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0cb71e0261a96ee93428aeb43478b493a9359e9d;p=thirdparty%2Fglibc.git

Update.

2003-09-08  Wolfram Gloger  <wg@malloc.de>

	* malloc/malloc.c (sYSMALLOc): Move foreign sbrk accounting into
	contiguous case.  Bug report from Prem Gopalan
	<prem@mazunetworks.com>.
	(mALLOPt): Avoid requirement of C99.
---

diff --git a/ChangeLog b/ChangeLog
index 9e54f10ebcf..a4abe89e1b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-08  Wolfram Gloger  <wg@malloc.de>
+
+	* malloc/malloc.c (sYSMALLOc): Move foreign sbrk accounting into
+	contiguous case.  Bug report from Prem Gopalan
+	<prem@mazunetworks.com>.
+	(mALLOPt): Avoid requirement of C99.
+
 2003-09-08  Ulrich Drepper  <drepper@redhat.com>
 
 	* libio/bug-ftell.c: Include <sys/types.h>.
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 8cc9e454dc1..6b89083880c 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -2969,9 +2969,6 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
     */
 
     else {
-      /* Count foreign sbrk as system_mem.  */
-      if (old_size)
-	av->system_mem += brk - old_end;
       front_misalign = 0;
       end_misalign = 0;
       correction = 0;
@@ -2980,6 +2977,10 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
       /* handle contiguous cases */
       if (contiguous(av)) {
 
+	/* Count foreign sbrk as system_mem.  */
+	if (old_size)
+	  av->system_mem += brk - old_end;
+
         /* Guarantee alignment of first new chunk made from this space */
 
         front_misalign = (INTERNAL_SIZE_T)chunk2mem(brk) & MALLOC_ALIGN_MASK;
@@ -5164,11 +5165,11 @@ int mALLOPt(int param_number, int value)
 int mALLOPt(param_number, value) int param_number; int value;
 #endif
 {
-  if(__malloc_initialized < 0)
-    ptmalloc_init ();
   mstate av = &main_arena;
   int res = 1;
 
+  if(__malloc_initialized < 0)
+    ptmalloc_init ();
   (void)mutex_lock(&av->mutex);
   /* Ensure initialization/consolidation */
   malloc_consolidate(av);
diff --git a/manual/time.texi b/manual/time.texi
index e76dfe74ae4..7fc9448a324 100644
--- a/manual/time.texi
+++ b/manual/time.texi
@@ -504,7 +504,7 @@ Instead, use the facilities described in @ref{Time Zone Functions}.
 The @code{gettimeofday} function returns the current calendar time as
 the elapsed time since the epoch in the @code{struct timeval} structure
 indicated by @var{tp}.  (@pxref{Elapsed Time} for a description of
-@code{struct timespec}).  Information about the time zone is returned in
+@code{struct timeval}).  Information about the time zone is returned in
 the structure pointed at @var{tzp}.  If the @var{tzp} argument is a null
 pointer, time zone information is ignored.