Merge cd95a5b into a548183

curl · Jul 8, 2017 · 889694c · 889694c
2 parents a548183 + cd95a5b
commit 889694c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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. "