Mercurial > cgi-bin > hgwebdir.cgi > VMS > C_Libraries > DynArray
diff DynArray.c @ 32:958dcb7754ca
PR branch -- added comments about safe usage
| author | Sean Halle <seanhalle@yahoo.com> |
|---|---|
| date | Fri, 08 Mar 2013 05:37:45 -0800 |
| parents | e6b21c2350d1 |
| children | 59eaf81a9cc7 |
line diff
1.1 --- a/DynArray.c Mon Sep 03 15:09:32 2012 -0700 1.2 +++ b/DynArray.c Fri Mar 08 05:37:45 2013 -0800 1.3 @@ -7,6 +7,7 @@ 1.4 1.5 1.6 #include <stdio.h> 1.7 +#include <malloc.h> 1.8 1.9 #include "DynArray.h" 1.10 1.11 @@ -45,7 +46,7 @@ 1.12 makePrivDynArrayOfSize_Ext( void ***addrOfPtrToArray, int32 sizeOfArray ) 1.13 { PrivDynArrayInfo *info; 1.14 1.15 - info = malloc( sizeof(PrivDynArrayInfo) ); 1.16 + info = (PrivDynArrayInfo*) malloc( sizeof(PrivDynArrayInfo) ); 1.17 1.18 info->addrOfPtrToArray = addrOfPtrToArray; 1.19 1.20 @@ -132,16 +133,16 @@ 1.21 */ 1.22 void 1.23 increaseSizeOfDynArrayTo( PrivDynArrayInfo *info, int32 newSize ) 1.24 - { int32 oldSizeOfArray, i; 1.25 + { int32 oldsizeOfArray, i; 1.26 void **newArray, **oldArray; 1.27 1.28 - oldSizeOfArray = info->sizeOfArray; 1.29 - if( newSize <= oldSizeOfArray ) return; 1.30 + oldsizeOfArray = info->sizeOfArray; 1.31 + if( newSize <= oldsizeOfArray ) return; 1.32 1.33 oldArray = *(info->addrOfPtrToArray); 1.34 newArray = PR_int__malloc( newSize * sizeof(void *) ); 1.35 1.36 - for( i = 0; i < oldSizeOfArray; i++ ) 1.37 + for( i = 0; i < oldsizeOfArray; i++ ) 1.38 { 1.39 newArray[i] = oldArray[i]; 1.40 } 1.41 @@ -157,16 +158,16 @@ 1.42 */ 1.43 void 1.44 increaseSizeOfDynArrayTo_Ext( PrivDynArrayInfo *info, int32 newSize ) 1.45 - { int32 oldSizeOfArray, i; 1.46 + { int32 oldsizeOfArray, i; 1.47 void **newArray, **oldArray; 1.48 1.49 - oldSizeOfArray = info->sizeOfArray; 1.50 - if( newSize <= oldSizeOfArray ) return; 1.51 + oldsizeOfArray = info->sizeOfArray; 1.52 + if( newSize <= oldsizeOfArray ) return; 1.53 1.54 oldArray = *(info->addrOfPtrToArray); 1.55 newArray = malloc( newSize * sizeof(void *) ); 1.56 1.57 - for( i = 0; i < oldSizeOfArray; i++ ) 1.58 + for( i = 0; i < oldsizeOfArray; i++ ) 1.59 { 1.60 newArray[i] = oldArray[i]; 1.61 }
