generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

checksrc: use space after comma

Browse Source
This commit is contained in:
Daniel Stenberg
2015-03-17 13:41:49 +01:00
parent a6b8fe2a5f
commit 9395999543
37 changed files with 171 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/amigaos.c
View File

@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms

32
lib/checksrc.pl
View File

@@ -155,6 +155,38 @@ sub scanfile {
} }
} }
# check for comma without space
if($l =~ /^(.*),[^ \n]/) {
my $pref=$1;
my $ign=0;
if($pref =~ / *\#/) {
# this is a #if, treat it differently
$ign=1;
}
elsif($pref =~ /\/\*/) {
# this is a comment
$ign=1;
}
elsif($pref =~ /[\"\']/) {
$ign = 1;
# There is a quote here, figure out whether the comma is
# within a string or '' or not.
if($pref =~ /\"/) {
# withing a string
}
elsif($pref =~ /\'$/) {
# a single letter
}
else {
$ign = 0;
}
}
if(!$ign) {
checkwarn($line, length($pref)+1, $file, $l,
"comma without following space");
}
}
# check for "} else" # check for "} else"
if($l =~ /^(.*)\} *else/) { if($l =~ /^(.*)\} *else/) {
checkwarn($line, length($1), $file, $l, "else after closing brace on same line"); checkwarn($line, length($1), $file, $l, "else after closing brace on same line");

2
lib/inet_ntop.h
View File

@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms

6
lib/krb5.c
View File

@@ -246,7 +246,8 @@ krb5_auth(void *app_data, struct connectdata *conn)
result = Curl_base64_encode(data, (char *)output_buffer.value, result = Curl_base64_encode(data, (char *)output_buffer.value,
output_buffer.length, &p, &base64_sz); output_buffer.length, &p, &base64_sz);
if(result) { if(result) {
Curl_infof(data,"base64-encoding: %s\n", curl_easy_strerror(result)); Curl_infof(data, "base64-encoding: %s\n",
curl_easy_strerror(result));
ret = AUTH_CONTINUE; ret = AUTH_CONTINUE;
break; break;
} }
@@ -278,7 +279,8 @@ krb5_auth(void *app_data, struct connectdata *conn)
(unsigned char **)&_gssresp.value, (unsigned char **)&_gssresp.value,
&_gssresp.length); &_gssresp.length);
if(result) { if(result) {
Curl_failf(data,"base64-decoding: %s", curl_easy_strerror(result)); Curl_failf(data, "base64-decoding: %s",
curl_easy_strerror(result));
ret = AUTH_CONTINUE; ret = AUTH_CONTINUE;
break; break;
} }

4
lib/memdebug.h
View File

@@ -130,8 +130,8 @@ CURL_EXTERN int curl_fclose(FILE *file, int line, const char *source);
#ifdef HAVE_GETNAMEINFO #ifdef HAVE_GETNAMEINFO
#undef getnameinfo #undef getnameinfo
#define getnameinfo(sa,salen,host,hostlen,serv,servlen,flags) \ #define getnameinfo(sa,salen,host,hostlen,serv,servlen,flags) \
curl_dogetnameinfo(sa,salen,host,hostlen,serv,servlen,flags, __LINE__, \ curl_dogetnameinfo(sa, salen, host, hostlen, serv, servlen, flags, \
__FILE__) __LINE__, __FILE__)
#endif /* HAVE_GETNAMEINFO */ #endif /* HAVE_GETNAMEINFO */
#ifdef HAVE_FREEADDRINFO #ifdef HAVE_FREEADDRINFO

2
lib/setup-vms.h
View File

@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms

2
lib/socks.c
View File

@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms

4
lib/socks_sspi.c
View File

@@ -104,8 +104,8 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
service_name = malloc(strlen(service) + strlen(conn->proxy.name) + 2); service_name = malloc(strlen(service) + strlen(conn->proxy.name) + 2);
if(!service_name) if(!service_name)
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
snprintf(service_name,strlen(service) +strlen(conn->proxy.name)+2,"%s/%s", snprintf(service_name, strlen(service) +strlen(conn->proxy.name)+2,
service,conn->proxy.name); "%s/%s", service, conn->proxy.name);
} }
input_desc.cBuffers = 1; input_desc.cBuffers = 1;

2
lib/splay.c
View File

@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1997 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1997 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms

2
lib/ssh.h
View File

@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms

2
lib/strdup.c
View File

@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms

12
lib/telnet.c
View File

@@ -1343,8 +1343,7 @@ static CURLcode telnet_do(struct connectdata *conn, bool *done)
/* Grab a pointer to WSACreateEvent */ /* Grab a pointer to WSACreateEvent */
create_event_func = GetProcAddress(wsock2, "WSACreateEvent"); create_event_func = GetProcAddress(wsock2, "WSACreateEvent");
if(create_event_func == NULL) { if(create_event_func == NULL) {
failf(data,"failed to find WSACreateEvent function (%d)", failf(data, "failed to find WSACreateEvent function (%d)", ERRNO);
ERRNO);
FreeLibrary(wsock2); FreeLibrary(wsock2);
return CURLE_FAILED_INIT; return CURLE_FAILED_INIT;
} }
@@ -1352,8 +1351,7 @@ static CURLcode telnet_do(struct connectdata *conn, bool *done)
/* And WSACloseEvent */ /* And WSACloseEvent */
close_event_func = GetProcAddress(wsock2, "WSACloseEvent"); close_event_func = GetProcAddress(wsock2, "WSACloseEvent");
if(close_event_func == NULL) { if(close_event_func == NULL) {
failf(data,"failed to find WSACloseEvent function (%d)", failf(data, "failed to find WSACloseEvent function (%d)", ERRNO);
ERRNO);
FreeLibrary(wsock2); FreeLibrary(wsock2);
return CURLE_FAILED_INIT; return CURLE_FAILED_INIT;
} }
@@ -1361,8 +1359,7 @@ static CURLcode telnet_do(struct connectdata *conn, bool *done)
/* And WSAEventSelect */ /* And WSAEventSelect */
event_select_func = GetProcAddress(wsock2, "WSAEventSelect"); event_select_func = GetProcAddress(wsock2, "WSAEventSelect");
if(event_select_func == NULL) { if(event_select_func == NULL) {
failf(data,"failed to find WSAEventSelect function (%d)", failf(data, "failed to find WSAEventSelect function (%d)", ERRNO);
ERRNO);
FreeLibrary(wsock2); FreeLibrary(wsock2);
return CURLE_FAILED_INIT; return CURLE_FAILED_INIT;
} }
@@ -1370,8 +1367,7 @@ static CURLcode telnet_do(struct connectdata *conn, bool *done)
/* And WSAEnumNetworkEvents */ /* And WSAEnumNetworkEvents */
enum_netevents_func = GetProcAddress(wsock2, "WSAEnumNetworkEvents"); enum_netevents_func = GetProcAddress(wsock2, "WSAEnumNetworkEvents");
if(enum_netevents_func == NULL) { if(enum_netevents_func == NULL) {
failf(data,"failed to find WSAEnumNetworkEvents function (%d)", failf(data, "failed to find WSAEnumNetworkEvents function (%d)", ERRNO);
ERRNO);
FreeLibrary(wsock2); FreeLibrary(wsock2);
return CURLE_FAILED_INIT; return CURLE_FAILED_INIT;
} }

3
lib/vtls/openssl.c
View File

@@ -1246,7 +1246,8 @@ static CURLcode verifyhost(struct connectdata *conn, X509 *server_cert)
UTF8 etc. */ UTF8 etc. */
if(i>=0) { if(i>=0) {
ASN1_STRING *tmp = X509_NAME_ENTRY_get_data(X509_NAME_get_entry(name,i)); ASN1_STRING *tmp =
X509_NAME_ENTRY_get_data(X509_NAME_get_entry(name, i));
/* In OpenSSL 0.9.7d and earlier, ASN1_STRING_to_UTF8 fails if the input /* In OpenSSL 0.9.7d and earlier, ASN1_STRING_to_UTF8 fails if the input
is already UTF-8 encoded. We check for this case and copy the raw is already UTF-8 encoded. We check for this case and copy the raw

2
src/tool_dirhie.c
View File

@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms

2
src/tool_homedir.c
View File

@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms

2
src/tool_strdup.c
View File

@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms