romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-24 19:03:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

tidy-up: miscellaneous

Browse source 
- curl_ntlm_core, smtp, schannel: fix comments.
- curl_setup.h: fix to undef before define.
- tool_doswin, server/sockfilt: reduce variables scopes.
- tool_doswin: drop an interim variable.
- windows: replace `SOCKET_ERROR` with `0` to align with rest of code.
- libssh2: rename variable to align with rest of code.
- gtls, unit1398: use `#if 0`.
- curl_trc.h, curlx/inet_ntop.h: add missing parentheses in macro
  expressions.
- ldap.c: set empty macro to `do {} while(0)`.
- examples/crawler: rename a non-CURLcode `result` variable.
- CURLINFO_TLS_SESSION: drop stray colon.
- add `const` to casts where missing.
- drop unnecessary parentheses.
- fix indent.
- quote style.
- comment style.
- whitespace, newlines, fold/unfold.

Closes #20554
This commit is contained in:
Viktor Szakats 2026-02-01 01:56:43 +01:00
parent 2a92c39a21
commit 61df5f466c
No known key found for this signature in database
88 changed files with 503 additions and 503 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/mkhelp.pl
View file

@ -153,6 +153,7 @@ void hugehelp(void)
}
inflateEnd(&z);
}
/* Show the help text for the 'arg' curl argument on stdout */
void showhelp(const char *trigger, const char *arg, const char *endarg)
{
@ -219,7 +220,7 @@ for my $n (@out) {
}
else {
$n =~ s/ /\\t/g;
printf(" \"%s%s\",\n", $blank?"\\n":"", $n);
printf(" \"%s%s\",\n", $blank ? "\\n" : "", $n);
$blank = 0;
}
}

9
src/tool_cb_rea.c
View file

