changeset 6:f4b108f21041 VMS__malloc_brch

Changed name to PrivDynArrayInfo - to remind can't use on shared data from slave
author Me
date Tue, 02 Nov 2010 16:44:42 -0700
parents 2915fb26c9e2
children 4506c08ed60d 015aab562ace
files DynArray.c DynArray.h
diffstat 2 files changed, 27 insertions(+), 27 deletions(-) [+]
line diff
     1.1 --- a/DynArray.c	Sun Oct 31 20:26:32 2010 -0700
     1.2 +++ b/DynArray.c	Tue Nov 02 16:44:42 2010 -0700
     1.3 @@ -12,22 +12,22 @@
     1.4  
     1.5  
     1.6  
     1.7 -DynArrayInfo *
     1.8 -makeDynArrayInfoFrom( void ***addrOfPtrToArray, int32 sizeOfArray )
     1.9 - { DynArrayInfo *info;
    1.10 +PrivDynArrayInfo *
    1.11 +makePrivDynArrayInfoFrom( void ***addrOfPtrToArray, int32 sizeOfArray )
    1.12 + { PrivDynArrayInfo *info;
    1.13  
    1.14 -   info = VMS__malloc( sizeof(DynArrayInfo) );
    1.15 +   info = VMS__malloc( sizeof(PrivDynArrayInfo) );
    1.16  
    1.17     info->addrOfPtrToArray = addrOfPtrToArray;
    1.18     info->sizeOfArray      = sizeOfArray;
    1.19     info->numInArray       = 0;
    1.20   }
    1.21  
    1.22 -DynArrayInfo *
    1.23 -makeDynArrayOfSize( void ***addrOfPtrToArray, int32 sizeOfArray )
    1.24 - { DynArrayInfo *info;
    1.25 +PrivDynArrayInfo *
    1.26 +makePrivDynArrayOfSize( void ***addrOfPtrToArray, int32 sizeOfArray )
    1.27 + { PrivDynArrayInfo *info;
    1.28  
    1.29 -   info = VMS__malloc( sizeof(DynArrayInfo) );
    1.30 +   info = VMS__malloc( sizeof(PrivDynArrayInfo) );
    1.31  
    1.32     info->addrOfPtrToArray = addrOfPtrToArray;
    1.33     
    1.34 @@ -46,7 +46,7 @@
    1.35   *Only need to use this Fn when need a new index, higher than any previous
    1.36   */
    1.37  int32
    1.38 -addToDynArray( void *value, DynArrayInfo *info )
    1.39 +addToDynArray( void *value, PrivDynArrayInfo *info )
    1.40   { int32 numInArray, sizeOfArray;
    1.41     void **array;
    1.42  
    1.43 @@ -65,7 +65,7 @@
    1.44     return numInArray; //pre-incr value is the index put value into
    1.45   }
    1.46  int32
    1.47 -VMS_ext__addToDynArray( void *value, DynArrayInfo *info )
    1.48 +VMS_ext__addToDynArray( void *value, PrivDynArrayInfo *info )
    1.49   { int32 numInArray, sizeOfArray;
    1.50     void **array;
    1.51  
    1.52 @@ -93,7 +93,7 @@
    1.53   * exponentially increase size..
    1.54   */
    1.55  void
    1.56 -makeHighestDynArrayIndexBe( DynArrayInfo *info, int32 highestIndex )
    1.57 +makeHighestDynArrayIndexBe( PrivDynArrayInfo *info, int32 highestIndex )
    1.58   {
    1.59     if( info->sizeOfArray <= highestIndex )
    1.60      {
    1.61 @@ -106,7 +106,7 @@
    1.62  /*Only use this if certain new size is bigger than current size
    1.63   */
    1.64  void
    1.65 -increaseSizeOfDynArrayTo( DynArrayInfo *info, int32 newSize )
    1.66 +increaseSizeOfDynArrayTo( PrivDynArrayInfo *info, int32 newSize )
    1.67   { int32 oldSizeOfArray, i;
    1.68     void **newArray, **oldArray;
    1.69  
    1.70 @@ -131,7 +131,7 @@
    1.71   * loop -- hopefully avoiding the annoying system-stack bugs..
    1.72   */
    1.73  void
    1.74 -VMS_ext__increaseSizeOfDynArrayTo( DynArrayInfo *info, int32 newSize )
    1.75 +VMS_ext__increaseSizeOfDynArrayTo( PrivDynArrayInfo *info, int32 newSize )
    1.76   { int32 oldSizeOfArray, i;
    1.77     void **newArray, **oldArray;
    1.78  
    1.79 @@ -155,7 +155,7 @@
    1.80  /* Frees the array, plus the info
    1.81   */
    1.82  void
    1.83 -freeDynArrayDeep( DynArrayInfo *info, FreeFnPtr freeFnPtr )
    1.84 +freeDynArrayDeep( PrivDynArrayInfo *info, FreeFnPtr freeFnPtr )
    1.85   {
    1.86     forAllInDynArrayDo( info, freeFnPtr );
    1.87     VMS__free( *(info->addrOfPtrToArray) );
    1.88 @@ -165,7 +165,7 @@
    1.89  /* Only frees the info
    1.90   */
    1.91  void
    1.92 -freeDynArrayFlat( DynArrayInfo *info )
    1.93 +freeDynArrayFlat( PrivDynArrayInfo *info )
    1.94   {
    1.95     VMS__free( info );
    1.96   }
    1.97 @@ -175,7 +175,7 @@
    1.98   * So, the function has to internally cast void * to whatever data struc..
    1.99   */
   1.100  void
   1.101 -forAllInDynArrayDo( DynArrayInfo *info, DynArrayFnPtr fnPtr )
   1.102 +forAllInDynArrayDo( PrivDynArrayInfo *info, DynArrayFnPtr fnPtr )
   1.103   { int32 idx;
   1.104     void **array;
   1.105  
     2.1 --- a/DynArray.h	Sun Oct 31 20:26:32 2010 -0700
     2.2 +++ b/DynArray.h	Tue Nov 02 16:44:42 2010 -0700
     2.3 @@ -22,36 +22,36 @@
     2.4     int32   numInArray;
     2.5     int32   sizeOfArray;
     2.6   }
     2.7 -DynArrayInfo;
     2.8 +PrivDynArrayInfo;
     2.9  
    2.10 -DynArrayInfo *
    2.11 -makeDynArrayInfoFrom( void ***addrOfPtrToArray, int32 sizeOfArray );
    2.12 +PrivDynArrayInfo *
    2.13 +makePrivDynArrayInfoFrom( void ***addrOfPtrToArray, int32 sizeOfArray );
    2.14  
    2.15 -DynArrayInfo *
    2.16 -makeDynArrayOfSize( void ***addrOfPtrToArray, int32 sizeOfArray );
    2.17 +PrivDynArrayInfo *
    2.18 +makePrivDynArrayOfSize( void ***addrOfPtrToArray, int32 sizeOfArray );
    2.19  
    2.20  int32
    2.21 -addToDynArray( void *value, DynArrayInfo *info );
    2.22 +addToDynArray( void *value, PrivDynArrayInfo *info );
    2.23  
    2.24  void
    2.25 -makeHighestDynArrayIndexBe( DynArrayInfo *info, int32 highestIndex );
    2.26 +makeHighestDynArrayIndexBe( PrivDynArrayInfo *info, int32 highestIndex );
    2.27  
    2.28  void
    2.29 -increaseSizeOfDynArrayTo( DynArrayInfo *info, int32 newSize );
    2.30 +increaseSizeOfDynArrayTo( PrivDynArrayInfo *info, int32 newSize );
    2.31  
    2.32  typedef void  (*FreeFnPtr)  ( void * ); //fn has to cast void * to whatever
    2.33  
    2.34  void
    2.35 -freeDynArrayDeep( DynArrayInfo *info, FreeFnPtr freeFnPtr );
    2.36 +freeDynArrayDeep( PrivDynArrayInfo *info, FreeFnPtr freeFnPtr );
    2.37  
    2.38  void
    2.39 -freeDynArrayFlat( DynArrayInfo *info );
    2.40 +freeDynArrayFlat( PrivDynArrayInfo *info );
    2.41  
    2.42  
    2.43  typedef void  (*DynArrayFnPtr)  ( void * );  //fn has to cast void *
    2.44  
    2.45  void
    2.46 -forAllInDynArrayDo( DynArrayInfo *info, DynArrayFnPtr fnPtr );
    2.47 +forAllInDynArrayDo( PrivDynArrayInfo *info, DynArrayFnPtr fnPtr );
    2.48  
    2.49  #endif	/* _DYNARRAY_H */
    2.50