moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

tool_cb_wrt: fix variable shadowing warning 

GCC 4.4 complains:
tool_cb_wrt.c:81: error: declaration of ‘isatty’ shadows a global
declaration
/usr/include/unistd.h:782: error: shadowed declaration is here

Fix this by renaming the variable.

Closes https://github.com/curl/curl/pull/1661
This commit is contained in:
Marcel Raad 2017-07-08 11:43:51 +02:00
parent a548183546
commit f601f42787
No known key found for this signature in database
GPG Key ID: 07ADACB610D796DA
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tool_cb_wrt.c
View File

@ -78,7 +78,7 @@ size_t tool_write_cb(char *buffer, size_t sz, size_t nmemb, void *userdata)
struct OutStruct *outs = userdata; struct OutStruct *outs = userdata;
struct OperationConfig *config = outs->config; struct OperationConfig *config = outs->config;
size_t bytes = sz * nmemb; size_t bytes = sz * nmemb;
bool isatty = config->global->isatty; bool is_tty = config->global->isatty;
/* /*
* Once that libcurl has called back tool_write_cb() the returned value * Once that libcurl has called back tool_write_cb() the returned value
@ -92,7 +92,7 @@ size_t tool_write_cb(char *buffer, size_t sz, size_t nmemb, void *userdata)
{ {
char *tty = curlx_getenv("CURL_ISATTY"); char *tty = curlx_getenv("CURL_ISATTY");
if(tty) { if(tty) {
isatty = TRUE; is_tty = TRUE;
curl_free(tty); curl_free(tty);
} }
} }
@ -144,7 +144,7 @@ size_t tool_write_cb(char *buffer, size_t sz, size_t nmemb, void *userdata)
if(!outs->stream && !tool_create_output_file(outs)) if(!outs->stream && !tool_create_output_file(outs))
return failure; return failure;
if(isatty && (outs->bytes < 2000) && !config->terminal_binary_ok) { if(is_tty && (outs->bytes < 2000) && !config->terminal_binary_ok) {
/* binary output to terminal? */ /* binary output to terminal? */
if(memchr(buffer, 0, bytes)) { if(memchr(buffer, 0, bytes)) {
warnf(config->global, "Binary output can mess up your terminal. " warnf(config->global, "Binary output can mess up your terminal. "