diff options
| author | Shane Kearns <ext-shane.2.kearns@nokia.com> | 2012-05-22 12:31:23 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-23 14:18:34 +0200 |
| commit | 9149aebac96fb6134bf567b3266bf67d706893cf (patch) | |
| tree | ca471b6ed8f266c2008c0ffa9bc64dbd8795ece3 /src/network/access/qnetworkrequest.cpp | |
| parent | 856ca268f81934ac65596ee545a3ffaf25457186 (diff) | |
Fix compile warnings with MSVC
Calling a static function non statically causes an unused variable
warning for the optimised away d pointer.
sscanf causes an insecure functions warning. (Even though it was used
safely in this case)
Change-Id: I07700e2155284ef3ebbe7d604ed59b2e61ee7f95
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/network/access/qnetworkrequest.cpp')
| -rw-r--r-- | src/network/access/qnetworkrequest.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index 9df06328a1..cb4614bb0a 100644 --- a/src/network/access/qnetworkrequest.cpp +++ b/src/network/access/qnetworkrequest.cpp @@ -1043,7 +1043,14 @@ QDateTime QNetworkHeadersPrivate::fromHttpDate(const QByteArray &value) if (pos == 3) { char month_name[4]; int day, year, hour, minute, second; +#ifdef Q_CC_MSVC + // Use secure version to avoid compiler warning + if (sscanf_s(value.constData(), "%*3s, %d %3s %d %d:%d:%d 'GMT'", &day, month_name, 4, &year, &hour, &minute, &second) == 6) +#else + // The POSIX secure mode is %ms (which allocates memory), too bleeding edge for now + // In any case this is already safe as field width is specified. if (sscanf(value.constData(), "%*3s, %d %3s %d %d:%d:%d 'GMT'", &day, month_name, &year, &hour, &minute, &second) == 6) +#endif dt = QDateTime(QDate(year, name_to_month(month_name), day), QTime(hour, minute, second)); } else { QLocale c = QLocale::c(); |