# HG changeset patch # User Me # Date 1288741482 25200 # Node ID f4b108f21041c4da862c4313d2d38853dcbae694 # Parent 2915fb26c9e2a2da7b3d5da7d1f8bcc08982003b Changed name to PrivDynArrayInfo - to remind can't use on shared data from slave diff -r 2915fb26c9e2 -r f4b108f21041 DynArray.c --- a/DynArray.c Sun Oct 31 20:26:32 2010 -0700 +++ b/DynArray.c Tue Nov 02 16:44:42 2010 -0700 @@ -12,22 +12,22 @@ -DynArrayInfo * -makeDynArrayInfoFrom( void ***addrOfPtrToArray, int32 sizeOfArray ) - { DynArrayInfo *info; +PrivDynArrayInfo * +makePrivDynArrayInfoFrom( void ***addrOfPtrToArray, int32 sizeOfArray ) + { PrivDynArrayInfo *info; - info = VMS__malloc( sizeof(DynArrayInfo) ); + info = VMS__malloc( sizeof(PrivDynArrayInfo) ); info->addrOfPtrToArray = addrOfPtrToArray; info->sizeOfArray = sizeOfArray; info->numInArray = 0; } -DynArrayInfo * -makeDynArrayOfSize( void ***addrOfPtrToArray, int32 sizeOfArray ) - { DynArrayInfo *info; +PrivDynArrayInfo * +makePrivDynArrayOfSize( void ***addrOfPtrToArray, int32 sizeOfArray ) + { PrivDynArrayInfo *info; - info = VMS__malloc( sizeof(DynArrayInfo) ); + info = VMS__malloc( sizeof(PrivDynArrayInfo) ); info->addrOfPtrToArray = addrOfPtrToArray; @@ -46,7 +46,7 @@ *Only need to use this Fn when need a new index, higher than any previous */ int32 -addToDynArray( void *value, DynArrayInfo *info ) +addToDynArray( void *value, PrivDynArrayInfo *info ) { int32 numInArray, sizeOfArray; void **array; @@ -65,7 +65,7 @@ return numInArray; //pre-incr value is the index put value into } int32 -VMS_ext__addToDynArray( void *value, DynArrayInfo *info ) +VMS_ext__addToDynArray( void *value, PrivDynArrayInfo *info ) { int32 numInArray, sizeOfArray; void **array; @@ -93,7 +93,7 @@ * exponentially increase size.. */ void -makeHighestDynArrayIndexBe( DynArrayInfo *info, int32 highestIndex ) +makeHighestDynArrayIndexBe( PrivDynArrayInfo *info, int32 highestIndex ) { if( info->sizeOfArray <= highestIndex ) { @@ -106,7 +106,7 @@ /*Only use this if certain new size is bigger than current size */ void -increaseSizeOfDynArrayTo( DynArrayInfo *info, int32 newSize ) +increaseSizeOfDynArrayTo( PrivDynArrayInfo *info, int32 newSize ) { int32 oldSizeOfArray, i; void **newArray, **oldArray; @@ -131,7 +131,7 @@ * loop -- hopefully avoiding the annoying system-stack bugs.. */ void -VMS_ext__increaseSizeOfDynArrayTo( DynArrayInfo *info, int32 newSize ) +VMS_ext__increaseSizeOfDynArrayTo( PrivDynArrayInfo *info, int32 newSize ) { int32 oldSizeOfArray, i; void **newArray, **oldArray; @@ -155,7 +155,7 @@ /* Frees the array, plus the info */ void -freeDynArrayDeep( DynArrayInfo *info, FreeFnPtr freeFnPtr ) +freeDynArrayDeep( PrivDynArrayInfo *info, FreeFnPtr freeFnPtr ) { forAllInDynArrayDo( info, freeFnPtr ); VMS__free( *(info->addrOfPtrToArray) ); @@ -165,7 +165,7 @@ /* Only frees the info */ void -freeDynArrayFlat( DynArrayInfo *info ) +freeDynArrayFlat( PrivDynArrayInfo *info ) { VMS__free( info ); } @@ -175,7 +175,7 @@ * So, the function has to internally cast void * to whatever data struc.. */ void -forAllInDynArrayDo( DynArrayInfo *info, DynArrayFnPtr fnPtr ) +forAllInDynArrayDo( PrivDynArrayInfo *info, DynArrayFnPtr fnPtr ) { int32 idx; void **array; diff -r 2915fb26c9e2 -r f4b108f21041 DynArray.h --- a/DynArray.h Sun Oct 31 20:26:32 2010 -0700 +++ b/DynArray.h Tue Nov 02 16:44:42 2010 -0700 @@ -22,36 +22,36 @@ int32 numInArray; int32 sizeOfArray; } -DynArrayInfo; +PrivDynArrayInfo; -DynArrayInfo * -makeDynArrayInfoFrom( void ***addrOfPtrToArray, int32 sizeOfArray ); +PrivDynArrayInfo * +makePrivDynArrayInfoFrom( void ***addrOfPtrToArray, int32 sizeOfArray ); -DynArrayInfo * -makeDynArrayOfSize( void ***addrOfPtrToArray, int32 sizeOfArray ); +PrivDynArrayInfo * +makePrivDynArrayOfSize( void ***addrOfPtrToArray, int32 sizeOfArray ); int32 -addToDynArray( void *value, DynArrayInfo *info ); +addToDynArray( void *value, PrivDynArrayInfo *info ); void -makeHighestDynArrayIndexBe( DynArrayInfo *info, int32 highestIndex ); +makeHighestDynArrayIndexBe( PrivDynArrayInfo *info, int32 highestIndex ); void -increaseSizeOfDynArrayTo( DynArrayInfo *info, int32 newSize ); +increaseSizeOfDynArrayTo( PrivDynArrayInfo *info, int32 newSize ); typedef void (*FreeFnPtr) ( void * ); //fn has to cast void * to whatever void -freeDynArrayDeep( DynArrayInfo *info, FreeFnPtr freeFnPtr ); +freeDynArrayDeep( PrivDynArrayInfo *info, FreeFnPtr freeFnPtr ); void -freeDynArrayFlat( DynArrayInfo *info ); +freeDynArrayFlat( PrivDynArrayInfo *info ); typedef void (*DynArrayFnPtr) ( void * ); //fn has to cast void * void -forAllInDynArrayDo( DynArrayInfo *info, DynArrayFnPtr fnPtr ); +forAllInDynArrayDo( PrivDynArrayInfo *info, DynArrayFnPtr fnPtr ); #endif /* _DYNARRAY_H */