Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update platformStrError to work in Windows #6910

Merged
merged 1 commit into from Dec 6, 2021
Merged

Update platformStrError to work in Windows #6910

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 12 additions & 16 deletions nativeruntime/cpp/libnativehelper/include/nativehelper/JNIHelp.h
View file
Open in desktop
Expand Up @@ -89,26 +89,22 @@ struct [[maybe_unused]] ExpandableString {
return ExpandableStringAppend(s, text);
}

[[maybe_unused]] inline char* safe_strerror(
char* (*strerror_r_method)(int, char*, size_t), int errnum, char* buf,
size_t buflen) {
return strerror_r_method(errnum, buf, buflen);
}

[[maybe_unused]] inline char* safe_strerror(int (*strerror_r_method)(int, char*,
size_t),
int errnum, char* buf,
size_t buflen) {
int rc = strerror_r_method(errnum, buf, buflen);
[[maybe_unused]] inline const char* platformStrError(int errnum, char* buf,
size_t buflen) {
#ifdef _WIN32
strerror_s(buf, buflen, errnum);
return buf;
#elif defined(__USE_GNU)
// char *strerror_r(int errnum, char *buf, size_t buflen); /* GNU-specific */
return strerror_r(errnum, buf, buflen);
#else
// int strerror_r(int errnum, char *buf, size_t buflen); /* XSI-compliant */
int rc = strerror_r(errnum, buf, buflen);
if (rc != 0) {
snprintf(buf, buflen, "errno %d", errnum);
}
return buf;
}

[[maybe_unused]] static const char* platformStrError(int errnum, char* buf,
size_t buflen) {
return safe_strerror(strerror_r, errnum, buf, buflen);
#endif
}

[[maybe_unused]] static jmethodID FindMethod(JNIEnv* env, const char* className,
Expand Down