[cig-commits] r4842 - in long/3D/Gale/trunk/src/StGermain: . Base/Foundation/src

[walter at geodynamics.org]

Author: walter
Date: 2006-10-11 13:46:49 -0700 (Wed, 11 Oct 2006)
New Revision: 4842

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/MemoryField.c
   long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/MemoryReport.c
Log:
 r2899 at earth:  boo | 2006-10-11 13:42:35 -0700
  r2815 at earth (orig r3803):  LukeHodkinson | 2006-09-26 20:17:12 -0700
  Replaced a couple of 'strdup's with the StGermain
  memory allocation equivalent.
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2898
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3802
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2899
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3803

Modified: long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/MemoryField.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/MemoryField.c	2006-10-11 20:46:47 UTC (rev 4841)
+++ long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/MemoryField.c	2006-10-11 20:46:49 UTC (rev 4842)
@@ -64,7 +64,8 @@
 {
 	if ( value )
 	{
-		memoryField->value = strdup(value);
+		memoryField->value = (char*)malloc( (strlen(value) + 1) * sizeof(char) );
+		strcpy( memoryField->value, value );
 	}
 	else
 	{

Modified: long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/MemoryReport.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/MemoryReport.c	2006-10-11 20:46:47 UTC (rev 4841)
+++ long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/MemoryReport.c	2006-10-11 20:46:49 UTC (rev 4842)
@@ -131,7 +131,10 @@
 	
 	if ( condition )
 	{
-		memoryReport->conditionValues[memoryReport->conditionCount] = strdup(condition);
+		char*	ptr = memoryReport->conditionValues[memoryReport->conditionCount];
+
+		ptr = (char*)malloc( (strlen(condition) + 1) * sizeof(char) );
+		strcpy( ptr, condition );
 	}
 	else
 	{