svn commit: trunk/uClibc: libc/stdlib/malloc-standard test/malloc

sjhill at uclibc.org sjhill at uclibc.org
Fri Mar 17 03:00:06 UTC 2006


Author: sjhill
Date: 2006-03-16 19:00:05 -0800 (Thu, 16 Mar 2006)
New Revision: 14551

Log:
Fix 'realloc' and revert previous changes to tests. malloc tests all pass regardless of the setting of MALLOC_GLIBC_COMPAT.


Modified:
   trunk/uClibc/libc/stdlib/malloc-standard/realloc.c
   trunk/uClibc/test/malloc/malloc.c
   trunk/uClibc/test/malloc/tst-malloc.c
   trunk/uClibc/test/malloc/tst-mcheck.c


Changeset:
Modified: trunk/uClibc/libc/stdlib/malloc-standard/realloc.c
===================================================================
--- trunk/uClibc/libc/stdlib/malloc-standard/realloc.c	2006-03-17 02:43:51 UTC (rev 14550)
+++ trunk/uClibc/libc/stdlib/malloc-standard/realloc.c	2006-03-17 03:00:05 UTC (rev 14551)
@@ -52,7 +52,7 @@
 	return malloc(bytes);
     if (! bytes) {
 	free (oldmem);
-	return malloc(bytes);
+	return NULL;
     }
 
     LOCK;

Modified: trunk/uClibc/test/malloc/malloc.c
===================================================================
--- trunk/uClibc/test/malloc/malloc.c	2006-03-17 02:43:51 UTC (rev 14550)
+++ trunk/uClibc/test/malloc/malloc.c	2006-03-17 03:00:05 UTC (rev 14551)
@@ -70,11 +70,7 @@
 	
 	ptr = malloc(100);
 	ptr = realloc(ptr, 0);
-#ifdef __MALLOC_GLIBC_COMPAT__
-	if (!ptr) {
-#else
 	if (ptr) {
-#endif
 		printf("realloc(,0) failed\n");
 		++ret;
 		free(ptr);

Modified: trunk/uClibc/test/malloc/tst-malloc.c
===================================================================
--- trunk/uClibc/test/malloc/tst-malloc.c	2006-03-17 02:43:51 UTC (rev 14550)
+++ trunk/uClibc/test/malloc/tst-malloc.c	2006-03-17 03:00:05 UTC (rev 14551)
@@ -54,16 +54,9 @@
 
   /* realloc (p, 0) == free (p).  */
   p = realloc (p, 0);
-#ifdef __MALLOC_GLIBC_COMPAT__
-  if (!p)
-#else
   if (p != NULL)
-#endif
     merror ("realloc (p, 0) failed.");
 
-#ifdef __MALLOC_GLIBC_COMPAT__
-  free (p);
-#endif
   p = malloc (0);
 #if !defined(__UCLIBC__) || defined(__MALLOC_GLIBC_COMPAT__)
   if (p == NULL)
@@ -73,16 +66,8 @@
     merror ("malloc (0) failed.");
 
   p = realloc (p, 0);
-#ifdef __MALLOC_GLIBC_COMPAT__
-  if (!p)
-#else
   if (p != NULL)
-#endif
     merror ("realloc (p, 0) failed.");
 
-#ifdef __MALLOC_GLIBC_COMPAT__
-  free (p);
-#endif
-
   return errors != 0;
 }

Modified: trunk/uClibc/test/malloc/tst-mcheck.c
===================================================================
--- trunk/uClibc/test/malloc/tst-mcheck.c	2006-03-17 02:43:51 UTC (rev 14550)
+++ trunk/uClibc/test/malloc/tst-mcheck.c	2006-03-17 03:00:05 UTC (rev 14551)
@@ -50,11 +50,7 @@
     merror ("malloc (10) failed.");
 
   p = realloc (p, 0);
-#ifdef __MALLOC_GLIBC_COMPAT__
-  if (!p)
-#else
   if (p != NULL)
-#endif
     merror ("realloc (p, 0) failed.");
 
   p = malloc (0);
@@ -66,11 +62,7 @@
     merror ("malloc (0) failed.");
 
   p = realloc (p, 0);
-#ifdef __MALLOC_GLIBC_COMPAT__
-  if (!p)
-#else
   if (p != NULL)
-#endif
     merror ("realloc (p, 0) failed.");
 
   q = malloc (256);




More information about the uClibc-cvs mailing list