Mercurial > projects > dstress

changeset 1206:d88a87712de1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed dstress.c for C++ compilers
author thomask
date Mon, 23 Oct 2006 04:13:03 +0000
parents 37d80331f28f
children 244ab84fc063
files dstress.c
diffstat 1 files changed, 27 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/dstress.c	Mon Oct 23 04:12:57 2006 +0000
+++ b/dstress.c	Mon Oct 23 04:13:03 2006 +0000
@@ -298,7 +298,7 @@
 	size_t len;
 
 	len = strlen(tmp_dir) + 128;
-	back = malloc(len);
+	back = (char*) malloc(len);
 
 #ifdef USE_POSIX
 	snprintf(back, len, "%s/t%x-%x-%x.tmp", tmp_dir, getpid(), rand(), ++genTempFileNameCount);
@@ -340,7 +340,7 @@
 
 	if(errno == 0 && file != 0 && file != -1){
 		if(0==fstat(file, &fileInfo)){
-			back=malloc(fileInfo.st_size+1);
+			back = (char*) malloc(fileInfo.st_size+1);
 			fileInfo.st_size = read(file, back, fileInfo.st_size);
 			if(fileInfo.st_size>=0){
 				*(back+fileInfo.st_size) = '\x00';
@@ -487,14 +487,14 @@
 			if(end1==NULL){
 				end1 = begin + strlen(begin);
 			}
-			back = malloc(end1-begin+1);
+			back = (char*) malloc(end1-begin+1);
 			strncpy(back, begin, end1-begin);
 			back[end1-begin]='\x00';
 			return strip(back);
 		}
 	}
 
-	back = malloc(1);
+	back = (char*) malloc(1);
 	back[0] = 0;
 	return back;
 }
