diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-02-22 11:16:14 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-02-22 13:53:44 +0100 |
| commit | 79c2398b8047016671069ceb271f218570819fad (patch) | |
| tree | 52080e50a4e41a0a4980b4348c1434cd4882a5fc /jvmfwk | |
| parent | ff66c1d82b34ea8efbfb61835f6ec951e5b32caa (diff) | |
Replace some fprintf with SAL_WARN
Change-Id: I3f31f223b6e906c6b40415a8d5c66c27e3c7cff5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130338
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 0ac4c1ef2e9c..89534a0a2cf8 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -19,7 +19,6 @@ #ifdef _WIN32 -# include <stdio.h> # include <sys/stat.h> # if !defined WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN @@ -199,7 +198,7 @@ extern "C" void JNICALL abort_handler() // If we are within JNI_CreateJavaVM then we jump back into getJavaVM if( g_bInGetJavaVM != 0 ) { - fprintf(stderr, "JavaVM: JNI_CreateJavaVM called os::abort(), caught by abort_handler in javavm.cxx\n"); + SAL_WARN("jfw", "JavaVM: JNI_CreateJavaVM called os::abort(), caught by abort_handler"); longjmp( jmp_jvm_abort, 0); } } @@ -681,9 +680,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( sRuntimeLib, osl_getThreadTextEncoding()); OString sSymbol = OUStringToOString( sSymbolCreateJava, osl_getThreadTextEncoding()); - fprintf(stderr,"[Java framework]sunjavaplugin" SAL_DLLEXTENSION - ": Java runtime library: %s does not export symbol %s !\n", - sLib.getStr(), sSymbol.getStr()); + SAL_WARN("jfw", "Java runtime library: " << sLib << " does not export symbol " << sSymbol); return javaPluginError::VmCreationFailed; } moduleRt.release(); @@ -805,14 +802,12 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( { if( err < 0) { - fprintf(stderr,"[Java framework] sunjavaplugin" SAL_DLLEXTENSION - ": Can not create Java Virtual Machine, %" SAL_PRIdINT32 "\n", sal_Int32(err)); + SAL_WARN("jfw", "Can not create Java Virtual Machine, " << err); errorcode = javaPluginError::VmCreationFailed; } else if( err > 0) { - fprintf(stderr,"[Java framework] sunjavaplugin" SAL_DLLEXTENSION - ": Can not create JavaVirtualMachine, abort handler was called.\n"); + SAL_WARN("jfw", "Can not create JavaVirtualMachine, abort handler was called"); errorcode = javaPluginError::VmCreationFailed; } } |