This is an archive of the discontinued LLVM Phabricator instance.

Differential D108196

[OpenMP] Fix the usage of sscanf on MinGW
ClosedPublic

Authored by mstorsjo on Aug 17 2021, 3:17 AM.

Details

Reviewers
jlpeyton
AndreyChurbanov
jdoerfert
Commits
rGf5616a981c60: [OpenMP] Fix the usage of sscanf on MinGW
Summary

KMP_SSCANF only evaluates to sscanf_s within

#if KMP_OS_WINDOWS && KMP_MSVC_COMPAT

so we need to pass the sscanf_s specific parameters within a similar
condition.

Diff Detail

Event Timeline

mstorsjo created this revision.Aug 17 2021, 3:17 AM
Herald added subscribers: guansong, yaxunl. · View Herald TranscriptAug 17 2021, 3:17 AM
mstorsjo requested review of this revision.Aug 17 2021, 3:17 AM
Herald added a reviewer: jdoerfert. · View Herald TranscriptAug 17 2021, 3:17 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added a subscriber: sstefan1. · View Herald Transcript
Harbormaster completed remote builds in B119866: Diff 366848.Aug 17 2021, 3:57 AM
AndreyChurbanov accepted this revision.Aug 17 2021, 8:44 AM

LGTM

This revision is now accepted and ready to land.Aug 17 2021, 8:44 AM
Closed by commit rGf5616a981c60: [OpenMP] Fix the usage of sscanf on MinGW (authored by mstorsjo). · Explain WhyAug 17 2021, 11:36 AM
This revision was automatically updated to reflect the committed changes.
mstorsjo added a commit: rGf5616a981c60: [OpenMP] Fix the usage of sscanf on MinGW.

Revision Contents

PathSize
openmp/
runtime/
src/
2 lines

Diff 366969

openmp/runtime/src/kmp_settings.cpp

Show First 20 Lines • Show All 158 Lines • ▼ Show 20 Linesint __kmp_convert_to_milliseconds(char const *data) {
double value; double value;
if (data == NULL) if (data == NULL)
return (-1); return (-1);
if (__kmp_str_match("infinit", -1, data)) if (__kmp_str_match("infinit", -1, data))
return (INT_MAX); return (INT_MAX);
value = (double)0.0; value = (double)0.0;
mult = '\0'; mult = '\0';
#if KMP_OS_WINDOWS #if KMP_OS_WINDOWS && KMP_MSVC_COMPAT
// On Windows, each %c parameter needs additional size parameter for sscanf_s // On Windows, each %c parameter needs additional size parameter for sscanf_s
nvalues = KMP_SSCANF(data, "%lf%c%c", &value, &mult, 1, &extra, 1); nvalues = KMP_SSCANF(data, "%lf%c%c", &value, &mult, 1, &extra, 1);
#else #else
nvalues = KMP_SSCANF(data, "%lf%c%c", &value, &mult, &extra); nvalues = KMP_SSCANF(data, "%lf%c%c", &value, &mult, &extra);
#endif #endif
if (nvalues < 1) if (nvalues < 1)
return (-1); return (-1);
if (nvalues == 1) if (nvalues == 1)
▲ Show 20 Lines • Show All 6,098 Lines • Show Last 20 Lines