X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=mymemory.cc;h=7aec2dc81d549bcf0fe82951ee902723077b5cf0;hb=958af9f89dff567c26582d09687fcf0a1a461bc2;hp=759bdccd89231eff77305f392166162d8c714de4;hpb=ea58bae0f4b142d118880a3eb71168604c513b07;p=model-checker.git

diff --git a/mymemory.cc b/mymemory.cc
index 759bdcc..7aec2dc 100644
--- a/mymemory.cc
+++ b/mymemory.cc
@@ -128,7 +128,7 @@ void model_free(void *ptr)
 }
 
 /** @brief Global mspace reference for the snapshotting heap */
-mspace mySpace = NULL;
+mspace snapshot_space = NULL;
 
 /** Bootstrap allocation.  Problem is that the dynamic linker calls
  *  require calloc to work and calloc requires the dynamic linker to
@@ -162,8 +162,8 @@ static bool DontFree(void *ptr)
 /** @brief Snapshotting malloc implementation for user programs */
 void *malloc(size_t size)
 {
-	if (mySpace) {
-		void *tmp = mspace_malloc(mySpace, size);
+	if (snapshot_space) {
+		void *tmp = mspace_malloc(snapshot_space, size);
 		ASSERT(tmp);
 		return tmp;
 	} else
@@ -174,13 +174,13 @@ void *malloc(size_t size)
 void free(void * ptr)
 {
 	if (!DontFree(ptr))
-		mspace_free(mySpace, ptr);
+		mspace_free(snapshot_space, ptr);
 }
 
 /** @brief Snapshotting realloc implementation for user programs */
 void *realloc(void *ptr, size_t size)
 {
-	void *tmp = mspace_realloc(mySpace, ptr, size);
+	void *tmp = mspace_realloc(snapshot_space, ptr, size);
 	ASSERT(tmp);
 	return tmp;
 }
@@ -188,8 +188,8 @@ void *realloc(void *ptr, size_t size)
 /** @brief Snapshotting calloc implementation for user programs */
 void * calloc(size_t num, size_t size)
 {
-	if (mySpace) {
-		void *tmp = mspace_calloc(mySpace, num, size);
+	if (snapshot_space) {
+		void *tmp = mspace_calloc(snapshot_space, num, size);
 		ASSERT(tmp);
 		return tmp;
 	} else {