mirror of
https://github.com/curl/curl.git
synced 2026-08-26 21:24:08 +03:00
code style: use spaces around equals signs
This commit is contained in:
Daniel Stenberg
parent
e155f38d1e
commit
6b84438d9a
144 changed files with 995 additions and 990 deletions
|
|
@ -96,7 +96,7 @@ char *Curl_checkheaders(const struct connectdata *conn,
|
|||
size_t thislen = strlen(thisheader);
|
||||
struct Curl_easy *data = conn->data;
|
||||
|
||||
for(head = data->set.headers;head; head=head->next) {
|
||||
for(head = data->set.headers; head; head = head->next) {
|
||||
if(strncasecompare(head->data, thisheader, thislen))
|
||||
return head->data;
|
||||
}
|
||||
|
|
@ -599,7 +599,7 @@ static CURLcode readwrite_data(struct Curl_easy *data,
|
|||
infof(data, "Ignoring the response-body\n");
|
||||
}
|
||||
if(data->state.resume_from && !k->content_range &&
|
||||
(data->set.httpreq==HTTPREQ_GET) &&
|
||||
(data->set.httpreq == HTTPREQ_GET) &&
|
||||
!k->ignorebody) {
|
||||
|
||||
if(k->size == data->state.resume_from) {
|
||||
|
|
@ -954,7 +954,7 @@ static CURLcode readwrite_upload(struct Curl_easy *data,
|
|||
/* this is a paused transfer */
|
||||
break;
|
||||
}
|
||||
if(nread<=0) {
|
||||
if(nread <= 0) {
|
||||
result = done_sending(conn, k);
|
||||
if(result)
|
||||
return result;
|
||||
|
|
@ -1094,7 +1094,7 @@ CURLcode Curl_readwrite(struct connectdata *conn,
|
|||
{
|
||||
struct SingleRequest *k = &data->req;
|
||||
CURLcode result;
|
||||
int didwhat=0;
|
||||
int didwhat = 0;
|
||||
|
||||
curl_socket_t fd_read;
|
||||
curl_socket_t fd_write;
|
||||
|
|
@ -1342,7 +1342,7 @@ CURLcode Curl_pretransfer(struct Curl_easy *data)
|
|||
if(result)
|
||||
return result;
|
||||
|
||||
data->set.followlocation=0; /* reset the location-follow counter */
|
||||
data->set.followlocation = 0; /* reset the location-follow counter */
|
||||
data->state.this_is_a_follow = FALSE; /* reset this */
|
||||
data->state.errorbuf = FALSE; /* no error has occurred */
|
||||
data->state.httpversion = 0; /* don't assume any particular server version */
|
||||
|
|
@ -1466,14 +1466,14 @@ static const char *find_host_sep(const char *url)
|
|||
static size_t strlen_url(const char *url, bool relative)
|
||||
{
|
||||
const unsigned char *ptr;
|
||||
size_t newlen=0;
|
||||
bool left=TRUE; /* left side of the ? */
|
||||
size_t newlen = 0;
|
||||
bool left = TRUE; /* left side of the ? */
|
||||
const unsigned char *host_sep = (const unsigned char *) url;
|
||||
|
||||
if(!relative)
|
||||
host_sep = (const unsigned char *) find_host_sep(url);
|
||||
|
||||
for(ptr=(unsigned char *)url; *ptr; ptr++) {
|
||||
for(ptr = (unsigned char *)url; *ptr; ptr++) {
|
||||
|
||||
if(ptr < host_sep) {
|
||||
++newlen;
|
||||
|
|
@ -1482,7 +1482,7 @@ static size_t strlen_url(const char *url, bool relative)
|
|||
|
||||
switch(*ptr) {
|
||||
case '?':
|
||||
left=FALSE;
|
||||
left = FALSE;
|
||||
/* fall through */
|
||||
default:
|
||||
if(*ptr >= 0x80)
|
||||
|
|
@ -1491,7 +1491,7 @@ static size_t strlen_url(const char *url, bool relative)
|
|||
break;
|
||||
case ' ':
|
||||
if(left)
|
||||
newlen+=3;
|
||||
newlen += 3;
|
||||
else
|
||||
newlen++;
|
||||
break;
|
||||
|
|
@ -1508,7 +1508,7 @@ static size_t strlen_url(const char *url, bool relative)
|
|||
static void strcpy_url(char *output, const char *url, bool relative)
|
||||
{
|
||||
/* we must add this with whitespace-replacing */
|
||||
bool left=TRUE;
|
||||
bool left = TRUE;
|
||||
const unsigned char *iptr;
|
||||
char *optr = output;
|
||||
const unsigned char *host_sep = (const unsigned char *) url;
|
||||
|
|
@ -1527,7 +1527,7 @@ static void strcpy_url(char *output, const char *url, bool relative)
|
|||
|
||||
switch(*iptr) {
|
||||
case '?':
|
||||
left=FALSE;
|
||||
left = FALSE;
|
||||
/* fall through */
|
||||
default:
|
||||
if(*iptr >= 0x80) {
|
||||
|
|
@ -1548,7 +1548,7 @@ static void strcpy_url(char *output, const char *url, bool relative)
|
|||
break;
|
||||
}
|
||||
}
|
||||
*optr=0; /* zero terminate output buffer */
|
||||
*optr = 0; /* zero terminate output buffer */
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -1587,26 +1587,26 @@ static char *concat_url(const char *base, const char *relurl)
|
|||
|
||||
/* we must make our own copy of the URL to play with, as it may
|
||||
point to read-only data */
|
||||
char *url_clone=strdup(base);
|
||||
char *url_clone = strdup(base);
|
||||
|
||||
if(!url_clone)
|
||||
return NULL; /* skip out of this NOW */
|
||||
|
||||
/* protsep points to the start of the host name */
|
||||
protsep=strstr(url_clone, "//");
|
||||
protsep = strstr(url_clone, "//");
|
||||
if(!protsep)
|
||||
protsep=url_clone;
|
||||
protsep = url_clone;
|
||||
else
|
||||
protsep+=2; /* pass the slashes */
|
||||
protsep += 2; /* pass the slashes */
|
||||
|
||||
if('/' != relurl[0]) {
|
||||
int level=0;
|
||||
int level = 0;
|
||||
|
||||
/* First we need to find out if there's a ?-letter in the URL,
|
||||
and cut it and the right-side of that off */
|
||||
pathsep = strchr(protsep, '?');
|
||||
if(pathsep)
|
||||
*pathsep=0;
|
||||
*pathsep = 0;
|
||||
|
||||
/* we have a relative path to append to the last slash if there's one
|
||||
available, or if the new URL is just a query string (starts with a
|
||||
|
|
@ -1615,7 +1615,7 @@ static char *concat_url(const char *base, const char *relurl)
|
|||
if(useurl[0] != '?') {
|
||||
pathsep = strrchr(protsep, '/');
|
||||
if(pathsep)
|
||||
*pathsep=0;
|
||||
*pathsep = 0;
|
||||
}
|
||||
|
||||
/* Check if there's any slash after the host name, and if so, remember
|
||||
|
|
@ -1630,13 +1630,13 @@ static char *concat_url(const char *base, const char *relurl)
|
|||
and act accordingly */
|
||||
|
||||
if((useurl[0] == '.') && (useurl[1] == '/'))
|
||||
useurl+=2; /* just skip the "./" */
|
||||
useurl += 2; /* just skip the "./" */
|
||||
|
||||
while((useurl[0] == '.') &&
|
||||
(useurl[1] == '.') &&
|
||||
(useurl[2] == '/')) {
|
||||
level++;
|
||||
useurl+=3; /* pass the "../" */
|
||||
useurl += 3; /* pass the "../" */
|
||||
}
|
||||
|
||||
if(protsep) {
|
||||
|
|
@ -1644,9 +1644,9 @@ static char *concat_url(const char *base, const char *relurl)
|
|||
/* cut off one more level from the right of the original URL */
|
||||
pathsep = strrchr(protsep, '/');
|
||||
if(pathsep)
|
||||
*pathsep=0;
|
||||
*pathsep = 0;
|
||||
else {
|
||||
*protsep=0;
|
||||
*protsep = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -1658,7 +1658,7 @@ static char *concat_url(const char *base, const char *relurl)
|
|||
if((relurl[0] == '/') && (relurl[1] == '/')) {
|
||||
/* the new URL starts with //, just keep the protocol part from the
|
||||
original one */
|
||||
*protsep=0;
|
||||
*protsep = 0;
|
||||
useurl = &relurl[2]; /* we keep the slashes from the original, so we
|
||||
skip the new ones */
|
||||
host_changed = TRUE;
|
||||
|
|
@ -1674,7 +1674,7 @@ static char *concat_url(const char *base, const char *relurl)
|
|||
char *sep = strchr(protsep, '?');
|
||||
if(sep && (sep < pathsep))
|
||||
pathsep = sep;
|
||||
*pathsep=0;
|
||||
*pathsep = 0;
|
||||
}
|
||||
else {
|
||||
/* There was no slash. Now, since we might be operating on a badly
|
||||
|
|
@ -1683,7 +1683,7 @@ static char *concat_url(const char *base, const char *relurl)
|
|||
?-letter as well! */
|
||||
pathsep = strchr(protsep, '?');
|
||||
if(pathsep)
|
||||
*pathsep=0;
|
||||
*pathsep = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue