diff dmd/FileName.d @ 2:7427ded8caf7

Removed unreferenced modules First step at fixing GC issues - now calling GC.malloc instead of malloc (ditto calloc and realloc), get rid of free
author korDen
date Sun, 25 Oct 2009 03:20:59 +0300
parents 10317f0c89a5
children d706d958e4e8
line wrap: on
line diff
--- a/dmd/FileName.d	Sat Oct 24 17:25:59 2009 +0400
+++ b/dmd/FileName.d	Sun Oct 25 03:20:59 2009 +0300
@@ -5,6 +5,8 @@
 import dmd.OutBuffer;
 import dmd.File;
 
+import dmd.Memory;
+
 import core.stdc.stdlib : malloc, alloca;
 import core.stdc.string : memcpy, strlen;
 import core.stdc.ctype : isspace;
@@ -244,7 +246,7 @@
 		size_t pathlen = n.ptr - path.ptr;
 		size_t namelen = name.length;
 
-		char* f = cast(char*)malloc(pathlen + 1 + namelen + 1);
+		char* f = cast(char*)GC.malloc(pathlen + 1 + namelen + 1);
 		memcpy(f, path.ptr, pathlen);
 version (POSIX) {
 		if (path[pathlen - 1] != '/')
@@ -279,7 +281,7 @@
 		pathlen = path.length;
 		namelen = name.length;
 
-		char* f = cast(char*)malloc(pathlen + 1 + namelen + 1);
+		char* f = cast(char*)GC.malloc(pathlen + 1 + namelen + 1);
 
 		memcpy(f, path.ptr, pathlen);
 
@@ -394,7 +396,7 @@
 
 		size_t len = name.length;
 		size_t extlen = ext.length;
-		char* s = cast(char*)malloc(len + 1 + extlen + 1);
+		char* s = cast(char*)GC.malloc(len + 1 + extlen + 1);
 		memcpy(s, name.ptr, len);
 		s[len] = '.';
 		memcpy(s + len + 1, ext.ptr, extlen + 1);
@@ -410,7 +412,7 @@
 			size_t len = e.ptr - name.ptr;
 			size_t extlen = ext.length;
 
-			char* s = cast(char*)malloc(len + extlen + 1);
+			char* s = cast(char*)GC.malloc(len + extlen + 1);
 			memcpy(s, name.ptr, len);
 			memcpy(s + len, ext.ptr, extlen + 1);
 			return new FileName(assumeUnique(s[0..len+extlen]));
@@ -450,9 +452,9 @@
 		scope File file = new File(this);
 
 version (_WIN32) {
-		file.touchtime = malloc(WIN32_FIND_DATA.sizeof);	// keep same file time
+		file.touchtime = GC.malloc(WIN32_FIND_DATA.sizeof);	// keep same file time
 } else version (POSIX) {
-		file.touchtime = malloc(stat.sizeof); // keep same file time
+		file.touchtime = GC.malloc(stat.sizeof); // keep same file time
 } else {
 		static assert(0);
 }