Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TLMSP curl
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CYBER - Cyber Security
TS 103 523 MSP
TLMSP
TLMSP curl
Commits
ec956b03
Commit
ec956b03
authored
18 years ago
by
Yang Tse
Browse files
Options
Downloads
Patches
Plain Diff
Explicit typecast for Curl_debug() size argument
parent
44ffe0dc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
lib/ftp.c
+7
-5
7 additions, 5 deletions
lib/ftp.c
lib/http.c
+6
-5
6 additions, 5 deletions
lib/http.c
lib/sendf.c
+4
-2
4 additions, 2 deletions
lib/sendf.c
lib/ssluse.c
+1
-1
1 addition, 1 deletion
lib/ssluse.c
lib/transfer.c
+7
-5
7 additions, 5 deletions
lib/transfer.c
with
25 additions
and
18 deletions
lib/ftp.c
+
7
−
5
View file @
ec956b03
...
...
@@ -341,7 +341,7 @@ static CURLcode ftp_readresp(curl_socket_t sockfd,
/* output debug output if that is requested */
if
(
data
->
set
.
verbose
)
Curl_debug
(
data
,
CURLINFO_HEADER_IN
,
ftpc
->
linestart_resp
,
perline
,
conn
);
ftpc
->
linestart_resp
,
(
size_t
)
perline
,
conn
);
/*
* We pass all response-lines to the callback function registered
...
...
@@ -573,7 +573,8 @@ CURLcode Curl_GetFTPResponse(ssize_t *nreadp, /* return number of bytes read */
/* output debug output if that is requested */
if
(
data
->
set
.
verbose
)
Curl_debug
(
data
,
CURLINFO_HEADER_IN
,
line_start
,
perline
,
conn
);
Curl_debug
(
data
,
CURLINFO_HEADER_IN
,
line_start
,
(
size_t
)
perline
,
conn
);
/*
* We pass all response-lines to the callback function registered
...
...
@@ -3432,8 +3433,8 @@ CURLcode Curl_nbftpsendf(struct connectdata *conn,
return
res
;
if
(
conn
->
data
->
set
.
verbose
)
Curl_debug
(
conn
->
data
,
CURLINFO_HEADER_OUT
,
sptr
,
bytes_written
,
conn
);
Curl_debug
(
conn
->
data
,
CURLINFO_HEADER_OUT
,
sptr
,
(
size_t
)
bytes_written
,
conn
);
if
(
bytes_written
!=
(
ssize_t
)
write_len
)
{
/* the whole chunk was not sent, store the rest of the data */
...
...
@@ -3490,7 +3491,8 @@ CURLcode Curl_ftpsendf(struct connectdata *conn,
break
;
if
(
conn
->
data
->
set
.
verbose
)
Curl_debug
(
conn
->
data
,
CURLINFO_HEADER_OUT
,
sptr
,
bytes_written
,
conn
);
Curl_debug
(
conn
->
data
,
CURLINFO_HEADER_OUT
,
sptr
,
(
size_t
)
bytes_written
,
conn
);
if
(
bytes_written
!=
(
ssize_t
)
write_len
)
{
write_len
-=
bytes_written
;
...
...
This diff is collapsed.
Click to expand it.
lib/http.c
+
6
−
5
View file @
ec956b03
...
...
@@ -901,10 +901,11 @@ CURLcode add_buffer_send(send_buffer *in,
if
(
conn
->
data
->
set
.
verbose
)
{
/* this data _may_ contain binary stuff */
Curl_debug
(
conn
->
data
,
CURLINFO_HEADER_OUT
,
ptr
,
amount
-
included_body_bytes
,
conn
);
(
size_t
)(
amount
-
included_body_bytes
)
,
conn
);
if
(
included_body_bytes
)
Curl_debug
(
conn
->
data
,
CURLINFO_DATA_OUT
,
ptr
+
amount
-
included_body_bytes
,
included_body_bytes
,
conn
);
Curl_debug
(
conn
->
data
,
CURLINFO_DATA_OUT
,
ptr
+
amount
-
included_body_bytes
,
(
size_t
)
included_body_bytes
,
conn
);
}
*
bytes_written
+=
amount
;
...
...
@@ -1257,8 +1258,8 @@ CURLcode Curl_proxyCONNECT(struct connectdata *conn,
/* output debug if that is requested */
if
(
data
->
set
.
verbose
)
Curl_debug
(
data
,
CURLINFO_HEADER_IN
,
line_start
,
perline
,
conn
);
Curl_debug
(
data
,
CURLINFO_HEADER_IN
,
line_start
,
(
size_t
)
perline
,
conn
);
/* send the header to the callback */
writetype
=
CLIENTWRITE_HEADER
;
...
...
This diff is collapsed.
Click to expand it.
lib/sendf.c
+
4
−
2
View file @
ec956b03
...
...
@@ -228,11 +228,13 @@ void Curl_infof(struct SessionHandle *data, const char *fmt, ...)
{
if
(
data
&&
data
->
set
.
verbose
)
{
va_list
ap
;
size_t
len
;
char
print_buffer
[
1024
+
1
];
va_start
(
ap
,
fmt
);
vsnprintf
(
print_buffer
,
1024
,
fmt
,
ap
);
va_end
(
ap
);
Curl_debug
(
data
,
CURLINFO_TEXT
,
print_buffer
,
strlen
(
print_buffer
),
NULL
);
len
=
strlen
(
print_buffer
);
Curl_debug
(
data
,
CURLINFO_TEXT
,
print_buffer
,
len
,
NULL
);
}
}
...
...
@@ -293,7 +295,7 @@ CURLcode Curl_sendf(curl_socket_t sockfd, struct connectdata *conn,
break
;
if
(
data
->
set
.
verbose
)
Curl_debug
(
data
,
CURLINFO_DATA_OUT
,
sptr
,
bytes_written
,
conn
);
Curl_debug
(
data
,
CURLINFO_DATA_OUT
,
sptr
,
(
size_t
)
bytes_written
,
conn
);
if
((
size_t
)
bytes_written
!=
write_len
)
{
/* if not all was written at once, we must advance the pointer, decrease
...
...
This diff is collapsed.
Click to expand it.
lib/ssluse.c
+
1
−
1
View file @
ec956b03
...
...
@@ -1151,7 +1151,7 @@ static void ssl_tls_trace(int direction, int ssl_ver, int content_type,
txt_len
=
snprintf
(
ssl_buf
,
sizeof
(
ssl_buf
),
"SSLv%c, %s%s (%d):
\n
"
,
ver
,
tls_rt_name
,
msg_name
,
msg_type
);
Curl_debug
(
data
,
CURLINFO_TEXT
,
ssl_buf
,
txt_len
,
NULL
);
Curl_debug
(
data
,
CURLINFO_TEXT
,
ssl_buf
,
(
size_t
)
txt_len
,
NULL
);
Curl_debug
(
data
,
(
direction
==
1
)
?
CURLINFO_SSL_DATA_OUT
:
CURLINFO_SSL_DATA_IN
,
(
char
*
)
buf
,
len
,
NULL
);
...
...
This diff is collapsed.
Click to expand it.
lib/transfer.c
+
7
−
5
View file @
ec956b03
...
...
@@ -992,7 +992,7 @@ CURLcode Curl_readwrite(struct connectdata *conn,
if
(
data
->
set
.
verbose
)
Curl_debug
(
data
,
CURLINFO_HEADER_IN
,
k
->
p
,
k
->
hbuflen
,
conn
);
k
->
p
,
(
size_t
)
k
->
hbuflen
,
conn
);
result
=
Curl_client_write
(
conn
,
writetype
,
k
->
p
,
k
->
hbuflen
);
if
(
result
)
...
...
@@ -1089,12 +1089,14 @@ CURLcode Curl_readwrite(struct connectdata *conn,
if
(
data
->
set
.
verbose
)
{
if
(
k
->
badheader
)
{
Curl_debug
(
data
,
CURLINFO_DATA_IN
,
data
->
state
.
headerbuff
,
k
->
hbuflen
,
conn
);
(
size_t
)
k
->
hbuflen
,
conn
);
if
(
k
->
badheader
==
HEADER_PARTHEADER
)
Curl_debug
(
data
,
CURLINFO_DATA_IN
,
k
->
str
,
nread
,
conn
);
Curl_debug
(
data
,
CURLINFO_DATA_IN
,
k
->
str
,
(
size_t
)
nread
,
conn
);
}
else
Curl_debug
(
data
,
CURLINFO_DATA_IN
,
k
->
str
,
nread
,
conn
);
Curl_debug
(
data
,
CURLINFO_DATA_IN
,
k
->
str
,
(
size_t
)
nread
,
conn
);
}
#ifndef CURL_DISABLE_HTTP
...
...
@@ -1354,7 +1356,7 @@ CURLcode Curl_readwrite(struct connectdata *conn,
if
(
data
->
set
.
verbose
)
/* show the data before we change the pointer upload_fromhere */
Curl_debug
(
data
,
CURLINFO_DATA_OUT
,
data
->
reqdata
.
upload_fromhere
,
bytes_written
,
conn
);
(
size_t
)
bytes_written
,
conn
);
if
(
data
->
reqdata
.
upload_present
!=
bytes_written
)
{
/* we only wrote a part of the buffer (if anything), deal with it! */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment