moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

build: fix gcc7 implicit fallthrough warnings

Browse Source 
Mark intended fallthroughs with /* FALLTHROUGH */ so that gcc will know
it's expected and won't warn on [-Wimplicit-fallthrough=].

Closes https://github.com/curl/curl/pull/1297
This commit is contained in:
Alexis La Goutte 2017-02-28 22:45:28 +01:00 committed by Jay Satiro
parent 6fc91f6d3a
commit cbff751e95
4 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/formdata.c
View File

@ -342,6 +342,7 @@ CURLFORMcode FormAdd(struct curl_httppost **httppost,
#else #else
current_form->flags |= HTTPPOST_PTRNAME; /* fall through */ current_form->flags |= HTTPPOST_PTRNAME; /* fall through */
#endif #endif
/* FALLTHROUGH */
case CURLFORM_COPYNAME: case CURLFORM_COPYNAME:
if(current_form->name) if(current_form->name)
return_value = CURL_FORMADD_OPTION_TWICE; return_value = CURL_FORMADD_OPTION_TWICE;

1
lib/ftp.c
View File

@ -3214,6 +3214,7 @@ static CURLcode ftp_done(struct connectdata *conn, CURLcode status,
/* until we cope better with prematurely ended requests, let them /* until we cope better with prematurely ended requests, let them
* fallback as if in complete failure */ * fallback as if in complete failure */
/* FALLTHROUGH */
default: /* by default, an error means the control connection is default: /* by default, an error means the control connection is
wedged and should not be used anymore */ wedged and should not be used anymore */
ftpc->ctl_valid = FALSE; ftpc->ctl_valid = FALSE;

1
lib/vtls/openssl.c
View File

@ -539,6 +539,7 @@ int cert_stuff(struct connectdata *conn,
if(!key_file) if(!key_file)
/* cert & key can only be in PEM case in the same file */ /* cert & key can only be in PEM case in the same file */
key_file=cert_file; key_file=cert_file;
/* FALLTHROUGH */
case SSL_FILETYPE_ASN1: case SSL_FILETYPE_ASN1:
if(SSL_CTX_use_PrivateKey_file(ctx, key_file, file_type) != 1) { if(SSL_CTX_use_PrivateKey_file(ctx, key_file, file_type) != 1) {
failf(data, "unable to set private key file: '%s' type %s", failf(data, "unable to set private key file: '%s' type %s",

1
src/tool_cb_dbg.c
View File

@ -185,6 +185,7 @@ int tool_debug_cb(CURL *handle, curl_infotype type,
switch(type) { switch(type) {
case CURLINFO_TEXT: case CURLINFO_TEXT:
fprintf(output, "%s== Info: %s", timebuf, data); fprintf(output, "%s== Info: %s", timebuf, data);
/* FALLTHROUGH */
default: /* in case a new one is introduced to shock us */ default: /* in case a new one is introduced to shock us */
return 0; return 0;