romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-23 02:17:21 +03:00
Code Issues Projects Releases Packages Wiki Activity

ssh: fix namespace of two local macros

Browse source 
Avoid using the libssh and libssh2 macro namespaces by prefixing
these local macro names with `CURL_`.

Follow-up to 413a0fedd0 #12346

Reviewed-by: Daniel Stenberg
Closes #12544
This commit is contained in:
Viktor Szakats 2023-12-17 12:29:26 +00:00
parent 17e61d4e3a
commit 15b09d9343
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
2 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

26
lib/vssh/libssh.c
View file

@ -1151,22 +1151,22 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
}
else if(statvfs) {
#ifdef _MSC_VER
#define LIBSSH_VFS_SIZE_MASK "I64u"
#define CURL_LIBSSH_VFS_SIZE_MASK "I64u"
#else
#define LIBSSH_VFS_SIZE_MASK PRIu64
#define CURL_LIBSSH_VFS_SIZE_MASK PRIu64
#endif
char *tmp = aprintf("statvfs:\n"
"f_bsize: %" LIBSSH_VFS_SIZE_MASK "\n"
"f_frsize: %" LIBSSH_VFS_SIZE_MASK "\n"
"f_blocks: %" LIBSSH_VFS_SIZE_MASK "\n"
"f_bfree: %" LIBSSH_VFS_SIZE_MASK "\n"
"f_bavail: %" LIBSSH_VFS_SIZE_MASK "\n"
"f_files: %" LIBSSH_VFS_SIZE_MASK "\n"
"f_ffree: %" LIBSSH_VFS_SIZE_MASK "\n"
"f_favail: %" LIBSSH_VFS_SIZE_MASK "\n"
"f_fsid: %" LIBSSH_VFS_SIZE_MASK "\n"
"f_flag: %" LIBSSH_VFS_SIZE_MASK "\n"
"f_namemax: %" LIBSSH_VFS_SIZE_MASK "\n",
"f_bsize: %" CURL_LIBSSH_VFS_SIZE_MASK "\n"
"f_frsize: %" CURL_LIBSSH_VFS_SIZE_MASK "\n"
"f_blocks: %" CURL_LIBSSH_VFS_SIZE_MASK "\n"
"f_bfree: %" CURL_LIBSSH_VFS_SIZE_MASK "\n"
"f_bavail: %" CURL_LIBSSH_VFS_SIZE_MASK "\n"
"f_files: %" CURL_LIBSSH_VFS_SIZE_MASK "\n"
"f_ffree: %" CURL_LIBSSH_VFS_SIZE_MASK "\n"
"f_favail: %" CURL_LIBSSH_VFS_SIZE_MASK "\n"
"f_fsid: %" CURL_LIBSSH_VFS_SIZE_MASK "\n"
"f_flag: %" CURL_LIBSSH_VFS_SIZE_MASK "\n"
"f_namemax: %" CURL_LIBSSH_VFS_SIZE_MASK "\n",
statvfs->f_bsize, statvfs->f_frsize,
statvfs->f_blocks, statvfs->f_bfree,
statvfs->f_bavail, statvfs->f_files,

26
lib/vssh/libssh2.c
View file

@ -1959,22 +1959,22 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
}
else if(rc == 0) {
#ifdef _MSC_VER
#define LIBSSH2_VFS_SIZE_MASK "I64u"
#define CURL_LIBSSH2_VFS_SIZE_MASK "I64u"
#else
#define LIBSSH2_VFS_SIZE_MASK "llu"
#define CURL_LIBSSH2_VFS_SIZE_MASK "llu"
#endif
char *tmp = aprintf("statvfs:\n"
"f_bsize: %" LIBSSH2_VFS_SIZE_MASK "\n"
"f_frsize: %" LIBSSH2_VFS_SIZE_MASK "\n"
"f_blocks: %" LIBSSH2_VFS_SIZE_MASK "\n"
"f_bfree: %" LIBSSH2_VFS_SIZE_MASK "\n"
"f_bavail: %" LIBSSH2_VFS_SIZE_MASK "\n"
"f_files: %" LIBSSH2_VFS_SIZE_MASK "\n"
"f_ffree: %" LIBSSH2_VFS_SIZE_MASK "\n"
"f_favail: %" LIBSSH2_VFS_SIZE_MASK "\n"
"f_fsid: %" LIBSSH2_VFS_SIZE_MASK "\n"
"f_flag: %" LIBSSH2_VFS_SIZE_MASK "\n"
"f_namemax: %" LIBSSH2_VFS_SIZE_MASK "\n",
"f_bsize: %" CURL_LIBSSH2_VFS_SIZE_MASK "\n"
"f_frsize: %" CURL_LIBSSH2_VFS_SIZE_MASK "\n"
"f_blocks: %" CURL_LIBSSH2_VFS_SIZE_MASK "\n"
"f_bfree: %" CURL_LIBSSH2_VFS_SIZE_MASK "\n"
"f_bavail: %" CURL_LIBSSH2_VFS_SIZE_MASK "\n"
"f_files: %" CURL_LIBSSH2_VFS_SIZE_MASK "\n"
"f_ffree: %" CURL_LIBSSH2_VFS_SIZE_MASK "\n"
"f_favail: %" CURL_LIBSSH2_VFS_SIZE_MASK "\n"
"f_fsid: %" CURL_LIBSSH2_VFS_SIZE_MASK "\n"
"f_flag: %" CURL_LIBSSH2_VFS_SIZE_MASK "\n"
"f_namemax: %" CURL_LIBSSH2_VFS_SIZE_MASK "\n",
statvfs.f_bsize, statvfs.f_frsize,
statvfs.f_blocks, statvfs.f_bfree,
statvfs.f_bavail, statvfs.f_files,