Changeset d8d8f20

Timestamp:

Jul 21, 2020, 11:18:26 AM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

4a32319

Parents:

2b23d78

Message:

remove one unnecessary call to malloc_size in alloc_set and alloc_align_set

File:

• libcfa/src/stdlib.hfa (modified) (5 diffs)

libcfa/src/stdlib.hfa

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul 20 19:04:33 2020
-// Update Count     : 472
+// Last Modified On : Tue Jul 21 07:58:05 2020
+// Update Count     : 475
 //
 
@@ -163 +163 @@
         T * alloc_set( T ptr[], size_t dim, char fill ) {       // realloc array with fill
                 size_t osize = malloc_size( ptr );                              // current allocation
-                T * nptr = realloc( ptr, dim * sizeof(T) );             // CFA realloc
-                size_t nsize = malloc_size( nptr );                             // new allocation
+                size_t nsize = dim * sizeof(T);                                 // new allocation
+                T * nptr = realloc( ptr, nsize );                               // CFA realloc
                 if ( nsize > osize ) {                                                  // larger ?
                         memset( (char *)nptr + osize, (int)fill, nsize - osize ); // initialize added storage
@@ -172 +172 @@
 
         T * alloc_set( T ptr[], size_t dim, T & fill ) {        // realloc array with fill
-                size_t odim = malloc_size( ptr ) / sizeof(T);   // current allocation
-                T * nptr = realloc( ptr, dim * sizeof(T) );             // CFA realloc
-                size_t ndim = malloc_size( nptr ) / sizeof(T);  // new allocation
+                size_t odim = malloc_size( ptr ) / sizeof(T);   // current dimension
+                size_t nsize = dim * sizeof(T);                                 // new allocation
+                size_t ndim = nsize / sizeof(T);                                // new dimension
+                T * nptr = realloc( ptr, nsize );                               // CFA realloc
                 if ( ndim > odim ) {                                                    // larger ?
                         for ( i; odim ~ ndim ) {
@@ -230 +231 @@
         T * alloc_align_set( T ptr[], size_t align, size_t dim, char fill ) {
                 size_t osize = malloc_size( ptr );                              // current allocation
-                T * nptr = realloc( ptr, align, dim * sizeof(T) ); // CFA realloc
-                size_t nsize = malloc_size( nptr );                             // new allocation
+                size_t nsize = dim * sizeof(T);                                 // new allocation
+                T * nptr = realloc( ptr, align, nsize );                // CFA realloc
                 if ( nsize > osize ) {                                                  // larger ?
                         memset( (char *)nptr + osize, (int)fill, nsize - osize ); // initialize added storage
@@ -239 +240 @@
 
         T * alloc_align_set( T ptr[], size_t align, size_t dim, T & fill ) {
-                size_t odim = malloc_size( ptr ) / sizeof(T);   // current allocation
-                T * nptr = realloc( ptr, align, dim * sizeof(T) ); // CFA realloc
-                size_t ndim = malloc_size( nptr );                              // new allocation
+                size_t odim = malloc_size( ptr ) / sizeof(T);   // current dimension
+                size_t nsize = dim * sizeof(T);                                 // new allocation
+                size_t ndim = nsize / sizeof(T);                                // new dimension
+                T * nptr = realloc( ptr, align, nsize );                // CFA realloc
                 if ( ndim > odim ) {                                                    // larger ?
                         for ( i; odim ~ ndim ) {