From 686d3fed2f58ed95ed4ca83aaa01942488a81ed6 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 1 Jul 2025 17:15:45 +0200 Subject: [PATCH] convert CURLFTPAUTH_* to long constants --- docs/libcurl/opts/CURLOPT_FTPSSLAUTH.md | 2 +- include/curl/curl.h | 9 +++++---- lib/setopt.c | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/libcurl/opts/CURLOPT_FTPSSLAUTH.md b/docs/libcurl/opts/CURLOPT_FTPSSLAUTH.md index 5252da7db5..c094c9a762 100644 --- a/docs/libcurl/opts/CURLOPT_FTPSSLAUTH.md +++ b/docs/libcurl/opts/CURLOPT_FTPSSLAUTH.md @@ -61,7 +61,7 @@ int main(void) curl_easy_setopt(curl, CURLOPT_URL, "ftp://example.com/file.txt"); curl_easy_setopt(curl, CURLOPT_USE_SSL, CURLUSESSL_TRY); /* funny server, ask for SSL before TLS */ - curl_easy_setopt(curl, CURLOPT_FTPSSLAUTH, (long)CURLFTPAUTH_SSL); + curl_easy_setopt(curl, CURLOPT_FTPSSLAUTH, CURLFTPAUTH_SSL); res = curl_easy_perform(curl); curl_easy_cleanup(curl); } diff --git a/include/curl/curl.h b/include/curl/curl.h index cb4e523c38..ac4e0c1e47 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -987,11 +987,12 @@ typedef enum { } curl_ftpccc; /* parameter for the CURLOPT_FTPSSLAUTH option */ +#define CURLFTPAUTH_DEFAULT 0L /* let libcurl decide */ +#define CURLFTPAUTH_SSL 1L /* use "AUTH SSL" */ +#define CURLFTPAUTH_TLS 2L /* use "AUTH TLS" */ + typedef enum { - CURLFTPAUTH_DEFAULT, /* let libcurl decide */ - CURLFTPAUTH_SSL, /* use "AUTH SSL" */ - CURLFTPAUTH_TLS, /* use "AUTH TLS" */ - CURLFTPAUTH_LAST /* not an option, never use */ + CURLFTPAUTH_LAST = 3 /* not an option, never use */ } curl_ftpauth; /* parameter for the CURLOPT_FTP_CREATE_MISSING_DIRS option */ diff --git a/lib/setopt.c b/lib/setopt.c index d39d574aa7..5464d07f79 100644 --- a/lib/setopt.c +++ b/lib/setopt.c @@ -900,7 +900,7 @@ static CURLcode setopt_long(struct Curl_easy *data, CURLoption option, */ if((arg < CURLFTPAUTH_DEFAULT) || (arg >= CURLFTPAUTH_LAST)) return CURLE_BAD_FUNCTION_ARGUMENT; - data->set.ftpsslauth = (unsigned char)(curl_ftpauth)arg; + data->set.ftpsslauth = (unsigned char)arg; break; case CURLOPT_ACCEPTTIMEOUT_MS: /*