Convert tabs to spaces

src/buffer.c

@@ -333,8 +333,7 @@ write_buffer (int fd, struct buffer_s * buffptr)
         case ENOMEM:
           log_message (LOG_ERR,
                        "writebuff: write() error [NOBUFS/NOMEM] \"%s\" on "
-		       "file descriptor %d",
+                       "file descriptor %d", strerror (errno), fd);
-		       strerror (errno), fd);
           return 0;
         default:
           log_message (LOG_ERR,

src/child.c

@@ -238,8 +238,7 @@ child_main (struct child_s *ptr)
             {
               log_message (LOG_NOTICE,
                            "Child has reached MaxRequestsPerChild (%u). "
-			   "Killing child.",
+                           "Killing child.", ptr->connects);
-			   ptr->connects);
               break;
             }
         }
@@ -350,8 +349,7 @@ child_pool_create (void)
     {
       log_message (LOG_WARNING,
                    "Can not start more than \"MaxClients\" servers. "
-		   "Starting %u servers instead.",
+                   "Starting %u servers instead.", child_config.maxclients);
-		   child_config.maxclients);
       child_config.startservers = child_config.maxclients;
     }
 

src/reqs.c

@@ -146,8 +146,7 @@ retry:
     {
       log_message (LOG_ERR,
                    "read_request_line: Client (file descriptor: %d) "
-		   "closed socket before read.",
+                   "closed socket before read.", connptr->client_fd);
-		   connptr->client_fd);
 
       return -1;
     }
@@ -1156,8 +1155,7 @@ process_client_headers (struct conn_s *connptr, hashmap_t hashofheaders)
                                        "detail",
                                        "A network error occurred while "
                                        "trying to write data to the "
-				       "remote web server.",
+                                       "remote web server.", NULL);
-				       NULL);
                   goto PULL_CLIENT_DATA;
                 }
             }
@@ -1252,8 +1250,7 @@ retry:
                            "detail",
                            PACKAGE " "
                            "was unable to retrieve and process headers from "
-			   "the remote web server.",
+                           "the remote web server.", NULL);
-			   NULL);
       return -1;
     }
 
@@ -1541,8 +1538,7 @@ connect_to_upstream (struct conn_s *connptr, struct request_s *request)
                            "Unable to connect to upstream proxy",
                            "detail",
                            "A network error occurred while trying to "
-			   "connect to the upstream web proxy.",
+                           "connect to the upstream web proxy.", NULL);
-			   NULL);
       return -1;
     }
 
@@ -1633,8 +1629,7 @@ handle_connection (int fd)
       indicate_http_error (connptr, 403, "Access denied",
                            "detail",
                            "The administrator of this proxy has not configured "
-			   "it to service requests from your host.",
+                           "it to service requests from your host.", NULL);
-			   NULL);
       send_http_error_message (connptr);
       destroy_conn (connptr);
       return;
@@ -1646,8 +1641,7 @@ handle_connection (int fd)
       indicate_http_error (connptr, 408, "Timeout",
                            "detail",
                            "Server timeout waiting for the HTTP request "
-			   "from the client.",
+                           "from the client.", NULL);
-			   NULL);
       send_http_error_message (connptr);
       destroy_conn (connptr);
       return;
@@ -1719,8 +1713,7 @@ handle_connection (int fd)
 
       log_message (LOG_CONN,
                    "Established connection to host \"%s\" using "
-		   "file descriptor %d.",
+                   "file descriptor %d.", request->host, connptr->server_fd);
-		   request->host, connptr->server_fd);
 
       if (!connptr->connect_method)
         establish_http_connection (connptr, request);

src/reverse-proxy.c

@@ -52,8 +52,7 @@ reversepath_add (const char *path, const char *url)
     {
       log_message (LOG_WARNING,
                    "Skipping reverse proxy rule: path '%s' "
-		   "doesn't start with a /",
+                   "doesn't start with a /", path);
-		   path);
       return;
     }
 

src/transparent-proxy.c

@@ -113,8 +113,7 @@ do_transparent_proxy (struct conn_s *connptr, hashmap_t hashofheaders,
       indicate_http_error (connptr, 400, "Bad Request",
                            "detail",
                            "You tried to connect to the machine "
-			   "the proxy is running on",
+                           "the proxy is running on", "url", url, NULL);
-			   "url", url, NULL);
       return 0;
     }