Changeset a46da63 in mainline for libc/generic/as.c

Timestamp:

2006-06-16T20:50:51Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

153a209

Parents:

b34fab6

Message:

big code cleanup, compile with -Wall -Werror to enforce better coding
there is currently one warning that requires attention, please review

File:

• libc/generic/as.c (modified) (6 diffs)

libc/generic/as.c

@@ -27 +27 @@
  */
 
- /** @addtogroup libc
+/** @addtogroup libc
  * @{
  */
@@ -76 +76 @@
 
 static size_t heapsize = 0;
-static size_t maxheapsize = (size_t)(-1);
+static size_t maxheapsize = (size_t) (-1);
 
 static void * last_allocated = 0;
@@ -93 +93 @@
         int rc;
         void *res;
+        
         /* Check for invalid values */
         if (incr < 0 && -incr > heapsize)
                 return NULL;
+        
         /* Check for too large value */
         if (incr > 0 && incr+heapsize < heapsize)
                 return NULL;
+        
         /* Check for too small values */
         if (incr < 0 && incr+heapsize > heapsize)
                 return NULL;
+        
         /* Check for user limit */
-        if ((maxheapsize!=(size_t)(-1)) && (heapsize + incr)>maxheapsize) return NULL;
-
-        rc = as_area_resize(&_heap, heapsize + incr,0);
+        if ((maxheapsize != (size_t) (-1)) && (heapsize + incr) > maxheapsize)
+                return NULL;
+        
+        rc = as_area_resize(&_heap, heapsize + incr, 0);
         if (rc != 0)
                 return NULL;
         
         /* Compute start of new area */
-        res = (void *)&_heap + heapsize;
+        res = (void *) &_heap + heapsize;
 
         heapsize += incr;
@@ -120 +125 @@
 void *set_maxheapsize(size_t mhs)
 {
-        maxheapsize=mhs;
+        maxheapsize = mhs;
         /* Return pointer to area not managed by sbrk */
-        return (void *)&_heap + maxheapsize;
+        return ((void *) &_heap + maxheapsize);
 
 }
@@ -137 +142 @@
         /* Set heapsize to some meaningful value */
         if (maxheapsize == -1)
-                set_maxheapsize(ALIGN_UP(USER_ADDRESS_SPACE_SIZE_ARCH>>1,PAGE_SIZE));
+                set_maxheapsize(ALIGN_UP(USER_ADDRESS_SPACE_SIZE_ARCH >> 1, PAGE_SIZE));
+        
         if (!last_allocated)
-                last_allocated = ALIGN_UP((void *)&_heap + maxheapsize, PAGE_SIZE);
+                last_allocated = (void *) ALIGN_UP((void *) &_heap + maxheapsize, PAGE_SIZE);
         
         sz = ALIGN_UP(sz, PAGE_SIZE);
@@ -148 +154 @@
 }
 
-
- /** @}
+/** @}
  */
- 
-