mirror of
https://github.com/curl/curl.git
synced 2025-02-17 14:59:45 +08:00
Enable more picky compiler warnings. I've found these options in the nghttp3 project when implementing the CMake quick picky warning functionality for it [1]. `-Wunused-macros` was too noisy to keep around, but fixed a few issues it revealed while testing. - autotools: reflect the more precisely-versioned clang warnings. Follow-up to033f8e2a08
#12324 - autotools: sync between clang and gcc the way we set `no-multichar`. - autotools: avoid setting `-Wstrict-aliasing=3` twice. - autotools: disable `-Wmissing-noreturn` for MSYS gcc targets [2]. It triggers in libtool-generated stub code. - lib/timeval: delete a redundant `!MSDOS` guard from a `WIN32` branch. - lib/curl_setup.h: delete duplicate declaration for `fileno`. Added in initial commitae1912cb0d
(1999-12-29). This suggests this may not be needed anymore, but if it does, we may restore this for those specific (non-Windows) systems. - lib: delete unused macro `FTP_BUFFER_ALLOCSIZE` sincec1d6fe2aaa
. - lib: delete unused macro `isxdigit_ascii` sincef65f750742
. - lib/mqtt: delete unused macro `MQTT_HEADER_LEN`. - lib/multi: delete unused macro `SH_READ`/`SH_WRITE`. - lib/hostip: add `noreturn` function attribute via new `CURL_NORETURN` macro. - lib/mprintf: delete duplicate declaration for `Curl_dyn_vprintf`. - lib/rand: fix `-Wunreachable-code` and related fallouts [3]. - lib/setopt: fix `-Wunreachable-code-break`. - lib/system_win32 and lib/timeval: fix double declarations for `Curl_freq` and `Curl_isVistaOrGreater` in CMake UNITY mode [4]. - lib/warnless: fix double declarations in CMake UNITY mode [5]. This was due to force-disabling the header guard of `warnless.h` to to reapply it to source code coming after `warnless.c` in UNITY builds. This reapplied declarations too, causing the warnings. Solved by adding a header guard for the lines that actually need to be reapplied. - lib/vauth/digest: fix `-Wunreachable-code-break` [6]. - lib/vssh/libssh2: fix `-Wunreachable-code-break` and delete redundant block. - lib/vtls/sectransp: fix `-Wunreachable-code-break` [7]. - lib/vtls/sectransp: suppress `-Wunreachable-code`. Detected in `else` branches of dynamic feature checks, with results known at compile-time, e.g. ```c if(SecCertificateCopySubjectSummary) /* -> true */ ``` Likely fixable as a separate micro-project, but given SecureTransport is deprecated anyway, let's just silence these locally. - src/tool_help: delete duplicate declaration for `helptext`. - src/tool_xattr: fix `-Wunreachable-code`. - tests: delete duplicate declaration for `unitfail` [8]. - tests: delete duplicate declaration for `strncasecompare`. - tests/libtest: delete duplicate declaration for `gethostname`. Originally added in687df5c8c3
(2010-08-02). Got complicated later:c49e9683b8
If there are still systems around with warnings, we may restore the prototype, but limited for those systems. - tests/lib2305: delete duplicate declaration for `libtest_debug_config`. - tests/h2-download: fix `-Wunreachable-code-break`. [1]a70edb08e9/cmake/PickyWarningsC.cmake
[2] https://ci.appveyor.com/project/curlorg/curl/builds/48553586/job/3qkgjauiqla5fj45?fullLog=true#L1675 [3] https://github.com/curl/curl/actions/runs/6880886309/job/18716044703?pr=12331#step:7:72 https://github.com/curl/curl/actions/runs/6883016087/job/18722707368?pr=12331#step:7:109 [4] https://ci.appveyor.com/project/curlorg/curl/builds/48555101/job/9g15qkrriklpf1ut#L204 [5] https://ci.appveyor.com/project/curlorg/curl/builds/48555101/job/9g15qkrriklpf1ut#L218 [6] https://github.com/curl/curl/actions/runs/6880886309/job/18716042927?pr=12331#step:7:290 [7] https://github.com/curl/curl/actions/runs/6891484996/job/18746659406?pr=12331#step:9:1193 [8] https://github.com/curl/curl/actions/runs/6882803986/job/18722082562?pr=12331#step:33:1870 Closes #12331
238 lines
6.6 KiB
C
238 lines
6.6 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "timeval.h"
|
|
|
|
#if defined(WIN32)
|
|
|
|
#include <curl/curl.h>
|
|
#include "system_win32.h"
|
|
|
|
/* In case of bug fix this function has a counterpart in tool_util.c */
|
|
struct curltime Curl_now(void)
|
|
{
|
|
struct curltime now;
|
|
if(Curl_isVistaOrGreater) { /* QPC timer might have issues pre-Vista */
|
|
LARGE_INTEGER count;
|
|
QueryPerformanceCounter(&count);
|
|
now.tv_sec = (time_t)(count.QuadPart / Curl_freq.QuadPart);
|
|
now.tv_usec = (int)((count.QuadPart % Curl_freq.QuadPart) * 1000000 /
|
|
Curl_freq.QuadPart);
|
|
}
|
|
else {
|
|
/* Disable /analyze warning that GetTickCount64 is preferred */
|
|
#if defined(_MSC_VER)
|
|
#pragma warning(push)
|
|
#pragma warning(disable:28159)
|
|
#endif
|
|
DWORD milliseconds = GetTickCount();
|
|
#if defined(_MSC_VER)
|
|
#pragma warning(pop)
|
|
#endif
|
|
|
|
now.tv_sec = milliseconds / 1000;
|
|
now.tv_usec = (milliseconds % 1000) * 1000;
|
|
}
|
|
return now;
|
|
}
|
|
|
|
#elif defined(HAVE_CLOCK_GETTIME_MONOTONIC) || \
|
|
defined(HAVE_CLOCK_GETTIME_MONOTONIC_RAW)
|
|
|
|
struct curltime Curl_now(void)
|
|
{
|
|
/*
|
|
** clock_gettime() is granted to be increased monotonically when the
|
|
** monotonic clock is queried. Time starting point is unspecified, it
|
|
** could be the system start-up time, the Epoch, or something else,
|
|
** in any case the time starting point does not change once that the
|
|
** system has started up.
|
|
*/
|
|
#ifdef HAVE_GETTIMEOFDAY
|
|
struct timeval now;
|
|
#endif
|
|
struct curltime cnow;
|
|
struct timespec tsnow;
|
|
|
|
/*
|
|
** clock_gettime() may be defined by Apple's SDK as weak symbol thus
|
|
** code compiles but fails during run-time if clock_gettime() is
|
|
** called on unsupported OS version.
|
|
*/
|
|
#if defined(__APPLE__) && defined(HAVE_BUILTIN_AVAILABLE) && \
|
|
(HAVE_BUILTIN_AVAILABLE == 1)
|
|
bool have_clock_gettime = FALSE;
|
|
if(__builtin_available(macOS 10.12, iOS 10, tvOS 10, watchOS 3, *))
|
|
have_clock_gettime = TRUE;
|
|
#endif
|
|
|
|
#ifdef HAVE_CLOCK_GETTIME_MONOTONIC_RAW
|
|
if(
|
|
#if defined(__APPLE__) && defined(HAVE_BUILTIN_AVAILABLE) && \
|
|
(HAVE_BUILTIN_AVAILABLE == 1)
|
|
have_clock_gettime &&
|
|
#endif
|
|
(0 == clock_gettime(CLOCK_MONOTONIC_RAW, &tsnow))) {
|
|
cnow.tv_sec = tsnow.tv_sec;
|
|
cnow.tv_usec = (unsigned int)(tsnow.tv_nsec / 1000);
|
|
}
|
|
else
|
|
#endif
|
|
|
|
if(
|
|
#if defined(__APPLE__) && defined(HAVE_BUILTIN_AVAILABLE) && \
|
|
(HAVE_BUILTIN_AVAILABLE == 1)
|
|
have_clock_gettime &&
|
|
#endif
|
|
(0 == clock_gettime(CLOCK_MONOTONIC, &tsnow))) {
|
|
cnow.tv_sec = tsnow.tv_sec;
|
|
cnow.tv_usec = (unsigned int)(tsnow.tv_nsec / 1000);
|
|
}
|
|
/*
|
|
** Even when the configure process has truly detected monotonic clock
|
|
** availability, it might happen that it is not actually available at
|
|
** run-time. When this occurs simply fallback to other time source.
|
|
*/
|
|
#ifdef HAVE_GETTIMEOFDAY
|
|
else {
|
|
(void)gettimeofday(&now, NULL);
|
|
cnow.tv_sec = now.tv_sec;
|
|
cnow.tv_usec = (unsigned int)now.tv_usec;
|
|
}
|
|
#else
|
|
else {
|
|
cnow.tv_sec = time(NULL);
|
|
cnow.tv_usec = 0;
|
|
}
|
|
#endif
|
|
return cnow;
|
|
}
|
|
|
|
#elif defined(HAVE_MACH_ABSOLUTE_TIME)
|
|
|
|
#include <stdint.h>
|
|
#include <mach/mach_time.h>
|
|
|
|
struct curltime Curl_now(void)
|
|
{
|
|
/*
|
|
** Monotonic timer on Mac OS is provided by mach_absolute_time(), which
|
|
** returns time in Mach "absolute time units," which are platform-dependent.
|
|
** To convert to nanoseconds, one must use conversion factors specified by
|
|
** mach_timebase_info().
|
|
*/
|
|
static mach_timebase_info_data_t timebase;
|
|
struct curltime cnow;
|
|
uint64_t usecs;
|
|
|
|
if(0 == timebase.denom)
|
|
(void) mach_timebase_info(&timebase);
|
|
|
|
usecs = mach_absolute_time();
|
|
usecs *= timebase.numer;
|
|
usecs /= timebase.denom;
|
|
usecs /= 1000;
|
|
|
|
cnow.tv_sec = usecs / 1000000;
|
|
cnow.tv_usec = (int)(usecs % 1000000);
|
|
|
|
return cnow;
|
|
}
|
|
|
|
#elif defined(HAVE_GETTIMEOFDAY)
|
|
|
|
struct curltime Curl_now(void)
|
|
{
|
|
/*
|
|
** gettimeofday() is not granted to be increased monotonically, due to
|
|
** clock drifting and external source time synchronization it can jump
|
|
** forward or backward in time.
|
|
*/
|
|
struct timeval now;
|
|
struct curltime ret;
|
|
(void)gettimeofday(&now, NULL);
|
|
ret.tv_sec = now.tv_sec;
|
|
ret.tv_usec = (int)now.tv_usec;
|
|
return ret;
|
|
}
|
|
|
|
#else
|
|
|
|
struct curltime Curl_now(void)
|
|
{
|
|
/*
|
|
** time() returns the value of time in seconds since the Epoch.
|
|
*/
|
|
struct curltime now;
|
|
now.tv_sec = time(NULL);
|
|
now.tv_usec = 0;
|
|
return now;
|
|
}
|
|
|
|
#endif
|
|
|
|
/*
|
|
* Returns: time difference in number of milliseconds. For too large diffs it
|
|
* returns max value.
|
|
*
|
|
* @unittest: 1323
|
|
*/
|
|
timediff_t Curl_timediff(struct curltime newer, struct curltime older)
|
|
{
|
|
timediff_t diff = (timediff_t)newer.tv_sec-older.tv_sec;
|
|
if(diff >= (TIMEDIFF_T_MAX/1000))
|
|
return TIMEDIFF_T_MAX;
|
|
else if(diff <= (TIMEDIFF_T_MIN/1000))
|
|
return TIMEDIFF_T_MIN;
|
|
return diff * 1000 + (newer.tv_usec-older.tv_usec)/1000;
|
|
}
|
|
|
|
/*
|
|
* Returns: time difference in number of milliseconds, rounded up.
|
|
* For too large diffs it returns max value.
|
|
*/
|
|
timediff_t Curl_timediff_ceil(struct curltime newer, struct curltime older)
|
|
{
|
|
timediff_t diff = (timediff_t)newer.tv_sec-older.tv_sec;
|
|
if(diff >= (TIMEDIFF_T_MAX/1000))
|
|
return TIMEDIFF_T_MAX;
|
|
else if(diff <= (TIMEDIFF_T_MIN/1000))
|
|
return TIMEDIFF_T_MIN;
|
|
return diff * 1000 + (newer.tv_usec - older.tv_usec + 999)/1000;
|
|
}
|
|
|
|
/*
|
|
* Returns: time difference in number of microseconds. For too large diffs it
|
|
* returns max value.
|
|
*/
|
|
timediff_t Curl_timediff_us(struct curltime newer, struct curltime older)
|
|
{
|
|
timediff_t diff = (timediff_t)newer.tv_sec-older.tv_sec;
|
|
if(diff >= (TIMEDIFF_T_MAX/1000000))
|
|
return TIMEDIFF_T_MAX;
|
|
else if(diff <= (TIMEDIFF_T_MIN/1000000))
|
|
return TIMEDIFF_T_MIN;
|
|
return diff * 1000000 + newer.tv_usec-older.tv_usec;
|
|
}
|