SourceFormat Enforcement

diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc
index a32ef2371ca5d2b040596efad48ba5e0d4fced5e..38a67382c7a6b6d8023c0b8b8dd9fb28f682012a 100644 (file)
--- a/src/HttpRequest.cc
+++ b/src/HttpRequest.cc
@@ -708,7 +708,8 @@ HttpRequest::canHandle1xx() const
 }
 
 ConnStateData *
-HttpRequest::pinnedConnection() {
+HttpRequest::pinnedConnection()
+{
     if (clientConnectionManager.valid() && clientConnectionManager->pinning.pinned)
         return clientConnectionManager.get();
     return NULL;

diff --git a/src/globals.h b/src/globals.h
index edab3da30d9a8e99b5464da368f9b997679d962b..44ad3edfdfa6687fa99f95e2a14f30c649f33b26 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -45,109 +45,109 @@
 #include "structs.h"
 
 
-    extern char *ConfigFile;   /* NULL */
-    extern char *IcpOpcodeStr[];
-    extern char tmp_error_buf[ERROR_BUF_SZ];
-    extern char ThisCache[RFC2181_MAXHOSTNAMELEN << 1];
-    extern char ThisCache2[RFC2181_MAXHOSTNAMELEN << 1];
-    extern char config_input_line[BUFSIZ];
-    extern const char *DefaultConfigFile;      /* DEFAULT_CONFIG_FILE */
-    extern const char *cfg_filename;   /* NULL */
-    extern const char *dash_str;       /* "-" */
-    extern const char *null_string;    /* "" */
-    extern const char *version_string; /* VERSION */
-    extern const char *appname_string; /* PACKAGE */
-    extern char const *visible_appname_string; /* NULL */
-    extern const char *fdTypeStr[];
-    extern const char *hier_strings[];
-    extern const char *memStatusStr[];
-    extern const char *pingStatusStr[];
-    extern const char *storeStatusStr[];
-    extern const char *swapStatusStr[];
-    class fde;
-    extern fde *fd_table;              /* NULL */
-    extern int Biggest_FD;             /* -1 */
-    extern int Number_FD;              /* 0 */
-    extern int Opening_FD;             /* 0 */
-    extern int NDnsServersAlloc;       /* 0 */
-    extern int RESERVED_FD;
-    extern int Squid_MaxFD;            /* SQUID_MAXFD */
-    extern int config_lineno;  /* 0 */
-    extern int do_mallinfo;            /* 0 */
-    extern int opt_reuseaddr;  /* 1 */
-    extern int neighbors_do_private_keys;      /* 1 */
-    extern int opt_catch_signals;      /* 1 */
-    extern int opt_foreground_rebuild; /* 0 */
-    extern char *opt_forwarded_for;    /* NULL */
-    extern int opt_reload_hit_only;    /* 0 */
+extern char *ConfigFile;       /* NULL */
+extern char *IcpOpcodeStr[];
+extern char tmp_error_buf[ERROR_BUF_SZ];
+extern char ThisCache[RFC2181_MAXHOSTNAMELEN << 1];
+extern char ThisCache2[RFC2181_MAXHOSTNAMELEN << 1];
+extern char config_input_line[BUFSIZ];
+extern const char *DefaultConfigFile;  /* DEFAULT_CONFIG_FILE */
+extern const char *cfg_filename;       /* NULL */
+extern const char *dash_str;   /* "-" */
+extern const char *null_string;        /* "" */
+extern const char *version_string;     /* VERSION */
+extern const char *appname_string;     /* PACKAGE */
+extern char const *visible_appname_string; /* NULL */
+extern const char *fdTypeStr[];
+extern const char *hier_strings[];
+extern const char *memStatusStr[];
+extern const char *pingStatusStr[];
+extern const char *storeStatusStr[];
+extern const char *swapStatusStr[];
+class fde;
+extern fde *fd_table;          /* NULL */
+extern int Biggest_FD;         /* -1 */
+extern int Number_FD;          /* 0 */
+extern int Opening_FD;         /* 0 */
+extern int NDnsServersAlloc;   /* 0 */
+extern int RESERVED_FD;
+extern int Squid_MaxFD;                /* SQUID_MAXFD */
+extern int config_lineno;      /* 0 */
+extern int do_mallinfo;                /* 0 */
+extern int opt_reuseaddr;      /* 1 */
+extern int neighbors_do_private_keys;  /* 1 */
+extern int opt_catch_signals;  /* 1 */
+extern int opt_foreground_rebuild;     /* 0 */
+extern char *opt_forwarded_for;        /* NULL */
+extern int opt_reload_hit_only;        /* 0 */
 
-    extern int opt_udp_hit_obj;        /* 0 */
-    extern int opt_create_swap_dirs;   /* 0 */
-    extern int opt_store_doublecheck;  /* 0 */
-    extern int syslog_enable;  /* 0 */
-    extern int DnsSocketA;             /* -1 */
-    extern int DnsSocketB;             /* -1 */
-    extern int n_disk_objects; /* 0 */
-    extern iostats IOStats;
+extern int opt_udp_hit_obj;    /* 0 */
+extern int opt_create_swap_dirs;       /* 0 */
+extern int opt_store_doublecheck;      /* 0 */
+extern int syslog_enable;      /* 0 */
+extern int DnsSocketA;         /* -1 */
+extern int DnsSocketB;         /* -1 */
+extern int n_disk_objects;     /* 0 */
+extern iostats IOStats;
 
-    extern struct acl_deny_info_list *DenyInfoList;    /* NULL */
+extern struct acl_deny_info_list *DenyInfoList;        /* NULL */
 
-    extern struct timeval squid_start;
-    extern int starting_up;    /* 1 */
-    extern int shutting_down;  /* 0 */
-    extern int reconfiguring;  /* 0 */
-    extern time_t hit_only_mode_until; /* 0 */
-    extern double request_failure_ratio;       /* 0.0 */
-    extern int store_hash_buckets;     /* 0 */
-    extern hash_table *store_table;    /* NULL */
-    extern int hot_obj_count;  /* 0 */
-    extern int CacheDigestHashFuncCount;       /* 4 */
-    extern CacheDigest *store_digest;  /* NULL */
-    extern const char *StoreDigestFileName;            /* "store_digest" */
-    extern const char *StoreDigestMimeStr;     /* "application/cache-digest" */
+extern struct timeval squid_start;
+extern int starting_up;        /* 1 */
+extern int shutting_down;      /* 0 */
+extern int reconfiguring;      /* 0 */
+extern time_t hit_only_mode_until;     /* 0 */
+extern double request_failure_ratio;   /* 0.0 */
+extern int store_hash_buckets; /* 0 */
+extern hash_table *store_table;        /* NULL */
+extern int hot_obj_count;      /* 0 */
+extern int CacheDigestHashFuncCount;   /* 4 */
+extern CacheDigest *store_digest;      /* NULL */
+extern const char *StoreDigestFileName;                /* "store_digest" */
+extern const char *StoreDigestMimeStr; /* "application/cache-digest" */
 
-    extern const char *MultipartMsgBoundaryStr;        /* "Unique-Squid-Separator" */
+extern const char *MultipartMsgBoundaryStr;    /* "Unique-Squid-Separator" */
 #if USE_HTTP_VIOLATIONS
-    extern int refresh_nocache_hack;   /* 0 */
+extern int refresh_nocache_hack;       /* 0 */
 #endif
 
-    extern int store_open_disk_fd;     /* 0 */
-    extern const char *SwapDirType[];
-    extern int store_swap_low; /* 0 */
-    extern int store_swap_high;        /* 0 */
-    extern size_t store_pages_max;     /* 0 */
-    extern int64_t store_maxobjsize;   /* -1 */
-    extern hash_table *proxy_auth_username_cache;      /* NULL */
-    extern int incoming_sockets_accepted;
+extern int store_open_disk_fd; /* 0 */
+extern const char *SwapDirType[];
+extern int store_swap_low;     /* 0 */
+extern int store_swap_high;    /* 0 */
+extern size_t store_pages_max; /* 0 */
+extern int64_t store_maxobjsize;       /* -1 */
+extern hash_table *proxy_auth_username_cache;  /* NULL */
+extern int incoming_sockets_accepted;
 #if _SQUID_MSWIN_
-    extern unsigned int WIN32_Socks_initialized;       /* 0 */
+extern unsigned int WIN32_Socks_initialized;   /* 0 */
 #endif
 #if _SQUID_WINDOWS_
-    extern unsigned int WIN32_OS_version;      /* 0 */
-    extern char *WIN32_OS_string;           /* NULL */
-    extern char *WIN32_Service_name;        /* NULL */
-    extern char *WIN32_Command_Line;        /* NULL */
-    extern char *WIN32_Service_Command_Line; /* NULL */
-    extern unsigned int WIN32_run_mode;     /* _WIN_SQUID_RUN_MODE_INTERACTIVE */
+extern unsigned int WIN32_OS_version;  /* 0 */
+extern char *WIN32_OS_string;           /* NULL */
+extern char *WIN32_Service_name;        /* NULL */
+extern char *WIN32_Command_Line;        /* NULL */
+extern char *WIN32_Service_Command_Line; /* NULL */
+extern unsigned int WIN32_run_mode;     /* _WIN_SQUID_RUN_MODE_INTERACTIVE */
 #endif
 #if HAVE_SBRK
-    extern void *sbrk_start;   /* 0 */
+extern void *sbrk_start;       /* 0 */
 #endif
 
-    extern int ssl_ex_index_server;    /* -1 */
-    extern int ssl_ctx_ex_index_dont_verify_domain; /* -1 */
-    extern int ssl_ex_index_cert_error_check;  /* -1 */
-    extern int ssl_ex_index_ssl_error_detail;      /* -1 */
-    extern int ssl_ex_index_ssl_peeked_cert;      /* -1 */
-    extern int ssl_ex_index_ssl_errors;   /* -1 */
+extern int ssl_ex_index_server;        /* -1 */
+extern int ssl_ctx_ex_index_dont_verify_domain; /* -1 */
+extern int ssl_ex_index_cert_error_check;      /* -1 */
+extern int ssl_ex_index_ssl_error_detail;      /* -1 */
+extern int ssl_ex_index_ssl_peeked_cert;      /* -1 */
+extern int ssl_ex_index_ssl_errors;   /* -1 */
 
-    extern const char *external_acl_message;      /* NULL */
-    extern int opt_send_signal;        /* -1 */
-    extern int opt_no_daemon; /* 0 */
-    extern int opt_parse_cfg_only; /* 0 */
+extern const char *external_acl_message;      /* NULL */
+extern int opt_send_signal;    /* -1 */
+extern int opt_no_daemon; /* 0 */
+extern int opt_parse_cfg_only; /* 0 */
 
 /// current Squid process number (e.g., 4).
 /// Zero for SMP-unaware code and in no-SMP mode.
-    extern int KidIdentifier; /* 0 */
+extern int KidIdentifier; /* 0 */
 
 #endif /* SQUID_GLOBALS_H */

diff --git a/tools/purge/purge.cc b/tools/purge/purge.cc
index adafc1681cfd0a0c078f2989523d20630d974cd2..4b767e16a6a3a4cdedfd4d90f9adda4820e631c6 100644 (file)
--- a/tools/purge/purge.cc
+++ b/tools/purge/purge.cc
@@ -118,7 +118,7 @@
 #endif
 
 #include <netinet/in.h>
-#include <netinet/tcp.h> 
+#include <netinet/tcp.h>
 #include <arpa/inet.h>
 #include <netdb.h>