From 4288f90df761a63998e075935a48e2a104fcfeac Mon Sep 17 00:00:00 2001
From: MBaesken <matthias.baesken@sap.com>
Date: Wed, 16 Oct 2024 14:52:07 +0200
Subject: [PATCH] Backport 2a2ecc994e02049d6d84f083b8e92a51368577bf
---
src/java.base/macosx/native/libjli/java_md_macosx.m | 11 +++++++----
src/java.base/unix/native/libjli/java_md_common.c | 8 +-------
.../macosx/native/libsplashscreen/splashscreen_sys.m | 6 ++++--
.../unix/native/libsplashscreen/splashscreen_sys.c | 6 ++++--
4 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/java.base/macosx/native/libjli/java_md_macosx.m b/src/java.base/macosx/native/libjli/java_md_macosx.m
index 279a7abef1e..125fe2fd23f 100644
--- a/src/java.base/macosx/native/libjli/java_md_macosx.m
+++ b/src/java.base/macosx/native/libjli/java_md_macosx.m
@@ -333,6 +333,7 @@ static void ParkEventLoop() {
static void MacOSXStartup(int argc, char *argv[]) {
// Thread already started?
static jboolean started = false;
+ int rc;
if (started) {
return;
}
@@ -345,12 +346,14 @@ static void MacOSXStartup(int argc, char *argv[]) {
// Fire up the main thread
pthread_t main_thr;
- if (pthread_create(&main_thr, NULL, &apple_main, &args) != 0) {
- JLI_ReportErrorMessageSys("Could not create main thread: %s\n", strerror(errno));
+ rc = pthread_create(&main_thr, NULL, &apple_main, &args);
+ if (rc != 0) {
+ JLI_ReportErrorMessageSys("Could not create main thread, return code: %d\n", rc);
exit(1);
}
- if (pthread_detach(main_thr)) {
- JLI_ReportErrorMessageSys("pthread_detach() failed: %s\n", strerror(errno));
+ rc = pthread_detach(main_thr);
+ if (rc != 0) {
+ JLI_ReportErrorMessage("pthread_detach() failed, return code: %d\n", rc);
exit(1);
}
diff --git a/src/java.base/unix/native/libjli/java_md_common.c b/src/java.base/unix/native/libjli/java_md_common.c
index 511519ae362..453d605f710 100644
--- a/src/java.base/unix/native/libjli/java_md_common.c
+++ b/src/java.base/unix/native/libjli/java_md_common.c
@@ -243,13 +243,7 @@ JLI_ReportErrorMessage(const char* fmt, ...) {
JNIEXPORT void JNICALL
JLI_ReportErrorMessageSys(const char* fmt, ...) {
va_list vl;
- char *emsg;
-
- /*
- * TODO: its safer to use strerror_r but is not available on
- * Solaris 8. Until then....
- */
- emsg = strerror(errno);
+ char *emsg = strerror(errno);
if (emsg != NULL) {
fprintf(stderr, "%s\n", emsg);
}
diff --git a/src/java.desktop/macosx/native/libsplashscreen/splashscreen_sys.m b/src/java.desktop/macosx/native/libsplashscreen/splashscreen_sys.m
index 66e0c362318..e74f8ee50fb 100644
--- a/src/java.desktop/macosx/native/libsplashscreen/splashscreen_sys.m
+++ b/src/java.desktop/macosx/native/libsplashscreen/splashscreen_sys.m
@@ -271,11 +271,13 @@ static int isInAquaSession() {
SplashCreateThread(Splash * splash) {
pthread_t thr;
pthread_attr_t attr;
- int rc;
int rslt = pthread_attr_init(&attr);
if (rslt != 0) return;
- rc = pthread_create(&thr, &attr, SplashScreenThread, (void *) splash);
+ rslt = pthread_create(&thr, &attr, SplashScreenThread, (void *) splash);
+ if (rslt != 0) {
+ fprintf(stderr, "Could not create SplashScreen thread, error number:%d\n", rslt);
+ }
pthread_attr_destroy(&attr);
}
diff --git a/src/java.desktop/unix/native/libsplashscreen/splashscreen_sys.c b/src/java.desktop/unix/native/libsplashscreen/splashscreen_sys.c
index e990cd9014a..b779ed0b232 100644
--- a/src/java.desktop/unix/native/libsplashscreen/splashscreen_sys.c
+++ b/src/java.desktop/unix/native/libsplashscreen/splashscreen_sys.c
@@ -740,11 +740,13 @@ void
SplashCreateThread(Splash * splash) {
pthread_t thr;
pthread_attr_t attr;
- int rc;
int rslt = pthread_attr_init(&attr);
if (rslt != 0) return;
- rc = pthread_create(&thr, &attr, SplashScreenThread, (void *) splash);
+ rslt = pthread_create(&thr, &attr, SplashScreenThread, (void *) splash);
+ if (rslt != 0) {
+ fprintf(stderr, "Could not create SplashScreen thread, error number:%d\n", rslt);
+ }
pthread_attr_destroy(&attr);
}