# HG changeset patch # User Sean Halle # Date 1346709755 25200 # Node ID e6b21c2350d1a0ff661d6de95f073f91d2d953e4 # Parent 7adf81960d1058509287d02f2df2d9c158b2b2d4 Renamed VMS to PR, in new branch diff -r 7adf81960d10 -r e6b21c2350d1 DynArray.c --- a/DynArray.c Tue Mar 13 18:31:05 2012 -0700 +++ b/DynArray.c Mon Sep 03 15:02:35 2012 -0700 @@ -19,7 +19,7 @@ makePrivDynArrayInfoFrom( void ***addrOfPtrToArray, int32 sizeOfArray ) { PrivDynArrayInfo *info; - info = VMS_int__malloc( sizeof(PrivDynArrayInfo) ); + info = PR_int__malloc( sizeof(PrivDynArrayInfo) ); info->addrOfPtrToArray = addrOfPtrToArray; info->sizeOfArray = sizeOfArray; @@ -31,11 +31,11 @@ makePrivDynArrayOfSize( void ***addrOfPtrToArray, int32 sizeOfArray ) { PrivDynArrayInfo *info; - info = VMS_int__malloc( sizeof(PrivDynArrayInfo) ); + info = PR_int__malloc( sizeof(PrivDynArrayInfo) ); info->addrOfPtrToArray = addrOfPtrToArray; - *(addrOfPtrToArray) = VMS_int__malloc( sizeOfArray * sizeof(void *) ); + *(addrOfPtrToArray) = PR_int__malloc( sizeOfArray * sizeof(void *) ); info->sizeOfArray = sizeOfArray; info->numInArray = 0; return info; @@ -139,7 +139,7 @@ if( newSize <= oldSizeOfArray ) return; oldArray = *(info->addrOfPtrToArray); - newArray = VMS_int__malloc( newSize * sizeof(void *) ); + newArray = PR_int__malloc( newSize * sizeof(void *) ); for( i = 0; i < oldSizeOfArray; i++ ) { @@ -148,11 +148,11 @@ *(info->addrOfPtrToArray) = newArray; //change location of array-ptr info->sizeOfArray = newSize; - VMS_int__free( oldArray ); + PR_int__free( oldArray ); } -/*Can't mix VMS_int__malloc locations with external malloc locations -- so use - * this version inside VMS, which will perform normal malloc in the core +/*Can't mix PR_int__malloc locations with external malloc locations -- so use + * this version inside PR, which will perform normal malloc in the core * loop -- hopefully avoiding the annoying system-stack bugs.. */ void @@ -183,8 +183,8 @@ freeDynArrayDeep( PrivDynArrayInfo *info, FreeFnPtr freeFnPtr ) { forAllInDynArrayDo( info, freeFnPtr ); - VMS_int__free( *(info->addrOfPtrToArray) ); - VMS_int__free( info ); + PR_int__free( *(info->addrOfPtrToArray) ); + PR_int__free( info ); } /* Only frees the info @@ -192,7 +192,7 @@ void freeDynArrayFlat( PrivDynArrayInfo *info ) { - VMS_int__free( info ); + PR_int__free( info ); } diff -r 7adf81960d10 -r e6b21c2350d1 DynArray.h --- a/DynArray.h Tue Mar 13 18:31:05 2012 -0700 +++ b/DynArray.h Mon Sep 03 15:02:35 2012 -0700 @@ -8,8 +8,8 @@ #ifndef _DYNARRAY_H #define _DYNARRAY_H -#include "VMS_impl/VMS_primitive_data_types.h" -#include "VMS_impl/Services_Offered_by_VMS/Memory_Handling/vmalloc.h" +#include "PR_impl/PR_primitive_data_types.h" +#include "PR_impl/Services_Offered_by_PR/Memory_Handling/vmalloc.h" //A dynamic array is same as any other array, but add a DynArrayInfo next diff -r 7adf81960d10 -r e6b21c2350d1 __brch__MC_shared --- a/__brch__MC_shared Tue Mar 13 18:31:05 2012 -0700 +++ b/__brch__MC_shared Mon Sep 03 15:02:35 2012 -0700 @@ -1,4 +1,4 @@ This branch is for the project structure defined Jan 2012.. the #includes reflect this directory structure. -More importantly, the MC_shared version of VMS requires a separat malloc implemeted by VMS code.. so this branch has modified the library to use the VMS-specific malloc. +More importantly, the MC_shared version of PR requires a separat malloc implemeted by PR code.. so this branch has modified the library to use the PR-specific malloc.