From: squidadm@squid-cache.org <> Date: Wed, 8 Oct 2014 15:31:21 +0000 (+0000) Subject: SourceFormat Enforcement X-Git-Tag: SQUID_3_5_0_1~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=502bcc7;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/doc/debug-sections.txt b/doc/debug-sections.txt index 262ce5ad91..ae203a6ca8 100644 --- a/doc/debug-sections.txt +++ b/doc/debug-sections.txt @@ -1,12 +1,4 @@ -/* DEBUG: section 00 Hash Tables */ -/* DEBUG: section 81 CPU Profiling Routines */ -section -section -- CGI Cache Manager -section -- External DISKD process implementation. -section -- Refcount allocator -section -- Unlink Daemon -section -- WWW Client section 00 Announcement Server section 00 Client Database section 00 Debug Routines @@ -57,14 +49,14 @@ section 21 Time Functions section 22 Refresh Calculation section 23 URL Parsing section 23 URL Scheme parsing -section 25 MIME Parsing and Internal Icons section 25 MiME Header Parsing +section 25 MIME Parsing and Internal Icons section 26 Secure Sockets Layer Proxy section 27 Cache Announcer section 28 Access Control section 29 Authenticator -section 29 NTLM Authenticator section 29 Negotiate Authenticator +section 29 NTLM Authenticator section 30 Ident (RFC 931) section 31 Hypertext Caching Protocol section 32 Asynchronous Disk I/O @@ -86,8 +78,8 @@ section 46 Access Log section 46 Access Log - Apache combined format section 46 Access Log - Apache common format section 46 Access Log - Squid Custom format -section 46 Access Log - Squid ICAP Logging section 46 Access Log - Squid format +section 46 Access Log - Squid ICAP Logging section 46 Access Log - Squid referer format section 46 Access Log - Squid useragent format section 47 Store Directory Routines @@ -129,11 +121,10 @@ section 79 Disk IO Routines section 79 Squid-side DISKD I/O functions. section 79 Squid-side Disk I/O functions. section 79 Storage Manager UFS Interface -section 79 Disk IO Routines section 80 WCCP Support +section 81 aio_xxx() POSIX emulation on Windows section 81 CPU Profiling Routines section 81 Store HEAP Removal Policies -section 81 aio_xxx() POSIX emulation on Windows section 82 External ACL section 83 SSL accelerator support section 84 Helper process maintenance @@ -149,5 +140,8 @@ section 90 HTTP Cache Control Header section 90 Storage Manager Client-Side Interface section 92 Storage File System section 93 Adaptation -section 93 ICAP (RFC 3507) Client section 93 eCAP Interface +section 93 ICAP (RFC 3507) Client +section -- External DISKD process implementation. +section -- Refcount allocator +section -- Unlink Daemon diff --git a/doc/manuals/language.list b/doc/manuals/language.list index 9588f60bd8..4ea5684abb 100644 --- a/doc/manuals/language.list +++ b/doc/manuals/language.list @@ -2,8 +2,8 @@ TRANSLATE_LANGUAGES= \ ar.lang \ cs.lang \ de.lang \ - en.lang \ en_AU.lang \ + en.lang \ es.lang \ fr.lang \ it.lang \ diff --git a/icons/list b/icons/list index 0e1fdb86b9..989e452de0 100644 --- a/icons/list +++ b/icons/list @@ -14,8 +14,8 @@ ICONS= \ silk/database.png \ silk/database_table.png \ silk/drive_disk.png \ - silk/film.png \ silk/film_key.png \ + silk/film.png \ silk/folder.png \ silk/folder_table.png \ silk/image.png \ @@ -24,18 +24,18 @@ ICONS= \ silk/layout.png \ silk/link.png \ silk/music.png \ - silk/package.png \ silk/package_go.png \ + silk/package.png \ silk/page_code.png \ silk/page_excel.png \ silk/page_green.png \ - silk/page_white.png \ silk/page_white_acrobat.png \ - silk/page_white_c.png \ silk/page_white_cplusplus.png \ + silk/page_white_c.png \ silk/page_white_flash.png \ silk/page_white_magnify.png \ silk/page_white_picture.png \ + silk/page_white.png \ silk/page_white_powerpoint.png \ silk/page_white_stack.png \ silk/page_white_text.png \ @@ -44,8 +44,8 @@ ICONS= \ silk/page_world.png \ silk/photo.png \ silk/picture.png \ - silk/plugin.png \ silk/plugin_add.png \ - silk/script.png \ + silk/plugin.png \ silk/script_gear.png \ - silk/script_palette.png + silk/script_palette.png \ + silk/script.png diff --git a/lib/profiler/xprof_type.h b/lib/profiler/xprof_type.h index 11f37db2a0..da0e36f52c 100644 --- a/lib/profiler/xprof_type.h +++ b/lib/profiler/xprof_type.h @@ -3,79 +3,78 @@ /* AUTO-GENERATED FILE */ #if USE_XPROF_STATS typedef enum { - XPROF_PROF_UNACCOUNTED, - XPROF_ACL_matches, - XPROF_HttpHeaderClean, - XPROF_HttpHeaderParse, - XPROF_HttpHeader_getCc, - XPROF_HttpMsg_httpMsgParseStep, - XPROF_HttpParserParseReqLine, - XPROF_HttpServer_parseOneRequest, - XPROF_HttpStateData_processReplyBody, - XPROF_HttpStateData_processReplyHeader, - XPROF_HttpStateData_readReply, - XPROF_InvokeHandlers, - XPROF_MemBuf_append, - XPROF_MemBuf_consume, - XPROF_MemBuf_consumeWhitespace, - XPROF_MemBuf_grow, - XPROF_MemObject_write, - XPROF_PROF_OVERHEAD, - XPROF_SignalEngine_checkEvents, - XPROF_StoreEntry_write, - XPROF_StringAllocAndFill, - XPROF_StringAppend, - XPROF_StringClean, - XPROF_StringInitBuf, - XPROF_StringReset, - XPROF_aclCheckFast, - XPROF_calloc, - XPROF_clientSocketRecipient, - XPROF_commHandleWrite, - XPROF_comm_accept, - XPROF_comm_check_incoming, - XPROF_comm_close, - XPROF_comm_connect_addr, - XPROF_comm_handle_ready_fd, - XPROF_comm_open, - XPROF_comm_poll_normal, - XPROF_comm_poll_prep_pfds, - XPROF_comm_read_handler, - XPROF_comm_udp_sendto, - XPROF_comm_write_handler, - XPROF_diskHandleRead, - XPROF_diskHandleWrite, - XPROF_esiExpressionEval, - XPROF_esiParsing, - XPROF_esiProcessing, - XPROF_eventRun, - XPROF_file_close, - XPROF_file_open, - XPROF_file_read, - XPROF_file_write, - XPROF_free, - XPROF_free_const, - XPROF_hash_lookup, - XPROF_headersEnd, - XPROF_httpRequestFree, - XPROF_httpStart, - XPROF_malloc, - XPROF_mem_hdr_write, - XPROF_read, - XPROF_realloc, - XPROF_recv, - XPROF_send, - XPROF_storeClient_kickReads, - XPROF_storeDirCallback, - XPROF_storeGet, - XPROF_storeGetMemSpace, - XPROF_storeMaintainSwapSpace, - XPROF_storeRelease, - XPROF_write, - XPROF_xcalloc, - XPROF_xmalloc, - XPROF_xrealloc, - XPROF_LAST -} xprof_type; +XPROF_PROF_UNACCOUNTED, +XPROF_aclCheckFast, +XPROF_ACL_matches, +XPROF_calloc, +XPROF_clientSocketRecipient, +XPROF_comm_accept, +XPROF_comm_check_incoming, +XPROF_comm_close, +XPROF_comm_connect_addr, +XPROF_comm_handle_ready_fd, +XPROF_commHandleWrite, +XPROF_comm_open, +XPROF_comm_poll_normal, +XPROF_comm_poll_prep_pfds, +XPROF_comm_read_handler, +XPROF_comm_udp_sendto, +XPROF_comm_write_handler, +XPROF_diskHandleRead, +XPROF_diskHandleWrite, +XPROF_esiExpressionEval, +XPROF_esiParsing, +XPROF_esiProcessing, +XPROF_eventRun, +XPROF_file_close, +XPROF_file_open, +XPROF_file_read, +XPROF_file_write, +XPROF_free, +XPROF_free_const, +XPROF_hash_lookup, +XPROF_headersEnd, +XPROF_HttpHeaderClean, +XPROF_HttpHeader_getCc, +XPROF_HttpHeaderParse, +XPROF_HttpMsg_httpMsgParseStep, +XPROF_HttpParserParseReqLine, +XPROF_httpRequestFree, +XPROF_HttpServer_parseOneRequest, +XPROF_httpStart, +XPROF_HttpStateData_processReplyBody, +XPROF_HttpStateData_processReplyHeader, +XPROF_HttpStateData_readReply, +XPROF_InvokeHandlers, +XPROF_malloc, +XPROF_MemBuf_append, +XPROF_MemBuf_consume, +XPROF_MemBuf_consumeWhitespace, +XPROF_MemBuf_grow, +XPROF_mem_hdr_write, +XPROF_MemObject_write, +XPROF_PROF_OVERHEAD, +XPROF_read, +XPROF_realloc, +XPROF_recv, +XPROF_send, +XPROF_SignalEngine_checkEvents, +XPROF_storeClient_kickReads, +XPROF_storeDirCallback, +XPROF_StoreEntry_write, +XPROF_storeGet, +XPROF_storeGetMemSpace, +XPROF_storeMaintainSwapSpace, +XPROF_storeRelease, +XPROF_StringAllocAndFill, +XPROF_StringAppend, +XPROF_StringClean, +XPROF_StringInitBuf, +XPROF_StringReset, +XPROF_write, +XPROF_xcalloc, +XPROF_xmalloc, +XPROF_xrealloc, + XPROF_LAST } xprof_type; #endif #endif diff --git a/src/ssl/helper.cc b/src/ssl/helper.cc index 5e7ad5bf84..4d8df65ffe 100644 --- a/src/ssl/helper.cc +++ b/src/ssl/helper.cc @@ -7,8 +7,8 @@ */ #include "squid.h" -#include "anyp/PortCfg.h" #include "../helper.h" +#include "anyp/PortCfg.h" #include "helper/Reply.h" #include "SquidConfig.h" #include "SquidString.h" diff --git a/src/tests/Stub.list b/src/tests/Stub.list index 3a266a96e6..a49893f65b 100644 --- a/src/tests/Stub.list +++ b/src/tests/Stub.list @@ -1,50 +1,40 @@ STUB_SOURCE= tests/STUB.h \ - tests/stub_CacheDigest.cc \ - tests/stub_CollapsedForwarding.cc \ - tests/stub_CommIO.cc \ - tests/stub_DelayId.cc \ - tests/stub_DiskIOModule.cc \ - tests/stub_ETag.cc \ - tests/stub_EventLoop.cc \ - tests/stub_HelperChildConfig.cc \ - tests/stub_HttpReply.cc \ - tests/stub_HttpRequest.cc \ - tests/stub_MemBuf.cc \ - tests/stub_MemObject.cc \ - tests/stub_MemStore.cc \ - tests/stub_Port.cc \ - tests/stub_SBuf.cc \ - tests/stub_SBufDetailedStats.cc \ - tests/stub_StatHist.cc \ - tests/stub_StoreMeta.cc \ - tests/stub_SwapDir.cc \ - tests/stub_UdsOp.cc \ tests/stub_access_log.cc \ tests/stub_acl.cc \ tests/stub_cache_cf.cc \ + tests/stub_CacheDigest.cc \ tests/stub_cache_manager.cc \ tests/stub_carp.cc \ tests/stub_cbdata.cc \ tests/stub_client_db.cc \ tests/stub_client_side.cc \ tests/stub_client_side_request.cc \ + tests/stub_CollapsedForwarding.cc \ tests/stub_comm.cc \ + tests/stub_CommIO.cc \ tests/stub_debug.cc \ + tests/stub_DelayId.cc \ + tests/stub_DiskIOModule.cc \ tests/stub_errorpage.cc \ + tests/stub_ETag.cc \ tests/stub_event.cc \ + tests/stub_EventLoop.cc \ tests/stub_external_acl.cc \ tests/stub_fatal.cc \ tests/stub_fd.cc \ tests/stub_helper.cc \ + tests/stub_HelperChildConfig.cc \ tests/stub_http.cc \ + tests/stub_HttpReply.cc \ + tests/stub_HttpRequest.cc \ tests/stub_icp.cc \ tests/stub_internal.cc \ + tests/stub_ipcache.cc \ tests/stub_ipc.cc \ tests/stub_ipc_Forwarder.cc \ tests/stub_ipc_TypedMsgHdr.cc \ - tests/stub_ipcache.cc \ - tests/stub_libauth.cc \ tests/stub_libauth_acls.cc \ + tests/stub_libauth.cc \ tests/stub_libcomm.cc \ tests/stub_libeui.cc \ tests/stub_libformat.cc \ @@ -52,23 +42,33 @@ STUB_SOURCE= tests/STUB.h \ tests/stub_libmgr.cc \ tests/stub_libsslsquid.cc \ tests/stub_main_cc.cc \ + tests/stub_MemBuf.cc \ tests/stub_mem.cc \ tests/stub_mem_node.cc \ + tests/stub_MemObject.cc \ + tests/stub_MemStore.cc \ tests/stub_mime.cc \ tests/stub_neighbors.cc \ tests/stub_pconn.cc \ + tests/stub_Port.cc \ tests/stub_redirect.cc \ + tests/stub_SBuf.cc \ + tests/stub_SBufDetailedStats.cc \ tests/stub_stat.cc \ + tests/stub_StatHist.cc \ tests/stub_stmem.cc \ tests/stub_store.cc \ tests/stub_store_client.cc \ tests/stub_store_digest.cc \ + tests/stub_StoreMeta.cc \ tests/stub_store_rebuild.cc \ tests/stub_store_stats.cc \ tests/stub_store_swapout.cc \ + tests/stub_SwapDir.cc \ tests/stub_time.cc \ tests/stub_tools.cc \ tests/stub_tunnel.cc \ + tests/stub_UdsOp.cc \ tests/stub_wccp2.cc \ tests/stub_whois.cc \ tests/stub_wordlist.cc