@@ -525,25 +525,25 @@
 	if(file!=NULL){
 		if(line!=NULL){
 			len = strlen(file)+strlen(line)+3;
-			dmd = malloc(len);
+			dmd = (char*) malloc(len);
 			snprintf(dmd, len, "%s(%s)", file, line);
 
-			gdc = malloc(--len);
+			gdc = (char*) malloc(--len);
 			snprintf(gdc, len, "%s:%s", file, line);
 		}else{
 			len = strlen(file)+2;
-			dmd = malloc(len);
+			dmd = (char*) malloc(len);
 			snprintf(dmd, len, "%s(", file);
 
-			gdc = malloc(len);
+			gdc = (char*) malloc(len);
 			snprintf(gdc, len, "%s:", file);
 		}
 	}else if(line!=NULL){
 		len = strlen(line)+3;
-		dmd = malloc(len);
+		dmd = (char*) malloc(len);
 		snprintf(dmd, len, "(%s)", line);
 
-		gdc = malloc(--len);
+		gdc = (char*) malloc(--len);
 		snprintf(gdc, len, ":%s", line);
 	}else{
 		return 1;
@@ -601,7 +601,7 @@
 	if(file!=NULL){
 		if(line!=NULL){
 			len = strlen(file)+strlen(line)+3;
-			phobos = malloc(len);
+			phobos = (char*) malloc(len);
 			begin=strrchr(file,'/');
 			if(begin){
 				begin++;
@@ -619,11 +619,11 @@
 				(int)(end-begin), begin,
 				line);
 
-			phobosLong = malloc(len);
+			phobosLong = (char*) malloc(len);
 			snprintf(phobosLong, len, "%s(%s)", file, line);
 		}else{
 			len = strlen(file)+2;
-			phobos = malloc(len);
+			phobos = (char*) malloc(len);
 			begin=strrchr(file,'/');
 			if(begin){
 				begin++;
@@ -638,12 +638,12 @@
 			end=strrchr(file,'.');
 			snprintf(phobos, len, "%.*s(", (int)(end-begin), begin);
 
-			phobosLong = malloc(len);
+			phobosLong = (char*) malloc(len);
 			snprintf(phobosLong, len, "%s(", file);
 		}
 	}else if(line!=NULL){
 		len = strlen(line)+3;
-		phobos = malloc(len);
+		phobos = (char*) malloc(len);
 		snprintf(phobos, len, "(%s)", line);
 
 		phobosLong=NULL;
@@ -725,7 +725,7 @@
 	*logFile = genTempFileName();
 #ifdef USE_POSIX
 	len = 20 + strlen(CRASH_RUN) + strlen(cmd) + strlen(*logFile);
-	buffer = malloc(len);
+	buffer = (char*) malloc(len);
 
 	snprintf(buffer, len, "%s %s > %s 2>&1", CRASH_RUN, cmd, *logFile);
 
@@ -848,7 +848,7 @@
 	/* gen command */
 	bufferLen = strlen(compiler) + strlen(arguments) + strlen(tmp_dir)
 		+ strlen(case_file) + 21;
-	buffer = malloc(bufferLen);
+	buffer = (char*) malloc(bufferLen);
 	snprintf(buffer, bufferLen, "%s %s ", compiler, arguments);
 
 	if(NULL == strstr(buffer, "-od")){
@@ -942,7 +942,7 @@
 
 	bufferLen = strlen(compiler) + strlen(arguments) + strlen(tmp_dir)
 			+ strlen(case_file) * 2 + 64;
-	buffer = malloc(bufferLen);
+	buffer = (char*) malloc(bufferLen);
 	snprintf(buffer, bufferLen, "%s %s ", compiler, arguments);
 
 	if(NULL == strstr(buffer, "-od")){
@@ -1016,12 +1016,12 @@
 		goto no_valgrind;
 	}else if(VALGRIND){
 		bufferLen = strlen(VALGRIND) + strlen(case_file) + 8;
-		buffer = malloc(bufferLen);
+		buffer = (char*) malloc(bufferLen);
 		snprintf(buffer, bufferLen, "%s %s.exe", VALGRIND, case_file);
 	}else{
 no_valgrind:
 		bufferLen = strlen(case_file) + 8;
-		buffer = malloc(bufferLen);
+		buffer = (char*) malloc(bufferLen);
 		snprintf(buffer, bufferLen, "%s.exe", case_file);
 	}
 	printf("%s\n", buffer);
@@ -1063,7 +1063,7 @@
 		writeFile(gdb_scripter, gdb_script);
 		bufferLen = strlen(gdb) + strlen(case_file)
 			+ strlen(gdb_scripter) + 20;
-		buffer = malloc(bufferLen);
+		buffer = (char*) malloc(bufferLen);
 		snprintf(buffer, bufferLen, "%s %s.exe < %s",
 			gdb, case_file, gdb_scripter);
 		printf("%s\n", buffer);
@@ -1238,7 +1238,7 @@
 		pid_t pid;
 		pid = getpid();
 		bufferLen = strlen(TMP_DIR) + 4 + sizeof(pid_t) * 4;
-		buffer = malloc(bufferLen);
+		buffer = (char*) malloc(bufferLen);
 		snprintf(buffer, bufferLen, "%s/_%X", TMP_DIR, pid);
 		tmp_dir = cleanPathSeperator(buffer);
 		if(mkdir(tmp_dir, 0770)){
@@ -1257,7 +1257,7 @@
 #ifdef REG_EXTENDED
 	if(gdb_pattern_raw!=NULL && gdb_pattern_raw[0]!='\x00'){
 
-		gdb_pattern = malloc(sizeof(regex_t));
+		gdb_pattern = (regex_t*) malloc(sizeof(regex_t));
 		if(regcomp(gdb_pattern, gdb_pattern_raw, REG_EXTENDED | REG_NOSUB)){
 			fprintf(stderr, "failed to compile regular expression:"
 				"\n\t%s\n", gdb_pattern_raw);
@@ -1288,7 +1288,7 @@
 		}
 
 		bufferLen = strlen(gdb_script)+11;
-		buffer=malloc(bufferLen);
+		buffer = (char*) malloc(bufferLen);
 		snprintf(buffer, bufferLen, "%s\n\nquit\ny\n\n", gdb_script);
 		gdb_script=buffer;
 	}else if(gdb_script){
@@ -1352,7 +1352,7 @@
 			torture_block_case=NULL;
 		}
 
-		buffer = malloc(bufferLen);
+		buffer = (char*) malloc(bufferLen);
 		for(index=0; index < sizeof(torture)/sizeof(char*); index++){
 			if((torture_block_global && strstr(torture[index], torture_block_global))
 				|| (torture_block_case && strstr(torture[index], torture_block_case))
@@ -1393,7 +1393,7 @@
 				bufferLen = strlen(cmd_arg_case);
 				bufferLen += strlen(torture_require);
 				bufferLen += 2;
-				buffer = malloc(bufferLen);
+				buffer = (char*) malloc(bufferLen);
 				snprintf(buffer, bufferLen, "%s %s", cmd_arg_case, torture_require);
 				cmd_arg_case = buffer;
 			}
@@ -1423,7 +1423,7 @@
 		bufferLen = strlen(tmp_dir);
 		bufferLen += strlen(RM_DIR);
 		bufferLen += 2;
-		buffer = malloc(bufferLen);
+		buffer = (char*) malloc(bufferLen);
 		snprintf(buffer, bufferLen, "%s %s", RM_DIR, tmp_dir);
 		system(buffer);
 	}