lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-11-20 02:42:09 +03:00
Code Activity

build: add mingw-w64 support to LIBSSH2_PRINTF() attribute

Browse Source 
And fix the warning it detected.

Closes #1287
This commit is contained in:
Viktor Szakats
2023-12-14 22:54:22 +00:00
parent 9839ebe5e9
commit f8c4579439
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/libssh2_priv.h
View File

@@ -115,9 +115,16 @@
#if (defined(__GNUC__) || defined(__clang__)) && \ #if (defined(__GNUC__) || defined(__clang__)) && \
defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && \ defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && \
!defined(__MINGW32__) && !defined(LIBSSH2_NO_FMT_CHECKS) !defined(LIBSSH2_NO_FMT_CHECKS)
#define LIBSSH2_PRINTF(fmt, arg) __attribute__((format(printf, fmt, arg))) #ifdef __MINGW_PRINTF_FORMAT
#else #define LIBSSH2_PRINTF(fmt, arg) \
__attribute__((format(__MINGW_PRINTF_FORMAT, fmt, arg)))
#elif !defined(__MINGW32__)
#define LIBSSH2_PRINTF(fmt, arg) \
__attribute__((format(printf, fmt, arg)))
#endif
#endif
#ifndef LIBSSH2_PRINTF
#define LIBSSH2_PRINTF(fmt, arg) #define LIBSSH2_PRINTF(fmt, arg)
#endif #endif

2
src/session.c
View File

@@ -699,7 +699,7 @@ session_startup(LIBSSH2_SESSION *session, libssh2_socket_t sock)
if(session->startup_state == libssh2_NB_state_idle) { if(session->startup_state == libssh2_NB_state_idle) {
_libssh2_debug((session, LIBSSH2_TRACE_TRANS, _libssh2_debug((session, LIBSSH2_TRACE_TRANS,
"session_startup for socket %d", sock)); "session_startup for socket %ld", (long)sock));
if(LIBSSH2_INVALID_SOCKET == sock) { if(LIBSSH2_INVALID_SOCKET == sock) {
/* Did we forget something? */ /* Did we forget something? */
return _libssh2_error(session, LIBSSH2_ERROR_BAD_SOCKET, return _libssh2_error(session, LIBSSH2_ERROR_BAD_SOCKET,