jdk-sandbox: comparison hotspot/src/os/windows/vm/os

equal deleted inserted replaced

-:419385282044
+:afb974a04396
 if (home_path == NULL) {
 return;
 }
 strcpy(home_path, home_dir);
 Arguments::set_java_home(home_path);
-FREE_C_HEAP_ARRAY(char, home_path, mtInternal);
+FREE_C_HEAP_ARRAY(char, home_path);
 dll_path = NEW_C_HEAP_ARRAY(char, strlen(home_dir) + strlen(bin) + 1,
 mtInternal);
 if (dll_path == NULL) {
 return;
 }
 strcpy(dll_path, home_dir);
 strcat(dll_path, bin);
 Arguments::set_dll_dir(dll_path);
-FREE_C_HEAP_ARRAY(char, dll_path, mtInternal);
+FREE_C_HEAP_ARRAY(char, dll_path);
 if (!set_boot_path('\\', ';')) {
 return;
 }
 }
 }
 strcat(library_path, ";.");
 Arguments::set_library_path(library_path);
-FREE_C_HEAP_ARRAY(char, library_path, mtInternal);
+FREE_C_HEAP_ARRAY(char, library_path);
 }
 // Default extensions directory
 {
 char path[MAX_PATH];
 char * buf = NEW_C_HEAP_ARRAY(char, len, mtInternal);
 sprintf(buf, "%s%s", Arguments::get_java_home(), ENDORSED_DIR);
 Arguments::set_endorsed_dirs(buf);
 // (Arguments::set_endorsed_dirs() calls SystemProperty::set_value(), which
 //  duplicates the input.)
-FREE_C_HEAP_ARRAY(char, buf, mtInternal);
+FREE_C_HEAP_ARRAY(char, buf);
 #undef ENDORSED_DIR
 }
 #ifndef _WIN64
 // set our UnhandledExceptionFilter and save any previous one
 dirname = alt_dirname;
 }
 dirp->path = (char *)malloc(strlen(dirname) + 5, mtInternal);
 if (dirp->path == 0) {
-free(dirp, mtInternal);
+free(dirp);
 errno = ENOMEM;
 return 0;
 }
 strcpy(dirp->path, dirname);
 fattr = GetFileAttributes(dirp->path);
 if (fattr == 0xffffffff) {
-free(dirp->path, mtInternal);
+free(dirp->path);
-free(dirp, mtInternal);
+free(dirp);
 errno = ENOENT;
 return 0;
 } else if ((fattr & FILE_ATTRIBUTE_DIRECTORY) == 0) {
-free(dirp->path, mtInternal);
+free(dirp->path);
-free(dirp, mtInternal);
+free(dirp);
 errno = ENOTDIR;
 return 0;
 }
 // Append "*.*", or possibly "\\*.*", to path
 }
 dirp->handle = FindFirstFile(dirp->path, &dirp->find_data);
 if (dirp->handle == INVALID_HANDLE_VALUE) {
 if (GetLastError() != ERROR_FILE_NOT_FOUND) {
-free(dirp->path, mtInternal);
+free(dirp->path);
-free(dirp, mtInternal);
+free(dirp);
 errno = EACCES;
 return 0;
 }
 }
 return dirp;
 errno = EBADF;
 return -1;
 }
 dirp->handle = INVALID_HANDLE_VALUE;
 }
-free(dirp->path, mtInternal);
+free(dirp->path);
-free(dirp, mtInternal);
+free(dirp);
 return 0;
 }
 // This must be hard coded because it's the system's temporary
 // directory not the java application's temp directory, ala java.io.tmpdir.
 }
 }
 // release the storage
 for (int i = 0; i < n; i++) {
 if (pelements[i] != NULL) {
-FREE_C_HEAP_ARRAY(char, pelements[i], mtInternal);
+FREE_C_HEAP_ARRAY(char, pelements[i]);
 }
 }
 if (pelements != NULL) {
-FREE_C_HEAP_ARRAY(char*, pelements, mtInternal);
+FREE_C_HEAP_ARRAY(char*, pelements);
 }
 } else {
 jio_snprintf(buffer, buflen, "%s\\%s.dll", pname, fname);
 retval = true;
 }
 int *_numa_used_node_list;  // allocated below
 int _numa_used_node_count;
 void free_node_list() {
 if (_numa_used_node_list != NULL) {
-FREE_C_HEAP_ARRAY(int, _numa_used_node_list, mtInternal);
+FREE_C_HEAP_ARRAY(int, _numa_used_node_list);
 }
 }
 public:
 NUMANodeListHolder() {
 return FALSE;
 }
 error = ::PeekConsoleInput(han, lpBuffer, numEvents, &numEventsRead);
 if (error == 0) {
-os::free(lpBuffer, mtInternal);
+os::free(lpBuffer);
 return FALSE;
 }
 // Examine input records for the number of bytes available
 for (i=0; i<numEvents; i++) {
 }
 }
 }
 if (lpBuffer != NULL) {
-os::free(lpBuffer, mtInternal);
+os::free(lpBuffer);
 }
 *pbytes = (long) actualLength;
 return TRUE;
 }

changeset 27880	afb974a04396
parent 27873	60cce297ef8e
child 27926	0e2e188ab887
child 28014	3ca57ef4f132