comparison src/share/vm/memory/filemap.cpp @ 628:7bb995fbd3c0

Merge
author trims
date Thu, 12 Mar 2009 18:16:36 -0700
parents 98cb887364d3
children c18cbe5936b8
comparison
equal deleted inserted replaced
580:ce2272390558 628:7bb995fbd3c0
33 33
34 34
35 extern address JVM_FunctionAtStart(); 35 extern address JVM_FunctionAtStart();
36 extern address JVM_FunctionAtEnd(); 36 extern address JVM_FunctionAtEnd();
37 37
38 // Complain and stop. All error conditions occuring during the writing of 38 // Complain and stop. All error conditions occurring during the writing of
39 // an archive file should stop the process. Unrecoverable errors during 39 // an archive file should stop the process. Unrecoverable errors during
40 // the reading of the archive file should stop the process. 40 // the reading of the archive file should stop the process.
41 41
42 static void fail(const char *msg, va_list ap) { 42 static void fail(const char *msg, va_list ap) {
43 // This occurs very early during initialization: tty is not initialized. 43 // This occurs very early during initialization: tty is not initialized.
44 jio_fprintf(defaultStream::error_stream(), 44 jio_fprintf(defaultStream::error_stream(),
45 "An error has occured while processing the" 45 "An error has occurred while processing the"
46 " shared archive file.\n"); 46 " shared archive file.\n");
47 jio_vfprintf(defaultStream::error_stream(), msg, ap); 47 jio_vfprintf(defaultStream::error_stream(), msg, ap);
48 jio_fprintf(defaultStream::error_stream(), "\n"); 48 jio_fprintf(defaultStream::error_stream(), "\n");
49 vm_exit_during_initialization("Unable to use shared archive.", NULL); 49 vm_exit_during_initialization("Unable to use shared archive.", NULL);
50 } 50 }