@ -57,8 +57,7 @@ static bool waitfd(int waitms, int fd)
struct timeval timeout;
if(fd >= FD_SETSIZE)
/* cannot wait! */
return FALSE;
return FALSE; /* cannot wait! */
/* wait this long at the most */
timeout.tv_sec = waitms / 1000;
@ -94,8 +93,7 @@ size_t tool_read_cb(char *buffer, size_t sz, size_t nmemb, void *userdata)
long msdelta = (long)curlx_timediff_ms(now, per->start);
if(msdelta > config->timeout_ms)
/* timeout */
return 0;
return 0; /* timeout */
#ifndef _WIN32
else {
long w = config->timeout_ms - msdelta;
@ -181,8 +179,7 @@ int tool_readbusy_cb(void *clientp,
#ifndef _WIN32
waitfd(1, per->infd);
#else
/* sleep */
curlx_wait_ms(1);
curlx_wait_ms(1); /* sleep */
#endif
}

181
src/tool_doswin.c
View file

@ -67,30 +67,30 @@ char **__crt0_glob_function(char *arg)
#endif
/*
Test if truncating a path to a file will leave at least a single character in
the filename. Filenames suffixed by an alternate data stream cannot be
truncated. This performs a dry run, nothing is modified.
Good truncate_pos 9: C:\foo\bar => C:\foo\ba
Good truncate_pos 6: C:\foo => C:\foo
Good truncate_pos 5: C:\foo => C:\fo
Bad* truncate_pos 5: C:foo => C:foo
Bad truncate_pos 5: C:\foo:ads => C:\fo
Bad truncate_pos 9: C:\foo:ads => C:\foo:ad
Bad truncate_pos 5: C:\foo\bar => C:\fo
Bad truncate_pos 5: C:\foo\ => C:\fo
Bad truncate_pos 7: C:\foo\ => C:\foo\
Error truncate_pos 7: C:\foo => (pos out of range)
Bad truncate_pos 1: C:\foo\ => C
* C:foo is ambiguous, C could end up being a drive or file therefore something
like C:superlongfilename cannot be truncated.
Returns
SANITIZE_ERR_OK: Good -- 'path' can be truncated
SANITIZE_ERR_INVALID_PATH: Bad -- 'path' cannot be truncated
!= SANITIZE_ERR_OK && != SANITIZE_ERR_INVALID_PATH: Error
*/
* Test if truncating a path to a file will leave at least a single character
* in the filename. Filenames suffixed by an alternate data stream cannot be
* truncated. This performs a dry run, nothing is modified.
*
* Good truncate_pos 9: C:\foo\bar => C:\foo\ba
* Good truncate_pos 6: C:\foo => C:\foo
* Good truncate_pos 5: C:\foo => C:\fo
* Bad* truncate_pos 5: C:foo => C:foo
* Bad truncate_pos 5: C:\foo:ads => C:\fo
* Bad truncate_pos 9: C:\foo:ads => C:\foo:ad
* Bad truncate_pos 5: C:\foo\bar => C:\fo
* Bad truncate_pos 5: C:\foo\ => C:\fo
* Bad truncate_pos 7: C:\foo\ => C:\foo\
* Error truncate_pos 7: C:\foo => (pos out of range)
* Bad truncate_pos 1: C:\foo\ => C
*
* * C:foo is ambiguous, C could end up being a drive or file therefore
* something like C:superlongfilename cannot be truncated.
*
* Returns
* SANITIZE_ERR_OK: Good -- 'path' can be truncated
* SANITIZE_ERR_INVALID_PATH: Bad -- 'path' cannot be truncated
* != SANITIZE_ERR_OK && != SANITIZE_ERR_INVALID_PATH: Error
*/
static SANITIZEcode truncate_dryrun(const char *path,
const size_t truncate_pos)
{
@ -124,18 +124,18 @@ static SANITIZEcode truncate_dryrun(const char *path,
}
/*
Extra sanitization MS-DOS for file_name.
This is a supporting function for sanitize_file_name.
Warning: This is an MS-DOS legacy function and was purposely written in a way
that some path information may pass through. For example drive letter names
(C:, D:, etc) are allowed to pass through. For sanitizing a filename use
sanitize_file_name.
Success: (SANITIZE_ERR_OK) *sanitized points to a sanitized copy of file_name.
Failure: (!= SANITIZE_ERR_OK) *sanitized is NULL.
*/
* Extra sanitization MS-DOS for file_name.
*
* This is a supporting function for sanitize_file_name.
*
* Warning: This is an MS-DOS legacy function and was purposely written in
* a way that some path information may pass through. For example drive letter
* names (C:, D:, etc) are allowed to pass through. For sanitizing a filename
* use sanitize_file_name.
*
* Success: SANITIZE_ERR_OK *sanitized points to a sanitized copy of file_name.
* Failure: != SANITIZE_ERR_OK *sanitized is NULL.
*/
static SANITIZEcode msdosify(char ** const sanitized, const char *file_name,
int flags)
{
@ -171,7 +171,7 @@ static SANITIZEcode msdosify(char ** const sanitized, const char *file_name,
/* Get past the drive letter, if any. */
if(s[0] >= 'A' && s[0] <= 'z' && s[1] == ':') {
*d++ = *s++;
*d = ((flags & SANITIZE_ALLOW_PATH)) ? ':' : '_';
*d = (flags & SANITIZE_ALLOW_PATH) ? ':' : '_';
++d;
++s;
}
@ -270,25 +270,25 @@ static SANITIZEcode msdosify(char ** const sanitized, const char *file_name,
#endif /* MSDOS */
/*
Rename file_name if it is a reserved dos device name.
This is a supporting function for sanitize_file_name.
Warning: This is an MS-DOS legacy function and was purposely written in a way
that some path information may pass through. For example drive letter names
(C:, D:, etc) are allowed to pass through. For sanitizing a filename use
sanitize_file_name.
Success: (SANITIZE_ERR_OK) *sanitized points to a sanitized copy of file_name.
Failure: (!= SANITIZE_ERR_OK) *sanitized is NULL.
*/
* Rename file_name if it is a reserved dos device name.
*
* This is a supporting function for sanitize_file_name.
*
* Warning: This is an MS-DOS legacy function and was purposely written in
* a way that some path information may pass through. For example drive letter
* names (C:, D:, etc) are allowed to pass through. For sanitizing a filename
* use sanitize_file_name.
*
* Success: SANITIZE_ERR_OK *sanitized points to a sanitized copy of file_name.
* Failure: != SANITIZE_ERR_OK *sanitized is NULL.
*/
static SANITIZEcode rename_if_reserved_dos(char ** const sanitized,
const char *file_name,
int flags)
{
/* We could have a file whose name is a device on MS-DOS. Trying to
* retrieve such a file would fail at best and wedge us at worst. We need
* to rename such files. */
retrieve such a file would fail at best and wedge us at worst. We need
to rename such files. */
char *p, *base, *buffer;
#ifdef MSDOS
curlx_struct_stat st_buf;
@ -404,33 +404,34 @@ static SANITIZEcode rename_if_reserved_dos(char ** const sanitized,
}
/*
Sanitize a file or path name.
All banned characters are replaced by underscores, for example:
f?*foo => f__foo
f:foo::$DATA => f_foo__$DATA
f:\foo:bar => f__foo_bar
f:\foo:bar => f:\foo:bar (flag SANITIZE_ALLOW_PATH)
This function was implemented according to the guidelines in 'Naming Files,
Paths, and Namespaces' section 'Naming Conventions'.
https://learn.microsoft.com/windows/win32/fileio/naming-a-file
Flags
-----
SANITIZE_ALLOW_PATH: Allow path separators and colons.
Without this flag path separators and colons are sanitized.
SANITIZE_ALLOW_RESERVED: Allow reserved device names.
Without this flag a reserved device name is renamed (COM1 => _COM1).
To fully block reserved device names requires not passing either flag. Some
less common path styles are allowed to use reserved device names. For example,
a "\\" prefixed path may use reserved device names if paths are allowed.
Success: (SANITIZE_ERR_OK) *sanitized points to a sanitized copy of file_name.
Failure: (!= SANITIZE_ERR_OK) *sanitized is NULL.
*/
* Sanitize a file or path name.
*
* All banned characters are replaced by underscores, for example:
* f?*foo => f__foo
* f:foo::$DATA => f_foo__$DATA
* f:\foo:bar => f__foo_bar
* f:\foo:bar => f:\foo:bar (flag SANITIZE_ALLOW_PATH)
*
* This function was implemented according to the guidelines in 'Naming Files,
* Paths, and Namespaces' section 'Naming Conventions'.
* https://learn.microsoft.com/windows/win32/fileio/naming-a-file
*
* Flags
* -----
* SANITIZE_ALLOW_PATH: Allow path separators and colons.
* Without this flag path separators and colons are sanitized.
*
* SANITIZE_ALLOW_RESERVED: Allow reserved device names.
* Without this flag a reserved device name is renamed (COM1 => _COM1).
*
* To fully block reserved device names requires not passing either flag.
* Some less common path styles are allowed to use reserved device names.
* For example, a "\\" prefixed path may use reserved device names if paths
* are allowed.
*
* Success: SANITIZE_ERR_OK *sanitized points to a sanitized copy of file_name.
* Failure: != SANITIZE_ERR_OK *sanitized is NULL.
*/
SANITIZEcode sanitize_file_name(char ** const sanitized, const char *file_name,
int flags)
{
@ -708,11 +709,6 @@ struct win_thread_data {
static DWORD WINAPI win_stdin_thread_func(void *thread_data)
{
struct win_thread_data *tdata = (struct win_thread_data *)thread_data;
DWORD n;
ssize_t nwritten;
char buffer[BUFSIZ];
BOOL r;
struct sockaddr_in clientAddr;
int clientAddrLen = sizeof(clientAddr);
@ -732,8 +728,11 @@ static DWORD WINAPI win_stdin_thread_func(void *thread_data)
goto ThreadCleanup;
}
for(;;) {
r = ReadFile(tdata->stdin_handle, buffer, sizeof(buffer), &n, NULL);
if(r == 0)
DWORD n;
ssize_t nwritten;
char buffer[BUFSIZ];
if(!ReadFile(tdata->stdin_handle, buffer, sizeof(buffer), &n, NULL))
break;
if(n == 0)
break;
@ -760,11 +759,8 @@ ThreadCleanup:
/* The background thread that reads and buffers the true stdin. */
curl_socket_t win32_stdin_read_thread(void)
{
bool r;
int rc = 0;
curl_socklen_t socksize = 0;
struct win_thread_data *tdata = NULL;
struct sockaddr_in selfaddr;
static HANDLE stdin_thread = NULL;
static curl_socket_t socket_r = CURL_SOCKET_BAD;
@ -775,6 +771,9 @@ curl_socket_t win32_stdin_read_thread(void)
assert(stdin_thread == NULL);
do {
curl_socklen_t socksize = 0;
struct sockaddr_in selfaddr;
/* Prepare handles for thread */
tdata = (struct win_thread_data *)
curlx_calloc(1, sizeof(struct win_thread_data));
@ -812,11 +811,9 @@ curl_socket_t win32_stdin_read_thread(void)
}
/* Make a copy of the stdin handle to be used by win_stdin_thread_func */
r = DuplicateHandle(GetCurrentProcess(), GetStdHandle(STD_INPUT_HANDLE),
if(!DuplicateHandle(GetCurrentProcess(), GetStdHandle(STD_INPUT_HANDLE),
GetCurrentProcess(), &tdata->stdin_handle,
0, FALSE, DUPLICATE_SAME_ACCESS);
if(!r) {
0, FALSE, DUPLICATE_SAME_ACCESS)) {
errorf("DuplicateHandle error: 0x%08lx", GetLastError());
break;
}

3
src/tool_getparam.c
View file

@ -3130,7 +3130,8 @@ ParameterError parse_args(int argc, argv_item_t argv[])
err = PARAM_CONTDISP_RESUME_FROM;
}
if(err && err != PARAM_HELP_REQUESTED &&
if(err &&
err != PARAM_HELP_REQUESTED &&
err != PARAM_MANUAL_REQUESTED &&
err != PARAM_VERSION_INFO_REQUESTED &&
err != PARAM_ENGINES_REQUESTED &&

4
src/tool_setopt.c
View file

@ -465,10 +465,10 @@ static CURLcode libcurl_generate_mime_part(CURL *curl,
case TOOLMIME_STDINDATA:
/* Can only be reading stdin in the current context. */
result = easysrc_addf(&easysrc_code, "curl_mime_data_cb(part%d, -1, "
"(curl_read_callback) fread, \\", mimeno);
"(curl_read_callback)fread, \\", mimeno);
if(!result)
result = easysrc_addf(&easysrc_code, " "
"(curl_seek_callback) fseek, NULL, stdin);");
"(curl_seek_callback)fseek, NULL, stdin);");
break;
default:
/* Other cases not possible in this context. */