--- trunk/uoms/src/init.upc	2010/04/05 17:12:14	1
+++ trunk/uoms/src/init.upc	2010/04/23 09:49:46	7
@@ -107,12 +107,20 @@
 	valid_bms[REDUCE_LD] = "upc_all_reduceLD";
 	valid_bms[PREFIX_REDUCE_LD] = "upc_all_prefix_reduceLD";
 	#ifdef ASYNC_MEM_TEST
-	valid_bms[AMEMGET] = "upc_memget_asynci";
-	valid_bms[AMEMPUT] = "upc_memput_asynci";
-	valid_bms[AMEMCPY] = "upc_memcpy_asynci";
-	valid_bms[ALMEMGET] = "local_upc_memget_asynci";
-	valid_bms[ALMEMPUT] = "local_upc_memput_asynci";
-	valid_bms[ALMEMCPY] = "local_upc_memcpy_asynci";
+	valid_bms[AMEMGET] = "upc_memget_async";
+	valid_bms[AMEMPUT] = "upc_memput_async";
+	valid_bms[AMEMCPY] = "upc_memcpy_async";
+	valid_bms[ALMEMGET] = "local_upc_memget_async";
+	valid_bms[ALMEMPUT] = "local_upc_memput_async";
+	valid_bms[ALMEMCPY] = "local_upc_memcpy_async";
+	#endif
+	#ifdef ASYNCI_MEM_TEST
+	valid_bms[AIMEMGET] = "upc_memget_asynci";
+	valid_bms[AIMEMPUT] = "upc_memput_asynci";
+	valid_bms[AIMEMCPY] = "upc_memcpy_asynci";
+	valid_bms[AILMEMGET] = "local_upc_memget_asynci";
+	valid_bms[AILMEMPUT] = "local_upc_memput_asynci";
+	valid_bms[AILMEMCPY] = "local_upc_memcpy_asynci";
 	#endif
 }
 
@@ -360,9 +368,9 @@
 		}
 		int i = 0;
 		while (!feof(fd) && fgets(curbm, 30, fd)) {
-			for(int i = 0; i < 30; i++){
-				if(curbm[i] == '\n' || curbm[i] == ' '){
-					curbm[i] = '\0';
+			for(int j = 0; j < 30; j++){
+				if(curbm[j] == '\n' || curbm[j] == ' '){
+					curbm[j] = '\0';
 				}
 			}
 			for(int j = 0; j < NUM_BMS; j++){
@@ -461,7 +469,7 @@
 		while (!feof(fd) && fgets(cursize, 20, fd)) {
 			if(cursize[0] >= '0' && cursize[0] <= '9'){
 				errno = 0;
-				long dummy = strtol(cursize,NULL,10);
+				strtol(cursize,NULL,10);
 				if(errno != 0){
 					if(MYTHREAD == 0){
 						fprintf(stderr,"*** Error parsing %s in file %s: ",cursize,sizes_file);