[GNUnet-SVN] [gnurl] 128/208: tool_cb_wrt: fix variable shadowing warning

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to annotated tag gnurl-7.55.0
in repository gnurl.

commit f601f42787f583e033f2af1cd88ce785f6af08d1
Author: Marcel Raad <address@hidden>
AuthorDate: Sat Jul 8 11:43:51 2017 +0200

    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
---
 src/tool_cb_wrt.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/tool_cb_wrt.c b/src/tool_cb_wrt.c
index ea52469b0..6716ba5cd 100644
--- a/src/tool_cb_wrt.c
+++ b/src/tool_cb_wrt.c
@@ -78,7 +78,7 @@ size_t tool_write_cb(char *buffer, size_t sz, size_t nmemb, 
void *userdata)
   struct OutStruct *outs = userdata;
   struct OperationConfig *config = outs->config;
   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
@@ -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");
     if(tty) {
-      isatty = TRUE;
+      is_tty = TRUE;
       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))
     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? */
     if(memchr(buffer, 0, bytes)) {
       warnf(config->global, "Binary output can mess up your terminal. "

-- 
To stop receiving notification emails like this one, please contact
address@hidden