From: Francesco Chemolli <5175948+kinkie@users.noreply.github.com> Date: Wed, 14 Feb 2024 13:50:07 +0000 (+0000) Subject: Maintenance: automate header guards 2/3 (#1674) X-Git-Tag: SQUID_6_8~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17434dc29453c7552b2ce682b9a7902c39207ab9;p=thirdparty%2Fsquid.git Maintenance: automate header guards 2/3 (#1674) * Maintenance: automate header guards 2/3 * Fix mistaken double guard --- diff --git a/compat/assert.h b/compat/assert.h index dddf33c627..68a4c3c109 100644 --- a/compat/assert.h +++ b/compat/assert.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ASSERT_H -#define SQUID_ASSERT_H +#ifndef SQUID_COMPAT_ASSERT_H +#define SQUID_COMPAT_ASSERT_H #if PURIFY #define assert(EX) ((void)0) @@ -24,5 +24,5 @@ extern void #endif xassert(const char *, const char *, int); -#endif /* SQUID_ASSERT_H */ +#endif /* SQUID_COMPAT_ASSERT_H */ diff --git a/compat/compat.h b/compat/compat.h index b0c41433bf..824fc990af 100644 --- a/compat/compat.h +++ b/compat/compat.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_COMPAT_H -#define _SQUID_COMPAT_H +#ifndef SQUID_COMPAT_COMPAT_H +#define SQUID_COMPAT_COMPAT_H /* * From discussions it was chosen to push compat code as far down as possible. @@ -106,5 +106,5 @@ /* Valgrind API macros changed between two versions squid supports */ #include "compat/valgrind.h" -#endif /* _SQUID_COMPAT_H */ +#endif /* SQUID_COMPAT_COMPAT_H */ diff --git a/compat/compat_shared.h b/compat/compat_shared.h index fec177ab16..81112e4dd2 100644 --- a/compat/compat_shared.h +++ b/compat/compat_shared.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_COMPAT_SHARED_H -#define _SQUID_COMPAT_SHARED_H +#ifndef SQUID_COMPAT_COMPAT_SHARED_H +#define SQUID_COMPAT_COMPAT_SHARED_H /* * This file contains all the compatibility and portability hacks @@ -254,5 +254,5 @@ const char * squid_strnstr(const char *s, const char *find, size_t slen); #define PRINTF_FORMAT_ARG3 #endif -#endif /* _SQUID_COMPAT_SHARED_H */ +#endif /* SQUID_COMPAT_COMPAT_SHARED_H */ diff --git a/compat/debug.h b/compat/debug.h index cbde48e071..241aba7628 100644 --- a/compat/debug.h +++ b/compat/debug.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef COMPAT_DEBUG_H -#define COMPAT_DEBUG_H +#ifndef SQUID_COMPAT_DEBUG_H +#define SQUID_COMPAT_DEBUG_H /* * A debug method for use of external helpers and tools. @@ -43,5 +43,5 @@ SQUIDCEXTERN int debug_enabled; void debug(const char *format,...); #endif -#endif /* COMPAT_DEBUG_H */ +#endif /* SQUID_COMPAT_DEBUG_H */ diff --git a/compat/fdsetsize.h b/compat/fdsetsize.h index 84858f276e..146cafd158 100644 --- a/compat/fdsetsize.h +++ b/compat/fdsetsize.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_FDSETSIZE_H -#define SQUID_FDSETSIZE_H +#ifndef SQUID_COMPAT_FDSETSIZE_H +#define SQUID_COMPAT_FDSETSIZE_H /**************************************************************************** *--------------------------------------------------------------------------* @@ -86,5 +86,5 @@ # endif #endif -#endif /* SQUID_FDSETSIZE_H */ +#endif /* SQUID_COMPAT_FDSETSIZE_H */ diff --git a/compat/getaddrinfo.h b/compat/getaddrinfo.h index 62e70994e7..e4acf33785 100644 --- a/compat/getaddrinfo.h +++ b/compat/getaddrinfo.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _getaddrinfo_h -#define _getaddrinfo_h +#ifndef SQUID_COMPAT_GETADDRINFO_H +#define SQUID_COMPAT_GETADDRINFO_H /* * Shamelessly duplicated from the fetchmail public sources @@ -81,5 +81,5 @@ SQUIDCEXTERN const char *xgai_strerror (int code); #endif #endif /* HAVE_DECL_GETADDRINFO */ -#endif /* _getaddrinfo_h */ +#endif /* SQUID_COMPAT_GETADDRINFO_H */ diff --git a/compat/getnameinfo.h b/compat/getnameinfo.h index cc1a23ba9d..256f28e9a2 100644 --- a/compat/getnameinfo.h +++ b/compat/getnameinfo.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _getnameinfo_h -#define _getnameinfo_h +#ifndef SQUID_COMPAT_GETNAMEINFO_H +#define SQUID_COMPAT_GETNAMEINFO_H #if !HAVE_DECL_GETNAMEINFO @@ -23,5 +23,5 @@ SQUIDCEXTERN int xgetnameinfo(const struct sockaddr *sa, #define getnameinfo xgetnameinfo #endif /* HAVE_DECL_GETNAMEINFO */ -#endif /* _getnameinfo_h */ +#endif /* SQUID_COMPAT_GETNAMEINFO_H */ diff --git a/compat/inet_ntop.h b/compat/inet_ntop.h index 3d9bf68d83..538ba5a9e6 100644 --- a/compat/inet_ntop.h +++ b/compat/inet_ntop.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _INC_INET_NTOP_H -#define _INC_INET_NTOP_H +#ifndef SQUID_COMPAT_INET_NTOP_H +#define SQUID_COMPAT_INET_NTOP_H /* Use the system provided version where possible */ #if !HAVE_DECL_INET_NTOP @@ -26,5 +26,5 @@ SQUIDCEXTERN const char * xinet_ntop(int af, const void *src, char *dst, size_t #endif #endif /* HAVE_DECL_INET_NTOP */ -#endif /* _INC_INET_NTOP_H */ +#endif /* SQUID_COMPAT_INET_NTOP_H */ diff --git a/compat/inet_pton.h b/compat/inet_pton.h index 4e4c020dc5..a31b1b8e64 100644 --- a/compat/inet_pton.h +++ b/compat/inet_pton.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _INC_INET_PTON_H -#define _INC_INET_PTON_H +#ifndef SQUID_COMPAT_INET_PTON_H +#define SQUID_COMPAT_INET_PTON_H /* Use the system provided version where possible */ #if !HAVE_DECL_INET_PTON @@ -29,5 +29,5 @@ SQUIDCEXTERN int xinet_pton(int af, const char *src, void *dst); #endif #endif /* HAVE_DECL_INET_PTON */ -#endif /* _INC_INET_NTOP_H */ +#endif /* SQUID_COMPAT_INET_PTON_H */ diff --git a/compat/initgroups.h b/compat/initgroups.h index 81217b915f..7962fb3b93 100644 --- a/compat/initgroups.h +++ b/compat/initgroups.h @@ -6,13 +6,13 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_INITGROUPS_H -#define SQUID_INITGROUPS_H +#ifndef SQUID_COMPAT_INITGROUPS_H +#define SQUID_COMPAT_INITGROUPS_H #if !HAVE_INITGROUPS SQUIDCEXTERN int initgroups(const char *user, gid_t group); #endif -#endif /* SQUID_INITGROPS_H */ +#endif /* SQUID_COMPAT_INITGROUPS_H */ diff --git a/compat/krb5.h b/compat/krb5.h index cd110521c7..fa88abe67d 100644 --- a/compat/krb5.h +++ b/compat/krb5.h @@ -46,4 +46,4 @@ extern "C" { # endif #endif /* HAVE_KRB5_H */ -#endif /* _SQUID__COMPAT_KRB5_H */ +#endif /* SQUID_COMPAT_KRB5_H */ diff --git a/compat/openssl.h b/compat/openssl.h index 2b445d8a73..f29d538557 100644 --- a/compat/openssl.h +++ b/compat/openssl.h @@ -16,8 +16,8 @@ * can be dropped. */ -#ifndef OPENSSL_COMPAT_H -#define OPENSSL_COMPAT_H +#ifndef SQUID_COMPAT_OPENSSL_H +#define SQUID_COMPAT_OPENSSL_H #if !USE_OPENSSL #error compat/openssl.h depends on USE_OPENSSL @@ -317,5 +317,5 @@ SQUID_OPENSSL_init_ssl(void) #endif } -#endif /* OPENSSL_COMPAT_H */ +#endif /* SQUID_COMPAT_OPENSSL_H */ diff --git a/compat/os/aix.h b/compat/os/aix.h index 6665ac1052..9ab5784b30 100644 --- a/compat/os/aix.h +++ b/compat/os/aix.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_OS_AIX_H -#define SQUID_OS_AIX_H +#ifndef SQUID_COMPAT_OS_AIX_H +#define SQUID_COMPAT_OS_AIX_H #if _SQUID_AIX_ @@ -26,5 +26,5 @@ #endif #endif /* _SQUID_AIX_ */ -#endif /* SQUID_OS_AIX_H */ +#endif /* SQUID_COMPAT_OS_AIX_H */ diff --git a/compat/os/android.h b/compat/os/android.h index f3b91d5126..700c197169 100644 --- a/compat/os/android.h +++ b/compat/os/android.h @@ -5,8 +5,8 @@ * contributions from numerous individuals and organizations. * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_OS_ANDROID_H -#define SQUID_OS_ANDROID_H +#ifndef SQUID_COMPAT_OS_ANDROID_H +#define SQUID_COMPAT_OS_ANDROID_H #if defined(__ANDROID__) /**************************************************************************** @@ -17,5 +17,5 @@ #define _SQUID_ANDROID_ 1 #endif /* _SQUID_ANDROID_ */ -#endif /* SQUID_OS_ANDROID_H */ +#endif /* SQUID_COMPAT_OS_ANDROID_H */ diff --git a/compat/os/dragonfly.h b/compat/os/dragonfly.h index 3b5f3c0f2f..8164ba19eb 100644 --- a/compat/os/dragonfly.h +++ b/compat/os/dragonfly.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_OS_DRAGONFLY_H -#define SQUID_OS_DRAGONFLY_H +#ifndef SQUID_COMPAT_OS_DRAGONFLY_H +#define SQUID_COMPAT_OS_DRAGONFLY_H #if _SQUID_DRAGONFLY_ @@ -25,5 +25,5 @@ #endif #endif /* _SQUID_DRAGONFLY_ */ -#endif /* SQUID_OS_DRAGONFLY_H */ +#endif /* SQUID_COMPAT_OS_DRAGONFLY_H */ diff --git a/compat/os/freebsd.h b/compat/os/freebsd.h index 0927cc13b8..709d85ff1a 100644 --- a/compat/os/freebsd.h +++ b/compat/os/freebsd.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_OS_FREEBSD_H -#define SQUID_OS_FREEBSD_H +#ifndef SQUID_COMPAT_OS_FREEBSD_H +#define SQUID_COMPAT_OS_FREEBSD_H #if _SQUID_FREEBSD_ @@ -40,5 +40,5 @@ #define s6_addr32 __u6_addr.__u6_addr32 #endif /* _SQUID_FREEBSD_ */ -#endif /* SQUID_OS_FREEBSD_H */ +#endif /* SQUID_COMPAT_OS_FREEBSD_H */ diff --git a/compat/os/hpux.h b/compat/os/hpux.h index 7326123c47..5f922955b2 100644 --- a/compat/os/hpux.h +++ b/compat/os/hpux.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_OS_HPUX_H -#define SQUID_OS_HPUX_H +#ifndef SQUID_COMPAT_OS_HPUX_H +#define SQUID_COMPAT_OS_HPUX_H #if _SQUID_HPUX_ @@ -39,5 +39,5 @@ #endif #endif /* _SQUID_HPUX_ */ -#endif /* SQUID_OS_HPUX_H */ +#endif /* SQUID_COMPAT_OS_HPUX_H */ diff --git a/compat/os/linux.h b/compat/os/linux.h index 8c9fdf5dfc..c3568a2b27 100644 --- a/compat/os/linux.h +++ b/compat/os/linux.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_OS_LINUX_H -#define SQUID_OS_LINUX_H +#ifndef SQUID_COMPAT_OS_LINUX_H +#define SQUID_COMPAT_OS_LINUX_H #if _SQUID_LINUX_ @@ -69,5 +69,5 @@ #endif #endif /* _SQUID_LINUX_ */ -#endif /* SQUID_OS_LINUX_H */ +#endif /* SQUID_COMPAT_OS_LINUX_H */ diff --git a/compat/os/macosx.h b/compat/os/macosx.h index 8514bc440e..0437b2dfbb 100644 --- a/compat/os/macosx.h +++ b/compat/os/macosx.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_OS_MACOSX_H -#define SQUID_OS_MACOSX_H +#ifndef SQUID_COMPAT_OS_MACOSX_H +#define SQUID_COMPAT_OS_MACOSX_H #if _SQUID_APPLE_ @@ -29,5 +29,5 @@ #include "compat/cmsg.h" #endif /* _SQUID_APPLE_ */ -#endif /* SQUID_OS_MACOSX_H */ +#endif /* SQUID_COMPAT_OS_MACOSX_H */ diff --git a/compat/os/mswindows.h b/compat/os/mswindows.h index 62978cee4e..af66bcca29 100644 --- a/compat/os/mswindows.h +++ b/compat/os/mswindows.h @@ -11,8 +11,8 @@ * AUTHOR: Guido Serassio */ -#ifndef SQUID_OS_MSWINDOWS_H -#define SQUID_OS_MSWINDOWS_H +#ifndef SQUID_COMPAT_OS_MSWINDOWS_H +#define SQUID_COMPAT_OS_MSWINDOWS_H #if _SQUID_WINDOWS_ @@ -1016,5 +1016,5 @@ void syslog(int priority, const char *fmt, ...); void WIN32_maperror(unsigned long WIN32_oserrno); #endif /* _SQUID_WINDOWS_ */ -#endif /* SQUID_OS_MSWINDOWS_H */ +#endif /* SQUID_COMPAT_OS_MSWINDOWS_H */ diff --git a/compat/os/netbsd.h b/compat/os/netbsd.h index 883b790214..94b75b9f29 100644 --- a/compat/os/netbsd.h +++ b/compat/os/netbsd.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_OS_NETBSD_H -#define SQUID_OS_NETBSD_H +#ifndef SQUID_COMPAT_OS_NETBSD_H +#define SQUID_COMPAT_OS_NETBSD_H #if _SQUID_NETBSD_ @@ -30,5 +30,5 @@ #define s6_addr32 __u6_addr.__u6_addr32 #endif /* _SQUID_NETBSD_ */ -#endif /* SQUID_OS_NETBSD_H */ +#endif /* SQUID_COMPAT_OS_NETBSD_H */ diff --git a/compat/os/openbsd.h b/compat/os/openbsd.h index d50b961207..66c3fc457e 100644 --- a/compat/os/openbsd.h +++ b/compat/os/openbsd.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_OS_OPENBSD_H -#define SQUID_OS_OPENBSD_H +#ifndef SQUID_COMPAT_OS_OPENBSD_H +#define SQUID_COMPAT_OS_OPENBSD_H #if _SQUID_OPENBSD_ @@ -47,5 +47,5 @@ #endif #endif /* _SQUID_OPENBSD_ */ -#endif /* SQUID_OS_OPENBSD_H */ +#endif /* SQUID_COMPAT_OS_OPENBSD_H */ diff --git a/compat/os/opensolaris_10_netdb.h b/compat/os/opensolaris_10_netdb.h index bbdf3c32b8..819033bc83 100644 --- a/compat/os/opensolaris_10_netdb.h +++ b/compat/os/opensolaris_10_netdb.h @@ -80,8 +80,8 @@ * returned in network order (suitable for use in system calls). */ -#ifndef _NETDB_H -#define _NETDB_H +#ifndef SQUID_COMPAT_OS_OPENSOLARIS_10_NETDB_H +#define SQUID_COMPAT_OS_OPENSOLARIS_10_NETDB_H #include #include @@ -484,5 +484,5 @@ extern int *__h_errno(); } #endif -#endif /* _NETDB_H */ +#endif /* SQUID_COMPAT_OS_OPENSOLARIS_10_NETDB_H */ diff --git a/compat/os/os2.h b/compat/os/os2.h index d62e355fee..afdfee3854 100644 --- a/compat/os/os2.h +++ b/compat/os/os2.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_OS_OS2_H -#define SQUID_OS_OS2_H +#ifndef SQUID_COMPAT_OS_OS2_H +#define SQUID_COMPAT_OS_OS2_H #if _SQUID_OS2_ @@ -24,5 +24,5 @@ */ #endif /* _SQUID_OS2_ */ -#endif /* SQUID_OS_OS2_H */ +#endif /* SQUID_COMPAT_OS_OS2_H */ diff --git a/compat/os/qnx.h b/compat/os/qnx.h index 1d877abb41..0888d9c4be 100644 --- a/compat/os/qnx.h +++ b/compat/os/qnx.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_OS_QNX_H -#define SQUID_OS_QNX_H +#ifndef SQUID_COMPAT_OS_QNX_H +#define SQUID_COMPAT_OS_QNX_H #if _SQUID_QNX_ @@ -23,5 +23,5 @@ #include #endif /* _SQUID_QNX_ */ -#endif /* SQUID_OS_QNX_H */ +#endif /* SQUID_COMPAT_OS_QNX_H */ diff --git a/compat/os/sgi.h b/compat/os/sgi.h index f1deccea8b..481b1997a9 100644 --- a/compat/os/sgi.h +++ b/compat/os/sgi.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_OS_SGI_H -#define SQUID_OS_SGI_H +#ifndef SQUID_COMPAT_OS_SGI_H +#define SQUID_COMPAT_OS_SGI_H #if _SQUID_SGI_ @@ -26,5 +26,5 @@ #endif /* USE_ASYNC_IO */ #endif /* _SQUID_SGI_ */ -#endif /* SQUID_OS_SGI_H */ +#endif /* SQUID_COMPAT_OS_SGI_H */ diff --git a/compat/os/solaris.h b/compat/os/solaris.h index c5c3b666a5..fe7d0b0115 100644 --- a/compat/os/solaris.h +++ b/compat/os/solaris.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_OS_SOLARIS_H -#define SQUID_OS_SOLARIS_H +#ifndef SQUID_COMPAT_OS_SOLARIS_H +#define SQUID_COMPAT_OS_SOLARIS_H #if _SQUID_SOLARIS_ @@ -104,5 +104,5 @@ SQUIDCEXTERN int gethostname(char *, int); #endif #endif /* _SQUID_SOLARIS_ */ -#endif /* SQUID_OS_SOALRIS_H */ +#endif /* SQUID_COMPAT_OS_SOLARIS_H */ diff --git a/compat/os/sunos.h b/compat/os/sunos.h index 8ab17d561f..e77e31039f 100644 --- a/compat/os/sunos.h +++ b/compat/os/sunos.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_OS_SUNOS_H -#define SQUID_OS_SUNOS_H +#ifndef SQUID_COMPAT_OS_SUNOS_H +#define SQUID_COMPAT_OS_SUNOS_H #if _SQUID_SUNOS_ @@ -28,5 +28,5 @@ #define SQUID_NONBLOCK O_NDELAY #endif /* _SQUID_SUNOS_ */ -#endif /* SQUID_OS_SUNOS_H */ +#endif /* SQUID_COMPAT_OS_SUNOS_H */ diff --git a/compat/psignal.h b/compat/psignal.h index ee2b44713d..2976f4cca0 100644 --- a/compat/psignal.h +++ b/compat/psignal.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef __SQUID_PSIGNAL_H -#define __SQUID_PSIGNAL_H +#ifndef SQUID_COMPAT_PSIGNAL_H +#define SQUID_COMPAT_PSIGNAL_H #if HAVE_SIGNAL_H #include @@ -15,5 +15,5 @@ extern void psignal(int sig, const char* msg); -#endif /* __SQUID_PSIGNAL_H */ +#endif /* SQUID_COMPAT_PSIGNAL_H */ diff --git a/compat/shm.h b/compat/shm.h index 6006dd95fa..39682d0a6f 100644 --- a/compat/shm.h +++ b/compat/shm.h @@ -50,5 +50,5 @@ extern "C" { /// Determines whether segment names are iterpreted as full file paths. bool shm_portable_segment_name_is_path(); -#endif /* SQUID_COMPAT_CPU_H */ +#endif /* SQUID_COMPAT_SHM_H */ diff --git a/compat/statvfs.h b/compat/statvfs.h index 48394e4e78..e03a26af96 100644 --- a/compat/statvfs.h +++ b/compat/statvfs.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_COMPAT_XSTATVFS_H -#define _SQUID_COMPAT_XSTATVFS_H +#ifndef SQUID_COMPAT_STATVFS_H +#define SQUID_COMPAT_STATVFS_H #if HAVE_SYS_STATVFS_H && HAVE_STATVFS #include @@ -61,5 +61,5 @@ int xstatvfs(const char *path, struct statvfs *buf); #endif -#endif /* _SQUID_COMPAT_XSTATVFS_H */ +#endif /* SQUID_COMPAT_STATVFS_H */ diff --git a/compat/stdio.h b/compat/stdio.h index c7ce69c599..0f37fd51a6 100644 --- a/compat/stdio.h +++ b/compat/stdio.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_COMPAT_STDIO_H -#define _SQUID_COMPAT_STDIO_H +#ifndef SQUID_COMPAT_STDIO_H +#define SQUID_COMPAT_STDIO_H /** 64-bit broken * @@ -62,5 +62,5 @@ inline FILE * tmpfile(void) { return tmpfile64(); } #define MAXPATHLEN SQUID_MAXPATHLEN #endif -#endif /* _SQUID_COMPAT_STDIO_H */ +#endif /* SQUID_COMPAT_STDIO_H */ diff --git a/compat/stdvarargs.h b/compat/stdvarargs.h index 1dec31b993..c4f7c5d609 100644 --- a/compat/stdvarargs.h +++ b/compat/stdvarargs.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_STDVARARGS_H -#define _SQUID_STDVARARGS_H +#ifndef SQUID_COMPAT_STDVARARGS_H +#define SQUID_COMPAT_STDVARARGS_H /* * va_* variables come from various places on different platforms. @@ -46,5 +46,5 @@ #include #endif -#endif /* _SQUID_STDVARARGS_H */ +#endif /* SQUID_COMPAT_STDVARARGS_H */ diff --git a/compat/strnrchr.h b/compat/strnrchr.h index 622fa3bda5..7e89d6b5f0 100644 --- a/compat/strnrchr.h +++ b/compat/strnrchr.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef COMPAT_STRNRCHR_H_ -#define COMPAT_STRNRCHR_H_ +#ifndef SQUID_COMPAT_STRNRCHR_H +#define SQUID_COMPAT_STRNRCHR_H #if HAVE_STDDEF_H #include @@ -21,5 +21,5 @@ */ SQUIDCEXTERN const char *strnrchr(const char *s, size_t count, int c); -#endif /* COMPAT_STRNRCHR_H_ */ +#endif /* SQUID_COMPAT_STRNRCHR_H */ diff --git a/compat/strtoll.h b/compat/strtoll.h index b8ea5e67dd..38f91ec697 100644 --- a/compat/strtoll.h +++ b/compat/strtoll.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_COMPAT_STRTOLL_H -#define _SQUID_COMPAT_STRTOLL_H +#ifndef SQUID_COMPAT_STRTOLL_H +#define SQUID_COMPAT_STRTOLL_H #if !HAVE_STRTOLL @@ -22,5 +22,5 @@ SQUIDCEXTERN int64_t strtoll(const char *nptr, char **endptr, int base); #endif /* !HAVE_STRTOLL */ -#endif /* _SQUID_COMPAT_STRTOLL_H */ +#endif /* SQUID_COMPAT_STRTOLL_H */ diff --git a/compat/tempnam.h b/compat/tempnam.h index f57c7f32e3..b56909527c 100644 --- a/compat/tempnam.h +++ b/compat/tempnam.h @@ -25,10 +25,10 @@ * Cambridge, MA 02139, USA. */ -#ifndef SQUID_TEMPNAM_H -#define SQUID_TEMPNAM_H +#ifndef SQUID_COMPAT_TEMPNAM_H +#define SQUID_COMPAT_TEMPNAM_H extern char *tempnam(const char *, const char *); -#endif /* SQUID_TEMPNAM_H */ +#endif /* SQUID_COMPAT_TEMPNAM_H */ diff --git a/compat/testPreCompiler.h b/compat/testPreCompiler.h index 400808cc48..0cc7873087 100644 --- a/compat/testPreCompiler.h +++ b/compat/testPreCompiler.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_COMPAT_TESTS_TESTPRECOMPILER_H -#define SQUID_COMPAT_TESTS_TESTPRECOMPILER_H +#ifndef SQUID_COMPAT_TESTPRECOMPILER_H +#define SQUID_COMPAT_TESTPRECOMPILER_H #include @@ -29,5 +29,5 @@ protected: void testIfDefOr(); }; -#endif /* SQUID_COMPAT_TESTS_TESTPRECOMPILER_H */ +#endif /* SQUID_COMPAT_TESTPRECOMPILER_H */ diff --git a/compat/types.h b/compat/types.h index 245b5fc048..a962668d4f 100644 --- a/compat/types.h +++ b/compat/types.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_TYPES_H -#define SQUID_TYPES_H +#ifndef SQUID_COMPAT_TYPES_H +#define SQUID_COMPAT_TYPES_H /* * Here are defined several known-width types, obtained via autoconf @@ -160,5 +160,5 @@ typedef long mtyp_t; #define NULL 0 #endif -#endif /* SQUID_TYPES_H */ +#endif /* SQUID_COMPAT_TYPES_H */ diff --git a/compat/valgrind.h b/compat/valgrind.h index 7c7710fa0e..f0032ec87f 100644 --- a/compat/valgrind.h +++ b/compat/valgrind.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_VALGRIND_H -#define SQUID_VALGRIND_H +#ifndef SQUID_COMPAT_VALGRIND_H +#define SQUID_COMPAT_VALGRIND_H /**************************************************************************** *--------------------------------------------------------------------------* @@ -42,5 +42,5 @@ # define RUNNING_ON_VALGRIND 0 #endif /* WITH_VALGRIND */ -#endif /* SQUID_CONFIG_H */ +#endif /* SQUID_COMPAT_VALGRIND_H */ diff --git a/compat/xalloc.h b/compat/xalloc.h index 0437a03c2d..da6d7646ff 100644 --- a/compat/xalloc.h +++ b/compat/xalloc.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_COMPAT_XALLOC_H -#define _SQUID_COMPAT_XALLOC_H +#ifndef SQUID_COMPAT_XALLOC_H +#define SQUID_COMPAT_XALLOC_H #ifdef __cplusplus extern "C" { @@ -80,5 +80,5 @@ static inline void xfree(const void *p) { if (p) free_const(p); } extern void malloc_statistics(void (*func) (int, int, int, void *), void *data); #endif -#endif /* _SQUID_COMPAT_XALLOC_H */ +#endif /* SQUID_COMPAT_XALLOC_H */ diff --git a/compat/xis.h b/compat/xis.h index 419272777b..d8e2e13f63 100644 --- a/compat/xis.h +++ b/compat/xis.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_COMPAT_XIS_H -#define _SQUID_COMPAT_XIS_H +#ifndef SQUID_COMPAT_XIS_H +#define SQUID_COMPAT_XIS_H #if HAVE_CTYPE_H #include @@ -46,5 +46,5 @@ #define xisgraph(x) isgraph((unsigned char)x) #endif -#endif /* _SQUID_COMPAT_XIS_H */ +#endif /* SQUID_COMPAT_XIS_H */ diff --git a/compat/xstrerror.h b/compat/xstrerror.h index 66736c4369..928d8a731d 100644 --- a/compat/xstrerror.h +++ b/compat/xstrerror.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_COMPAT_XSTRERROR_H -#define _SQUID_COMPAT_XSTRERROR_H +#ifndef SQUID_COMPAT_XSTRERROR_H +#define SQUID_COMPAT_XSTRERROR_H #if HAVE_ERRNO_H #include @@ -20,5 +20,5 @@ */ extern const char * xstrerr(int error); -#endif /* _SQUID_COMPAT_XSTRERROR_H */ +#endif /* SQUID_COMPAT_XSTRERROR_H */ diff --git a/compat/xstrto.h b/compat/xstrto.h index 105b4a3cfa..a849343bc5 100644 --- a/compat/xstrto.h +++ b/compat/xstrto.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_XSTRTO_H -#define _SQUID_XSTRTO_H +#ifndef SQUID_COMPAT_XSTRTO_H +#define SQUID_COMPAT_XSTRTO_H // this function is not used by the remaining Squid C code #if defined(__cplusplus) @@ -32,5 +32,5 @@ bool xstrtoui(const char *s, char **end, unsigned int *value, unsigned int min, unsigned int max); #endif /* __cplusplus */ -#endif /* _SQUID_XSTRTO_H */ +#endif /* SQUID_COMPAT_XSTRTO_H */ diff --git a/include/asn1.h b/include/asn1.h index 48d5b7367f..557657355c 100644 --- a/include/asn1.h +++ b/include/asn1.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SNMP_ASN1_H -#define SQUID_SNMP_ASN1_H +#ifndef SQUID_INCLUDE_ASN1_H +#define SQUID_INCLUDE_ASN1_H /* * Definitions for Abstract Syntax Notation One, ASN.1 @@ -100,5 +100,5 @@ u_char *asn_build_exception(u_char *, int *, u_char); #endif -#endif /* SQUID_SNMP_ASN1_H */ +#endif /* SQUID_INCLUDE_ASN1_H */ diff --git a/include/base64.h b/include/base64.h index 6b7672f63d..182ef324d1 100644 --- a/include/base64.h +++ b/include/base64.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_BASE64_H -#define _SQUID_BASE64_H +#ifndef SQUID_INCLUDE_BASE64_H +#define SQUID_INCLUDE_BASE64_H #if HAVE_NETTLE_BASE64_H && HAVE_NETTLE34_BASE64 #include @@ -168,5 +168,5 @@ base64_decode_final(struct base64_decode_ctx *ctx); /// a string of length 'decodedLen' including all terminator bytes. # define base64_encode_len(length) (BASE64_ENCODE_LENGTH(length)+BASE64_ENCODE_FINAL_LENGTH+1) -#endif /* _SQUID_BASE64_H */ +#endif /* SQUID_INCLUDE_BASE64_H */ diff --git a/include/cache_snmp.h b/include/cache_snmp.h index cfb6293484..087d921968 100644 --- a/include/cache_snmp.h +++ b/include/cache_snmp.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_CACHE_SNMP_H -#define SQUID_CACHE_SNMP_H +#ifndef SQUID_INCLUDE_CACHE_SNMP_H +#define SQUID_INCLUDE_CACHE_SNMP_H #if SQUID_SNMP @@ -269,5 +269,5 @@ enum { #endif /* SQUID_SNMP */ -#endif /* SQUID_CACHE_SNMP_H */ +#endif /* SQUID_INCLUDE_CACHE_SNMP_H */ diff --git a/include/getfullhostname.h b/include/getfullhostname.h index ca360d04a0..f015821ad0 100644 --- a/include/getfullhostname.h +++ b/include/getfullhostname.h @@ -6,10 +6,10 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_GETFULLHOSTNAME_H -#define _SQUID_GETFULLHOSTNAME_H +#ifndef SQUID_INCLUDE_GETFULLHOSTNAME_H +#define SQUID_INCLUDE_GETFULLHOSTNAME_H SQUIDCEXTERN const char *getfullhostname(void); -#endif /* _SQUID_GETFULLHOSTNAME_H */ +#endif /* SQUID_INCLUDE_GETFULLHOSTNAME_H */ diff --git a/include/hash.h b/include/hash.h index 077dbb29bf..c1257127ad 100644 --- a/include/hash.h +++ b/include/hash.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_HASH_H -#define SQUID_HASH_H +#ifndef SQUID_INCLUDE_HASH_H +#define SQUID_INCLUDE_HASH_H typedef void HASHFREE(void *); typedef int HASHCMP(const void *, const void *); @@ -65,5 +65,5 @@ SQUIDCEXTERN const char *hashKeyStr(const hash_link *); */ #define DEFAULT_HASH_SIZE 7951 /* prime number < 8192 */ -#endif /* SQUID_HASH_H */ +#endif /* SQUID_INCLUDE_HASH_H */ diff --git a/include/heap.h b/include/heap.h index 5e9bd065a1..1e439c0ead 100644 --- a/include/heap.h +++ b/include/heap.h @@ -19,8 +19,8 @@ * the top of the heap (as in the smallest object key value). Child nodes * are larger than their parent. ****************************************************************************/ -#ifndef SQUID_HEAP_H -#define SQUID_HEAP_H +#ifndef SQUID_INCLUDE_HEAP_H +#define SQUID_INCLUDE_HEAP_H /* * Function for generating heap keys. The first argument will typically be @@ -150,5 +150,5 @@ SQUIDCEXTERN void heap_printnode(char *msg, heap_node * elm); SQUIDCEXTERN int verify_heap_property(heap *); -#endif /* SQUID_HEAP_H */ +#endif /* SQUID_INCLUDE_HEAP_H */ diff --git a/include/html_quote.h b/include/html_quote.h index 13b8b6841a..129d2a7718 100644 --- a/include/html_quote.h +++ b/include/html_quote.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_HTML_QUOTE_H -#define _SQUID_HTML_QUOTE_H +#ifndef SQUID_INCLUDE_HTML_QUOTE_H +#define SQUID_INCLUDE_HTML_QUOTE_H #ifdef __cplusplus extern "C" @@ -17,5 +17,5 @@ extern char *html_quote(const char *); -#endif /* _SQUID_HTML_QUOTE_H */ +#endif /* SQUID_INCLUDE_HTML_QUOTE_H */ diff --git a/include/md5.h b/include/md5.h index 7240c192c6..9249fea619 100644 --- a/include/md5.h +++ b/include/md5.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_MD5_H -#define SQUID_MD5_H +#ifndef SQUID_INCLUDE_MD5_H +#define SQUID_INCLUDE_MD5_H #if HAVE_NETTLE_MD5_H #include @@ -67,5 +67,5 @@ SQUIDCEXTERN void SquidMD5Transform(uint32_t buf[4], uint32_t const in[16]); #endif /* HAVE_NETTLE_MD5_H */ -#endif /* SQUID_MD5_H */ +#endif /* SQUID_INCLUDE_MD5_H */ diff --git a/include/parse.h b/include/parse.h index 3a3c7c1950..47bfc7a01d 100644 --- a/include/parse.h +++ b/include/parse.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_PARSE_H -#define SQUID_PARSE_H +#ifndef SQUID_INCLUDE_PARSE_H +#define SQUID_INCLUDE_PARSE_H /*********************************************************** Copyright 1989 by Carnegie Mellon University @@ -96,5 +96,5 @@ struct snmp_mib_tree *read_mib(char *); #endif -#endif /* SQUID_PARSE_H */ +#endif /* SQUID_INCLUDE_PARSE_H */ diff --git a/include/radix.h b/include/radix.h index 2e3ad436bb..bd16fecbbe 100644 --- a/include/radix.h +++ b/include/radix.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_RADIX_H -#define SQUID_RADIX_H +#ifndef SQUID_INCLUDE_RADIX_H +#define SQUID_INCLUDE_RADIX_H /* * Copyright (c) 1988, 1989, 1993 @@ -159,5 +159,5 @@ SQUIDCEXTERN struct squid_radix_node *squid_rn_search_m(void *, struct squid_rad SQUIDCEXTERN struct squid_radix_node *squid_rn_lookup(void *, void *, struct squid_radix_node_head *); -#endif /* SQUID_RADIX_H */ +#endif /* SQUID_INCLUDE_RADIX_H */ diff --git a/include/rfc1738.h b/include/rfc1738.h index 6244dc4b7f..398d7aacea 100644 --- a/include/rfc1738.h +++ b/include/rfc1738.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_INCLUDE_RFC1738_H -#define _SQUID_INCLUDE_RFC1738_H +#ifndef SQUID_INCLUDE_RFC1738_H +#define SQUID_INCLUDE_RFC1738_H #ifdef __cplusplus extern "C" { @@ -67,5 +67,5 @@ extern void rfc1738_unescape(char *url); #ifdef __cplusplus } #endif -#endif /* _SQUID_INCLUDE_RFC1738_H */ +#endif /* SQUID_INCLUDE_RFC1738_H */ diff --git a/include/rfc2181.h b/include/rfc2181.h index ee94e071aa..093c7acedd 100644 --- a/include/rfc2181.h +++ b/include/rfc2181.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_INCLUDE_RFC1123_H -#define _SQUID_INCLUDE_RFC1123_H +#ifndef SQUID_INCLUDE_RFC2181_H +#define SQUID_INCLUDE_RFC2181_H /** \par RFC 2181 section 11: @@ -29,5 +29,5 @@ /** Back-port macro for old squid code still using SQUIDHOSTNAMELEN without RFC reference. */ #define SQUIDHOSTNAMELEN RFC2181_MAXHOSTNAMELEN -#endif /* _SQUID_INCLUDE_RFC1123_H */ +#endif /* SQUID_INCLUDE_RFC2181_H */ diff --git a/include/rfc2617.h b/include/rfc2617.h index 4322146522..8996f64356 100644 --- a/include/rfc2617.h +++ b/include/rfc2617.h @@ -20,8 +20,8 @@ * to prevent squid knowing the users password (idea suggested in RFC 2617). */ -#ifndef SQUID_RFC2617_H -#define SQUID_RFC2617_H +#ifndef SQUID_INCLUDE_RFC2617_H +#define SQUID_INCLUDE_RFC2617_H #ifdef __cplusplus extern "C" { @@ -64,5 +64,5 @@ extern void CvtBin(const HASHHEX Hex, HASH Bin); #ifdef __cplusplus } #endif -#endif /* SQUID_RFC2617_H */ +#endif /* SQUID_INCLUDE_RFC2617_H */ diff --git a/include/snmp-internal.h b/include/snmp-internal.h index 62af87c50a..4bb858828e 100644 --- a/include/snmp-internal.h +++ b/include/snmp-internal.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SNMP_INTERNAL_H -#define SQUID_SNMP_INTERNAL_H +#ifndef SQUID_INCLUDE_SNMP_INTERNAL_H +#define SQUID_INCLUDE_SNMP_INTERNAL_H /********************************************************************** * @@ -37,5 +37,5 @@ #define SNMP_TRAP_PORT 162 #define SNMP_MAX_LEN 484 -#endif /* SQUID_SNMP_INTERNAL_H */ +#endif /* SQUID_INCLUDE_SNMP_INTERNAL_H */ diff --git a/include/snmp-mib.h b/include/snmp-mib.h index fa1ebae292..156daa3b4d 100644 --- a/include/snmp-mib.h +++ b/include/snmp-mib.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SNMP_MIB_H -#define SQUID_SNMP_MIB_H +#ifndef SQUID_INCLUDE_SNMP_MIB_H +#define SQUID_INCLUDE_SNMP_MIB_H /*************************************************************************** * @@ -38,5 +38,5 @@ #include /* Need OID Definition */ #include /* Need variable_list */ -#endif /* SQUID_SNMP_MIB_H */ +#endif /* SQUID_INCLUDE_SNMP_MIB_H */ diff --git a/include/snmp.h b/include/snmp.h index d057d468d4..cd7c1a517d 100644 --- a/include/snmp.h +++ b/include/snmp.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SNMP_H -#define SQUID_SNMP_H +#ifndef SQUID_INCLUDE_SNMP_H +#define SQUID_INCLUDE_SNMP_H /* * Definitions for the Simple Network Management Protocol (RFC 1067). @@ -67,5 +67,5 @@ #include "snmp_debug.h" #include "snmp_impl.h" -#endif /* SQUID_SNMP_H */ +#endif /* SQUID_INCLUDE_SNMP_H */ diff --git a/include/snmp_api.h b/include/snmp_api.h index e4ac359f19..d5df62d2d7 100644 --- a/include/snmp_api.h +++ b/include/snmp_api.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SNMP_API_H -#define SQUID_SNMP_API_H +#ifndef SQUID_INCLUDE_SNMP_API_H +#define SQUID_INCLUDE_SNMP_API_H /*********************************************************** Copyright 1989 by Carnegie Mellon University @@ -68,5 +68,5 @@ int snmp_build(struct snmp_session *, struct snmp_pdu *, u_char *, int *); #endif -#endif /* SQUID_SNMP_API_H */ +#endif /* SQUID_INCLUDE_SNMP_API_H */ diff --git a/include/snmp_api_error.h b/include/snmp_api_error.h index f49aca4385..9c89599038 100644 --- a/include/snmp_api_error.h +++ b/include/snmp_api_error.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SNMP_API_ERROR_H -#define SQUID_SNMP_API_ERROR_H +#ifndef SQUID_INCLUDE_SNMP_API_ERROR_H +#define SQUID_INCLUDE_SNMP_API_ERROR_H /*************************************************************************** * @@ -73,5 +73,5 @@ void snmp_set_api_error(int); #endif -#endif /* SQUID_SNMP_API_ERROR_H */ +#endif /* SQUID_INCLUDE_SNMP_API_ERROR_H */ diff --git a/include/snmp_api_util.h b/include/snmp_api_util.h index 285076dc79..6a81a15816 100644 --- a/include/snmp_api_util.h +++ b/include/snmp_api_util.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SNMP_API_UTIL_H -#define SQUID_SNMP_API_UTIL_H +#ifndef SQUID_INCLUDE_SNMP_API_UTIL_H +#define SQUID_INCLUDE_SNMP_API_UTIL_H /* NP: required for typedef ipaddr */ #include "snmp_pdu.h" @@ -102,5 +102,5 @@ int snmp_timeout_session(struct snmp_session *sp_); #endif -#endif /* SQUID_SNMP_API_UTIL_H */ +#endif /* SQUID_INCLUDE_SNMP_API_UTIL_H */ diff --git a/include/snmp_client.h b/include/snmp_client.h index 75557d92cf..22623a6484 100644 --- a/include/snmp_client.h +++ b/include/snmp_client.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SNMP_CLIENT_H -#define SQUID_SNMP_CLIENT_H +#ifndef SQUID_INCLUDE_SNMP_CLIENT_H +#define SQUID_INCLUDE_SNMP_CLIENT_H /*********************************************************** Copyright 1988, 1989 by Carnegie Mellon University @@ -62,5 +62,5 @@ void snmp_synch_setup(struct snmp_session *); } #endif -#endif /* SQUID_SNMP_CLIENT_H */ +#endif /* SQUID_INCLUDE_SNMP_CLIENT_H */ diff --git a/include/snmp_coexist.h b/include/snmp_coexist.h index ddee55fa97..43c8f7860b 100644 --- a/include/snmp_coexist.h +++ b/include/snmp_coexist.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SNMP_COEXISTANCE_H -#define SQUID_SNMP_COEXISTANCE_H +#ifndef SQUID_INCLUDE_SNMP_COEXIST_H +#define SQUID_INCLUDE_SNMP_COEXIST_H /********************************************************************** * @@ -46,5 +46,5 @@ int snmp_coexist_V1toV2(struct snmp_pdu *); } #endif -#endif /* SQUID_SNMP_COEXISTANCE_H */ +#endif /* SQUID_INCLUDE_SNMP_COEXIST_H */ diff --git a/include/snmp_debug.h b/include/snmp_debug.h index 5590b1be5f..6fb5aef290 100644 --- a/include/snmp_debug.h +++ b/include/snmp_debug.h @@ -6,10 +6,10 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SNMP_DEBUG_H -#define SQUID_SNMP_DEBUG_H +#ifndef SQUID_INCLUDE_SNMP_DEBUG_H +#define SQUID_INCLUDE_SNMP_DEBUG_H SQUIDCEXTERN void snmplib_debug(int, const char *,...) PRINTF_FORMAT_ARG2; -#endif /* SQUID_SNMP_DEBUG_H */ +#endif /* SQUID_INCLUDE_SNMP_DEBUG_H */ diff --git a/include/snmp_error.h b/include/snmp_error.h index 6c688bb83d..e10b717901 100644 --- a/include/snmp_error.h +++ b/include/snmp_error.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SNMP_ERROR_H -#define SQUID_SNMP_ERROR_H +#ifndef SQUID_INCLUDE_SNMP_ERROR_H +#define SQUID_INCLUDE_SNMP_ERROR_H /********************************************************************** * @@ -71,5 +71,5 @@ const char *snmp_errstring(int); } #endif -#endif /* SQUID_SNMP_ERROR_H */ +#endif /* SQUID_INCLUDE_SNMP_ERROR_H */ diff --git a/include/snmp_impl.h b/include/snmp_impl.h index ac346f4a03..3530024503 100644 --- a/include/snmp_impl.h +++ b/include/snmp_impl.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SNMP_IMPL_H -#define SQUID_SNMP_IMPL_H +#ifndef SQUID_INCLUDE_SNMP_IMPL_H +#define SQUID_INCLUDE_SNMP_IMPL_H #include "asn1.h" @@ -61,5 +61,5 @@ struct trapVar { struct trapVar *next; }; -#endif /* SQUID_SNMP_IMPL_H */ +#endif /* SQUID_INCLUDE_SNMP_IMPL_H */ diff --git a/include/snmp_msg.h b/include/snmp_msg.h index e14702bee7..9ba853d1b6 100644 --- a/include/snmp_msg.h +++ b/include/snmp_msg.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SNMP_MSG_H -#define SQUID_SNMP_MSG_H +#ifndef SQUID_INCLUDE_SNMP_MSG_H +#define SQUID_INCLUDE_SNMP_MSG_H /********************************************************************** * @@ -52,5 +52,5 @@ u_char *snmp_msg_Decode(u_char *, int *, u_char *, int *, int *, struct snmp_pdu #endif -#endif /* SQUID_SNMP_MSG_H */ +#endif /* SQUID_INCLUDE_SNMP_MSG_H */ diff --git a/include/snmp_pdu.h b/include/snmp_pdu.h index 05631818f4..c64b062d12 100644 --- a/include/snmp_pdu.h +++ b/include/snmp_pdu.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SNMP_PDU_H -#define SQUID_SNMP_PDU_H +#ifndef SQUID_INCLUDE_SNMP_PDU_H +#define SQUID_INCLUDE_SNMP_PDU_H /* required for oid typedef */ #include "asn1.h" @@ -103,5 +103,5 @@ void snmp_add_null_var(struct snmp_pdu *, oid *, int); } #endif -#endif /* SQUID_SNMP_PDU_H */ +#endif /* SQUID_INCLUDE_SNMP_PDU_H */ diff --git a/include/snmp_session.h b/include/snmp_session.h index 6b5ee68ea6..a1ffe6d4fa 100644 --- a/include/snmp_session.h +++ b/include/snmp_session.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SNMP_SESSION_H -#define SQUID_SNMP_SESSION_H +#ifndef SQUID_INCLUDE_SNMP_SESSION_H +#define SQUID_INCLUDE_SNMP_SESSION_H /********************************************************************** * @@ -48,5 +48,5 @@ struct snmp_session { #define RECEIVED_MESSAGE 1 #define TIMED_OUT 2 -#endif /* SQUID_SNMP_SESSION_H */ +#endif /* SQUID_INCLUDE_SNMP_SESSION_H */ diff --git a/include/snmp_util.h b/include/snmp_util.h index bcd86aa0ff..a288ed4841 100644 --- a/include/snmp_util.h +++ b/include/snmp_util.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SNMP_UTIL_H -#define SQUID_SNMP_UTIL_H +#ifndef SQUID_INCLUDE_SNMP_UTIL_H +#define SQUID_INCLUDE_SNMP_UTIL_H #ifdef __cplusplus extern "C" { @@ -55,5 +55,5 @@ int Util_file_write(char *file, int offset, char *data, int dataSz); #ifdef __cplusplus } #endif -#endif /* SQUID_SNMP_UTIL_H */ +#endif /* SQUID_INCLUDE_SNMP_UTIL_H */ diff --git a/include/snmp_vars.h b/include/snmp_vars.h index a96e2f2f20..e5b5bd8068 100644 --- a/include/snmp_vars.h +++ b/include/snmp_vars.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SNMP_VARS_H -#define SQUID_SNMP_VARS_H +#ifndef SQUID_INCLUDE_SNMP_VARS_H +#define SQUID_INCLUDE_SNMP_VARS_H /********************************************************************** * @@ -125,5 +125,5 @@ typedef struct variable_list variable_list; } #endif -#endif /* SQUID_SNMP_VARS_H */ +#endif /* SQUID_INCLUDE_SNMP_VARS_H */ diff --git a/include/splay.h b/include/splay.h index 25c712690b..c5903e8d97 100644 --- a/include/splay.h +++ b/include/splay.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SPLAY_H -#define SQUID_SPLAY_H +#ifndef SQUID_INCLUDE_SPLAY_H +#define SQUID_INCLUDE_SPLAY_H #include "fatal.h" #include @@ -491,5 +491,5 @@ SplayConstIterator::operator * () const return toVisit.top()->data; } -#endif /* SQUID_SPLAY_H */ +#endif /* SQUID_INCLUDE_SPLAY_H */ diff --git a/include/squid.h b/include/squid.h index 6240a6c574..7fc42fd883 100644 --- a/include/squid.h +++ b/include/squid.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_CONFIG_H -#define SQUID_CONFIG_H +#ifndef SQUID_INCLUDE_SQUID_H +#define SQUID_INCLUDE_SQUID_H #include "autoconf.h" /* For GNU autoconf variables */ #include "version.h" @@ -67,5 +67,5 @@ using namespace Squid; #define LOCAL_ARRAY(type, name, size) static type name[size] -#endif /* SQUID_CONFIG_H */ +#endif /* SQUID_INCLUDE_SQUID_H */ diff --git a/include/sspwin32.h b/include/sspwin32.h index d61050065f..9e3bbfb9e4 100644 --- a/include/sspwin32.h +++ b/include/sspwin32.h @@ -11,8 +11,8 @@ * Based on previous work of Francesco Chemolli, Robert Collins and Andrew Doran */ -#ifndef _LIBSSPWIN32_H_ -#define _LIBSSPWIN32_H_ +#ifndef SQUID_INCLUDE_SSPWIN32_H +#define SQUID_INCLUDE_SSPWIN32_H #if _SQUID_WINDOWS_ @@ -66,5 +66,5 @@ extern BOOL NTLM_LocalCall; #endif #endif /* _SQUID_WINDOWS_ */ -#endif /* LIBSSPWIN32_H_ */ +#endif /* SQUID_INCLUDE_SSPWIN32_H */ diff --git a/include/util.h b/include/util.h index 722ba60654..32df6c32cc 100644 --- a/include/util.h +++ b/include/util.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_UTIL_H -#define SQUID_UTIL_H +#ifndef SQUID_INCLUDE_UTIL_H +#define SQUID_INCLUDE_UTIL_H #if HAVE_ARPA_INET_H #include @@ -40,5 +40,5 @@ extern void gb_flush(gb_t *); /* internal, do not use this */ SQUIDCEXTERN unsigned int RoundTo(const unsigned int num, const unsigned int what); -#endif /* SQUID_UTIL_H */ +#endif /* SQUID_INCLUDE_UTIL_H */ diff --git a/include/version.h b/include/version.h index 322d84ae41..24c16a1201 100644 --- a/include/version.h +++ b/include/version.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_VERSION_H -#define SQUID_VERSION_H +#ifndef SQUID_INCLUDE_VERSION_H +#define SQUID_INCLUDE_VERSION_H #ifndef SQUID_RELEASE_TIME #define SQUID_RELEASE_TIME squid_curtime @@ -25,5 +25,5 @@ #define APP_FULLNAME PACKAGE "/" VERSION #endif -#endif /* SQUID_VERSION_H */ +#endif /* SQUID_INCLUDE_VERSION_H */ diff --git a/lib/libTrie/Trie.h b/lib/libTrie/Trie.h index 5349fbf3f2..7d6b8882e5 100644 --- a/lib/libTrie/Trie.h +++ b/lib/libTrie/Trie.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef LIBTRIE_SQUID_H -#define LIBTRIE_SQUID_H +#ifndef SQUID_LIB_LIBTRIE_TRIE_H +#define SQUID_LIB_LIBTRIE_TRIE_H #include "TrieNode.h" #if HAVE_SYS_TYPES_H @@ -71,5 +71,5 @@ Trie::findPrefix (char const *aString, size_t theLength) return nullptr; } -#endif /* LIBTRIE_SQUID_H */ +#endif /* SQUID_LIB_LIBTRIE_TRIE_H */ diff --git a/lib/libTrie/TrieCharTransform.h b/lib/libTrie/TrieCharTransform.h index 03450eda50..5247377028 100644 --- a/lib/libTrie/TrieCharTransform.h +++ b/lib/libTrie/TrieCharTransform.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef LIBTRIE_TRIECHARTRANSFORM_H -#define LIBTRIE_TRIECHARTRANSFORM_H +#ifndef SQUID_LIB_LIBTRIE_TRIECHARTRANSFORM_H +#define SQUID_LIB_LIBTRIE_TRIECHARTRANSFORM_H /* This is an internal header for libTrie. * libTrie provides both limited C and full C++ @@ -45,5 +45,5 @@ class TrieCaseless : public TrieCharTransform #endif /* __cplusplus */ -#endif /* LIBTRIE_TRIECHARTRANSFORM_H */ +#endif /* SQUID_LIB_LIBTRIE_TRIECHARTRANSFORM_H */ diff --git a/lib/libTrie/TrieNode.h b/lib/libTrie/TrieNode.h index 627e2d26a8..bbbb656ed9 100644 --- a/lib/libTrie/TrieNode.h +++ b/lib/libTrie/TrieNode.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef LIBTRIE_TRIENODE_H -#define LIBTRIE_TRIENODE_H +#ifndef SQUID_LIB_LIBTRIE_TRIENODE_H +#define SQUID_LIB_LIBTRIE_TRIENODE_H #include "TrieCharTransform.h" @@ -81,5 +81,5 @@ TrieNode::find (char const *aString, size_t theLength, TrieCharTransform *transf return _privateData; } } -#endif /* LIBTRIE_TRIENODE_H */ +#endif /* SQUID_LIB_LIBTRIE_TRIENODE_H */ diff --git a/lib/ntlmauth/ntlmauth.h b/lib/ntlmauth/ntlmauth.h index 278daef00a..ac7c856409 100644 --- a/lib/ntlmauth/ntlmauth.h +++ b/lib/ntlmauth/ntlmauth.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_NTLMAUTH_H -#define SQUID_NTLMAUTH_H +#ifndef SQUID_LIB_NTLMAUTH_NTLMAUTH_H +#define SQUID_LIB_NTLMAUTH_NTLMAUTH_H /* NP: All of this cruft is little endian */ /* Endian functions are usually handled by the OS but not always. */ @@ -192,5 +192,5 @@ int ntlm_unpack_auth(const ntlm_authenticate *auth, } #endif -#endif /* SQUID_NTLMAUTH_H */ +#endif /* SQUID_LIB_NTLMAUTH_NTLMAUTH_H */ diff --git a/lib/rfcnb/rfcnb-common.h b/lib/rfcnb/rfcnb-common.h index e0094d27cf..83b2e79fe0 100644 --- a/lib/rfcnb/rfcnb-common.h +++ b/lib/rfcnb/rfcnb-common.h @@ -30,8 +30,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _RFCNB_RFCNB_COMMON_H -#define _RFCNB_RFCNB_COMMON_H +#ifndef SQUID_LIB_RFCNB_RFCNB_COMMON_H +#define SQUID_LIB_RFCNB_RFCNB_COMMON_H #if defined(__cplusplus) extern "C" { @@ -50,5 +50,5 @@ typedef struct RFCNB_Pkt { #if defined(__cplusplus) } #endif -#endif /* _RFCNB_RFCNB_COMMON_H */ +#endif /* SQUID_LIB_RFCNB_RFCNB_COMMON_H */ diff --git a/lib/rfcnb/rfcnb-error.h b/lib/rfcnb/rfcnb-error.h index 00371cfc40..15cad1fbf4 100644 --- a/lib/rfcnb/rfcnb-error.h +++ b/lib/rfcnb/rfcnb-error.h @@ -30,8 +30,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _RFCNB_ERROR_H_ -#define _RFCNB_ERROR_H_ +#ifndef SQUID_LIB_RFCNB_RFCNB_ERROR_H +#define SQUID_LIB_RFCNB_RFCNB_ERROR_H #ifdef __cplusplus extern "C" { @@ -69,5 +69,5 @@ extern const char *RFCNB_Error_Strings[]; } #endif -#endif /* _RFCNB_ERROR_H_ */ +#endif /* SQUID_LIB_RFCNB_RFCNB_ERROR_H */ diff --git a/lib/rfcnb/rfcnb-io.h b/lib/rfcnb/rfcnb-io.h index b251e95c05..eaf1bc6241 100644 --- a/lib/rfcnb/rfcnb-io.h +++ b/lib/rfcnb/rfcnb-io.h @@ -30,8 +30,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _SQUID__LIB_RFCNB_RFCNB_IO_H -#define _SQUID__LIB_RFCNB_RFCNB_IO_H +#ifndef SQUID_LIB_RFCNB_RFCNB_IO_H +#define SQUID_LIB_RFCNB_RFCNB_IO_H #include "rfcnb/rfcnb.h" @@ -39,5 +39,5 @@ int RFCNB_Put_Pkt(struct RFCNB_Con *con, struct RFCNB_Pkt *pkt, int len); int RFCNB_Get_Pkt(struct RFCNB_Con *con, struct RFCNB_Pkt *pkt, int len); -#endif +#endif /* SQUID_LIB_RFCNB_RFCNB_IO_H */ diff --git a/lib/rfcnb/rfcnb-priv.h b/lib/rfcnb/rfcnb-priv.h index 5432ca389a..6994541161 100644 --- a/lib/rfcnb/rfcnb-priv.h +++ b/lib/rfcnb/rfcnb-priv.h @@ -30,8 +30,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _RFCNB_RFCNB_PRIV_H -#define _RFCNB_RFCNB_PRIV_H +#ifndef SQUID_LIB_RFCNB_RFCNB_PRIV_H +#define SQUID_LIB_RFCNB_RFCNB_PRIV_H /* Defines we need */ @@ -130,5 +130,5 @@ extern int RFCNB_errno; extern int RFCNB_saved_errno; /* Save this from point of error */ #endif -#endif /* _RFCNB_RFCNB_PRIV_H */ +#endif /* SQUID_LIB_RFCNB_RFCNB_PRIV_H */ diff --git a/lib/rfcnb/rfcnb-util.h b/lib/rfcnb/rfcnb-util.h index 7e4ac5930e..2d520cf4ef 100644 --- a/lib/rfcnb/rfcnb-util.h +++ b/lib/rfcnb/rfcnb-util.h @@ -30,8 +30,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _RFCNB_RFCNB_UTIL_H -#define _RFCNB_RFCNB_UTIL_H +#ifndef SQUID_LIB_RFCNB_RFCNB_UTIL_H +#define SQUID_LIB_RFCNB_RFCNB_UTIL_H #include "rfcnb/std-includes.h" @@ -61,5 +61,5 @@ int RFCNB_Session_Req(struct RFCNB_Con *con, typedef void RFCNB_Prot_Print_Routine(FILE * fd, int dir, struct RFCNB_Pkt *pkt, int header, int payload); extern RFCNB_Prot_Print_Routine *Prot_Print_Routine; -#endif /* _RFCNB_RFCNB_UTIL_H */ +#endif /* SQUID_LIB_RFCNB_RFCNB_UTIL_H */ diff --git a/lib/rfcnb/rfcnb.h b/lib/rfcnb/rfcnb.h index ec42985301..ed81e913d0 100644 --- a/lib/rfcnb/rfcnb.h +++ b/lib/rfcnb/rfcnb.h @@ -30,8 +30,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _RFCNB_RFCNB_H -#define _RFCNB_RFCNB_H +#ifndef SQUID_LIB_RFCNB_RFCNB_H +#define SQUID_LIB_RFCNB_RFCNB_H /* Error responses */ @@ -75,5 +75,5 @@ struct RFCNB_Pkt *RFCNB_Alloc_Pkt(int n); } #endif -#endif /* _RFCNB_RFCNB_H */ +#endif /* SQUID_LIB_RFCNB_RFCNB_H */ diff --git a/lib/rfcnb/std-includes.h b/lib/rfcnb/std-includes.h index f037d9c8e5..fb172f977c 100644 --- a/lib/rfcnb/std-includes.h +++ b/lib/rfcnb/std-includes.h @@ -29,8 +29,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _RFCNB_STD_INCLUDES_H -#define _RFCNB_STD_INCLUDES_H +#ifndef SQUID_LIB_RFCNB_STD_INCLUDES_H +#define SQUID_LIB_RFCNB_STD_INCLUDES_H /* RFCNB Standard includes ... */ /* One day we will conditionalize these on OS types ... */ @@ -61,5 +61,5 @@ typedef short int16; #define INADDR_NONE -1 #endif -#endif /* _RFCNB_STD_INCLUDES_H */ +#endif /* SQUID_LIB_RFCNB_STD_INCLUDES_H */ diff --git a/lib/smblib/md4.h b/lib/smblib/md4.h index 4d0985c6c5..4da6e69f36 100644 --- a/lib/smblib/md4.h +++ b/lib/smblib/md4.h @@ -6,10 +6,10 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef __SMB_LM_SMBVAL_MD4_H -#define __SMB_LM_SMBVAL_MD4_H +#ifndef SQUID_LIB_SMBLIB_MD4_H +#define SQUID_LIB_SMBLIB_MD4_H extern void mdfour(unsigned char *out, unsigned char *in, int n); -#endif /* __SMB_LM_SMBVAL_MD4_H */ +#endif /* SQUID_LIB_SMBLIB_MD4_H */ diff --git a/lib/smblib/smbencrypt.h b/lib/smblib/smbencrypt.h index 2ba01dd890..79fdfe370e 100644 --- a/lib/smblib/smbencrypt.h +++ b/lib/smblib/smbencrypt.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SMBLIB_SMBENCRYPT_H -#define _SMBLIB_SMBENCRYPT_H +#ifndef SQUID_LIB_SMBLIB_SMBENCRYPT_H +#define SQUID_LIB_SMBLIB_SMBENCRYPT_H #ifdef __cplusplus extern "C" { @@ -20,5 +20,5 @@ void nt_lm_owf_gen(char *pwd, char *nt_p16, char *p16); #ifdef __cplusplus } #endif -#endif /* _SMBLIB_SMBENCRYPT_H */ +#endif /* SQUID_LIB_SMBLIB_SMBENCRYPT_H */ diff --git a/lib/smblib/smblib-common.h b/lib/smblib/smblib-common.h index 82c373064f..675751703d 100644 --- a/lib/smblib/smblib-common.h +++ b/lib/smblib/smblib-common.h @@ -30,8 +30,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _SMBLIB_SMBLIB_COMMON_H -#define _SMBLIB_SMBLIB_COMMON_H +#ifndef SQUID_LIB_SMBLIB_SMBLIB_COMMON_H +#define SQUID_LIB_SMBLIB_SMBLIB_COMMON_H #ifdef __cplusplus extern "C" { @@ -257,5 +257,5 @@ struct SMB_Connect_Def { #ifdef __cplusplus } #endif -#endif /* _SMBLIB_SMBLIB_COMMON_H */ +#endif /* SQUID_LIB_SMBLIB_SMBLIB_COMMON_H */ diff --git a/lib/smblib/smblib-priv.h b/lib/smblib/smblib-priv.h index c6036dec15..5e181e0455 100644 --- a/lib/smblib/smblib-priv.h +++ b/lib/smblib/smblib-priv.h @@ -30,8 +30,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _SMBLIB_PRIV_H_ -#define _SMBLIB_PRIV_H_ +#ifndef SQUID_LIB_SMBLIB_SMBLIB_PRIV_H +#define SQUID_LIB_SMBLIB_SMBLIB_PRIV_H #include "smblib/smblib-common.h" #include "smblib/std-defines.h" @@ -551,5 +551,5 @@ extern int SMBlib_SMB_Error; /* last Error */ void SMB_Get_My_Name(char *name, int len); -#endif /* _SMBLIB_PRIV_H_ */ +#endif /* SQUID_LIB_SMBLIB_SMBLIB_PRIV_H */ diff --git a/lib/smblib/smblib.h b/lib/smblib/smblib.h index 51d52c0cca..32648e5de9 100644 --- a/lib/smblib/smblib.h +++ b/lib/smblib/smblib.h @@ -30,8 +30,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _SMBLIB_SMBLIB_H -#define _SMBLIB_SMBLIB_H +#ifndef SQUID_LIB_SMBLIB_SMBLIB_H +#define SQUID_LIB_SMBLIB_SMBLIB_H #include "smblib-common.h" #include "smblib/smbencrypt.h" @@ -128,5 +128,5 @@ void *SMB_Logon_And_TCon(void *con, void *tree, char *user, char *pass, #ifdef __cplusplus } #endif -#endif /* _SMBLIB_SMBLIB_H */ +#endif /* SQUID_LIB_SMBLIB_SMBLIB_H */ diff --git a/lib/smblib/std-defines.h b/lib/smblib/std-defines.h index 56f70c9f29..a25e551367 100644 --- a/lib/smblib/std-defines.h +++ b/lib/smblib/std-defines.h @@ -28,8 +28,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _SMBLIB_STD_DEFINES_H -#define _SMBLIB_STD_DEFINES_H +#ifndef SQUID_LIB_SMBLIB_STD_DEFINES_H +#define SQUID_LIB_SMBLIB_STD_DEFINES_H /* RFCNB Standard includes ... */ /* One day we will conditionalize these on OS types ... */ @@ -48,5 +48,5 @@ #define TRUE 1 #define FALSE 0 -#endif /* _SMBLIB_STD_DEFINES_H */ +#endif /* SQUID_LIB_SMBLIB_STD_DEFINES_H */ diff --git a/lib/tests/testRFC1738.h b/lib/tests/testRFC1738.h index b0ed74851c..72b5ac244f 100644 --- a/lib/tests/testRFC1738.h +++ b/lib/tests/testRFC1738.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_LIB_TEST_RFC1738_H -#define SQUID_LIB_TEST_RFC1738_H +#ifndef SQUID_LIB_TESTS_TESTRFC1738_H +#define SQUID_LIB_TESTS_TESTRFC1738_H #include @@ -33,5 +33,5 @@ protected: void PercentZeroNullDecoding(); }; -#endif /* SQUID_LIB_TEST_RFC1738_H */ +#endif /* SQUID_LIB_TESTS_TESTRFC1738_H */ diff --git a/src/AccessLogEntry.h b/src/AccessLogEntry.h index 58f846b621..ec07698294 100644 --- a/src/AccessLogEntry.h +++ b/src/AccessLogEntry.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_HTTPACCESSLOGENTRY_H -#define SQUID_HTTPACCESSLOGENTRY_H +#ifndef SQUID_SRC_ACCESSLOGENTRY_H +#define SQUID_SRC_ACCESSLOGENTRY_H #include "anyp/PortCfg.h" #include "base/CodeContext.h" @@ -294,5 +294,5 @@ void accessLogClose(void); void accessLogInit(void); const char *accessLogTime(time_t); -#endif /* SQUID_HTTPACCESSLOGENTRY_H */ +#endif /* SQUID_SRC_ACCESSLOGENTRY_H */ diff --git a/src/AsyncEngine.h b/src/AsyncEngine.h index f26f4093e0..d7f1283e49 100644 --- a/src/AsyncEngine.h +++ b/src/AsyncEngine.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ASYNCENGINE_H -#define SQUID_ASYNCENGINE_H +#ifndef SQUID_SRC_ASYNCENGINE_H +#define SQUID_SRC_ASYNCENGINE_H /* Abstract interface for async engines which an event loop can utilise. * @@ -55,5 +55,5 @@ public: virtual int checkEvents(int timeout) = 0; }; -#endif /* SQUID_ASYNCENGINE_H */ +#endif /* SQUID_SRC_ASYNCENGINE_H */ diff --git a/src/AuthReg.h b/src/AuthReg.h index 84542b6c04..5abcf7d251 100644 --- a/src/AuthReg.h +++ b/src/AuthReg.h @@ -8,8 +8,8 @@ /* DEBUG: section 29 Authenticator */ -#ifndef SQUID_AUTHREG_H_ -#define SQUID_AUTHREG_H_ +#ifndef SQUID_SRC_AUTHREG_H +#define SQUID_SRC_AUTHREG_H namespace Auth { @@ -22,5 +22,5 @@ inline void Init(void) {} /* NOP if not USE_AUTH */ #endif /* USE_AUTH */ } // namespace Auth -#endif /* SQUID_AUTHREG_H_ */ +#endif /* SQUID_SRC_AUTHREG_H */ diff --git a/src/BandwidthBucket.h b/src/BandwidthBucket.h index d4c5bf00c4..92c36f3b26 100644 --- a/src/BandwidthBucket.h +++ b/src/BandwidthBucket.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef BANDWIDTHBUCKET_H -#define BANDWIDTHBUCKET_H +#ifndef SQUID_SRC_BANDWIDTHBUCKET_H +#define SQUID_SRC_BANDWIDTHBUCKET_H #if USE_DELAY_POOLS @@ -56,5 +56,5 @@ protected: #endif /* USE_DELAY_POOLS */ -#endif +#endif /* SQUID_SRC_BANDWIDTHBUCKET_H */ diff --git a/src/BodyPipe.h b/src/BodyPipe.h index 5427d1d918..c686ce5cfd 100644 --- a/src/BodyPipe.h +++ b/src/BodyPipe.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_BODY_PIPE_H -#define SQUID_BODY_PIPE_H +#ifndef SQUID_SRC_BODYPIPE_H +#define SQUID_SRC_BODYPIPE_H #include "base/AsyncJob.h" #include "base/CbcPointer.h" @@ -168,5 +168,5 @@ private: bool isCheckedOut; // to keep track of checkout violations }; -#endif /* SQUID_BODY_PIPE_H */ +#endif /* SQUID_SRC_BODYPIPE_H */ diff --git a/src/CacheDigest.h b/src/CacheDigest.h index 3c28317151..b69f0b74be 100644 --- a/src/CacheDigest.h +++ b/src/CacheDigest.h @@ -8,8 +8,8 @@ /* DEBUG: section 70 Cache Digest */ -#ifndef SQUID_CACHEDIGEST_H_ -#define SQUID_CACHEDIGEST_H_ +#ifndef SQUID_SRC_CACHEDIGEST_H +#define SQUID_SRC_CACHEDIGEST_H #include "mem/forward.h" #include "store_key_md5.h" @@ -64,5 +64,5 @@ void cacheDigestGuessStatsUpdate(CacheDigestGuessStats * stats, int real_hit, in void cacheDigestGuessStatsReport(const CacheDigestGuessStats * stats, StoreEntry * sentry, const SBuf &label); void cacheDigestReport(CacheDigest * cd, const SBuf &label, StoreEntry * e); -#endif /* SQUID_CACHEDIGEST_H_ */ +#endif /* SQUID_SRC_CACHEDIGEST_H */ diff --git a/src/CacheManager.h b/src/CacheManager.h index 54b2fb8a54..81bccb06dd 100644 --- a/src/CacheManager.h +++ b/src/CacheManager.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_CACHEMANAGER_H -#define SQUID_CACHEMANAGER_H +#ifndef SQUID_SRC_CACHEMANAGER_H +#define SQUID_SRC_CACHEMANAGER_H #include "anyp/forward.h" #include "comm/forward.h" @@ -71,5 +71,5 @@ protected: Menu menu_; }; -#endif /* SQUID_CACHEMANAGER_H */ +#endif /* SQUID_SRC_CACHEMANAGER_H */ diff --git a/src/CachePeer.h b/src/CachePeer.h index a5cfbea3f3..6c4e4fc938 100644 --- a/src/CachePeer.h +++ b/src/CachePeer.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_CACHEPEER_H_ -#define SQUID_CACHEPEER_H_ +#ifndef SQUID_SRC_CACHEPEER_H +#define SQUID_SRC_CACHEPEER_H #include "acl/forward.h" #include "base/CbcPointer.h" @@ -251,5 +251,5 @@ NoteOutgoingConnectionFailure(CachePeer * const peer, const Http::StatusCode cod /// identify the given cache peer in cache.log messages and such std::ostream &operator <<(std::ostream &, const CachePeer &); -#endif /* SQUID_CACHEPEER_H_ */ +#endif /* SQUID_SRC_CACHEPEER_H */ diff --git a/src/ClientDelayConfig.h b/src/ClientDelayConfig.h index 1e2c5afd6d..4c73df0335 100644 --- a/src/ClientDelayConfig.h +++ b/src/ClientDelayConfig.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_CLIENTDELAYCONFIG_H -#define SQUID_CLIENTDELAYCONFIG_H +#ifndef SQUID_SRC_CLIENTDELAYCONFIG_H +#define SQUID_SRC_CLIENTDELAYCONFIG_H #include "acl/forward.h" #include "base/RefCount.h" @@ -79,5 +79,5 @@ private: ClientDelayPool &pool(const int i) { return *(ClientDelayPools::Instance()->pools.at(i)); } }; -#endif // SQUID_CLIENTDELAYCONFIG_H +#endif /* SQUID_SRC_CLIENTDELAYCONFIG_H */ diff --git a/src/ClientInfo.h b/src/ClientInfo.h index 229a656057..d350d3bbaa 100644 --- a/src/ClientInfo.h +++ b/src/ClientInfo.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID__SRC_CLIENTINFO_H -#define SQUID__SRC_CLIENTINFO_H +#ifndef SQUID_SRC_CLIENTINFO_H +#define SQUID_SRC_CLIENTINFO_H #if USE_DELAY_POOLS #include "BandwidthBucket.h" @@ -137,5 +137,5 @@ private: }; #endif /* USE_DELAY_POOLS */ -#endif +#endif /* SQUID_SRC_CLIENTINFO_H */ diff --git a/src/ClientRequestContext.h b/src/ClientRequestContext.h index 4b22613527..b11e3d9395 100644 --- a/src/ClientRequestContext.h +++ b/src/ClientRequestContext.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_CLIENTREQUESTCONTEXT_H -#define SQUID_CLIENTREQUESTCONTEXT_H +#ifndef SQUID_SRC_CLIENTREQUESTCONTEXT_H +#define SQUID_SRC_CLIENTREQUESTCONTEXT_H #include "base/RefCount.h" #include "cbdata.h" @@ -87,5 +87,5 @@ public: #endif }; -#endif /* SQUID_CLIENTREQUESTCONTEXT_H */ +#endif /* SQUID_SRC_CLIENTREQUESTCONTEXT_H */ diff --git a/src/CollapsedForwarding.h b/src/CollapsedForwarding.h index 94b741f5c3..91d028d354 100644 --- a/src/CollapsedForwarding.h +++ b/src/CollapsedForwarding.h @@ -8,8 +8,8 @@ /* DEBUG: section 17 Request Forwarding */ -#ifndef SQUID_COLLAPSED_FORWARDING_H -#define SQUID_COLLAPSED_FORWARDING_H +#ifndef SQUID_SRC_COLLAPSEDFORWARDING_H +#define SQUID_SRC_COLLAPSEDFORWARDING_H #include "ipc/forward.h" #include "ipc/Queue.h" @@ -52,5 +52,5 @@ private: static std::unique_ptr queue; ///< IPC queue }; -#endif /* SQUID_COLLAPSED_FORWARDING_H */ +#endif /* SQUID_SRC_COLLAPSEDFORWARDING_H */ diff --git a/src/CollapsingHistory.h b/src/CollapsingHistory.h index e40ee20209..915784ed35 100644 --- a/src/CollapsingHistory.h +++ b/src/CollapsingHistory.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_COLLAPSING_HISTORY_H -#define SQUID_COLLAPSING_HISTORY_H +#ifndef SQUID_SRC_COLLAPSINGHISTORY_H +#define SQUID_SRC_COLLAPSINGHISTORY_H /// collapsed forwarding history of a master transaction class CollapsingHistory @@ -24,5 +24,5 @@ public: int otherCollapses = 0; }; -#endif /* SQUID_COLLAPSING_HISTORY_H */ +#endif /* SQUID_SRC_COLLAPSINGHISTORY_H */ diff --git a/src/CommCalls.h b/src/CommCalls.h index a5c422c19f..42385ae19e 100644 --- a/src/CommCalls.h +++ b/src/CommCalls.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_COMMCALLS_H -#define SQUID_COMMCALLS_H +#ifndef SQUID_SRC_COMMCALLS_H +#define SQUID_SRC_COMMCALLS_H #include "base/AsyncCall.h" #include "base/AsyncJobCalls.h" @@ -354,5 +354,5 @@ CommCbFunPtrCallT::fire() dialer.dial(); } -#endif /* SQUID_COMMCALLS_H */ +#endif /* SQUID_SRC_COMMCALLS_H */ diff --git a/src/CommandLine.h b/src/CommandLine.h index 5e4ef100f5..c7cd241efb 100644 --- a/src/CommandLine.h +++ b/src/CommandLine.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_COMMANDLINE_H -#define SQUID_COMMANDLINE_H +#ifndef SQUID_SRC_COMMANDLINE_H +#define SQUID_SRC_COMMANDLINE_H #if HAVE_GETOPT_H #include @@ -81,5 +81,5 @@ private: std::vector longOptions_; ///< long --option rules }; -#endif /* SQUID_COMMANDLINE_H */ +#endif /* SQUID_SRC_COMMANDLINE_H */ diff --git a/src/CommonPool.h b/src/CommonPool.h index abbd2a3ea3..0a0f17d9b5 100644 --- a/src/CommonPool.h +++ b/src/CommonPool.h @@ -8,8 +8,8 @@ /* DEBUG: section 77 Delay Pools */ -#ifndef COMMONPOOL_H -#define COMMONPOOL_H +#ifndef SQUID_SRC_COMMONPOOL_H +#define SQUID_SRC_COMMONPOOL_H #if USE_DELAY_POOLS #include "CompositePoolNode.h" @@ -36,5 +36,5 @@ protected: }; #endif /* USE_DELAY_POOLS */ -#endif /* COMMONPOOL_H */ +#endif /* SQUID_SRC_COMMONPOOL_H */ diff --git a/src/CompositePoolNode.h b/src/CompositePoolNode.h index cabec23c8d..be099c9f81 100644 --- a/src/CompositePoolNode.h +++ b/src/CompositePoolNode.h @@ -8,8 +8,8 @@ /* DEBUG: section 77 Delay Pools */ -#ifndef COMPOSITEPOOLNODE_H -#define COMPOSITEPOOLNODE_H +#ifndef SQUID_SRC_COMPOSITEPOOLNODE_H +#define SQUID_SRC_COMPOSITEPOOLNODE_H #if USE_DELAY_POOLS #include "auth/UserRequest.h" @@ -59,5 +59,5 @@ protected: }; #endif /* USE_DELAY_POOLS */ -#endif /* COMPOSITEPOOLNODE_H */ +#endif /* SQUID_SRC_COMPOSITEPOOLNODE_H */ diff --git a/src/ConfigOption.h b/src/ConfigOption.h index 58f8b116d9..c2419f120b 100644 --- a/src/ConfigOption.h +++ b/src/ConfigOption.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_CONFIGOPTION_H -#define SQUID_CONFIGOPTION_H +#ifndef SQUID_SRC_CONFIGOPTION_H +#define SQUID_SRC_CONFIGOPTION_H #include #include @@ -99,5 +99,5 @@ private: void (C::*dumper)(StoreEntry * e) const; }; -#endif /* SQUID_CONFIGOPTION_H */ +#endif /* SQUID_SRC_CONFIGOPTION_H */ diff --git a/src/ConfigParser.h b/src/ConfigParser.h index 2580b15887..f85c20ea3f 100644 --- a/src/ConfigParser.h +++ b/src/ConfigParser.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_CONFIGPARSER_H -#define SQUID_CONFIGPARSER_H +#ifndef SQUID_SRC_CONFIGPARSER_H +#define SQUID_SRC_CONFIGPARSER_H #include "acl/forward.h" #include "base/forward.h" @@ -234,5 +234,5 @@ protected: int parseConfigFile(const char *file_name); -#endif /* SQUID_CONFIGPARSER_H */ +#endif /* SQUID_SRC_CONFIGPARSER_H */ diff --git a/src/CpuAffinity.h b/src/CpuAffinity.h index 1269ef13e4..8381e8ed34 100644 --- a/src/CpuAffinity.h +++ b/src/CpuAffinity.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_CPU_AFFINITY_H -#define SQUID_CPU_AFFINITY_H +#ifndef SQUID_SRC_CPUAFFINITY_H +#define SQUID_SRC_CPUAFFINITY_H /// set CPU affinity for this process on startup void CpuAffinityInit(); @@ -18,5 +18,5 @@ void CpuAffinityReconfigure(); /// check CPU affinity configuration and print warnings if needed void CpuAffinityCheck(); -#endif // SQUID_CPU_AFFINITY_H +#endif /* SQUID_SRC_CPUAFFINITY_H */ diff --git a/src/CpuAffinityMap.h b/src/CpuAffinityMap.h index c4a686cd39..fc61ecd45d 100644 --- a/src/CpuAffinityMap.h +++ b/src/CpuAffinityMap.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_CPU_AFFINITY_MAP_H -#define SQUID_CPU_AFFINITY_MAP_H +#ifndef SQUID_SRC_CPUAFFINITYMAP_H +#define SQUID_SRC_CPUAFFINITYMAP_H #include @@ -34,5 +34,5 @@ private: std::vector theCores; ///< list of cores }; -#endif // SQUID_CPU_AFFINITY_MAP_H +#endif /* SQUID_SRC_CPUAFFINITYMAP_H */ diff --git a/src/CpuAffinitySet.h b/src/CpuAffinitySet.h index d6574fe6ea..75305af38b 100644 --- a/src/CpuAffinitySet.h +++ b/src/CpuAffinitySet.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_CPU_AFFINITY_SET_H -#define SQUID_CPU_AFFINITY_SET_H +#ifndef SQUID_SRC_CPUAFFINITYSET_H +#define SQUID_SRC_CPUAFFINITYSET_H #include "compat/cpu.h" @@ -34,5 +34,5 @@ private: cpu_set_t theOrigCpuSet; ///< CPU affinity for this process before apply() }; -#endif // SQUID_CPU_AFFINITY_SET_H +#endif /* SQUID_SRC_CPUAFFINITYSET_H */ diff --git a/src/DelayBucket.h b/src/DelayBucket.h index 5a41328509..18194b8ba6 100644 --- a/src/DelayBucket.h +++ b/src/DelayBucket.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_DELAYBUCKET_H -#define SQUID_DELAYBUCKET_H +#ifndef SQUID_SRC_DELAYBUCKET_H +#define SQUID_SRC_DELAYBUCKET_H class DelaySpec; class StoreEntry; @@ -35,5 +35,5 @@ private: int level_; }; -#endif /* SQUID_DELAYBUCKET_H */ +#endif /* SQUID_SRC_DELAYBUCKET_H */ diff --git a/src/DelayConfig.h b/src/DelayConfig.h index a6f1eec6ff..b128893b68 100644 --- a/src/DelayConfig.h +++ b/src/DelayConfig.h @@ -8,8 +8,8 @@ /* DEBUG: section 03 Configuration Settings */ -#ifndef SQUID_DELAYCONFIG_H -#define SQUID_DELAYCONFIG_H +#ifndef SQUID_SRC_DELAYCONFIG_H +#define SQUID_SRC_DELAYCONFIG_H class StoreEntry; class ConfigParser; @@ -29,5 +29,5 @@ public: }; -#endif /* SQUID_DELAYCONFIG_H */ +#endif /* SQUID_SRC_DELAYCONFIG_H */ diff --git a/src/DelayId.h b/src/DelayId.h index eb66233cfa..12710c2869 100644 --- a/src/DelayId.h +++ b/src/DelayId.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_DELAYID_H -#define SQUID_DELAYID_H +#ifndef SQUID_SRC_DELAYID_H +#define SQUID_SRC_DELAYID_H #if USE_DELAY_POOLS @@ -44,5 +44,5 @@ private: }; #endif /* USE_DELAY_POOLS */ -#endif /* SQUID_DELAYID_H */ +#endif /* SQUID_SRC_DELAYID_H */ diff --git a/src/DelayIdComposite.h b/src/DelayIdComposite.h index c5426a7f52..1055a4dab7 100644 --- a/src/DelayIdComposite.h +++ b/src/DelayIdComposite.h @@ -8,8 +8,8 @@ /* DEBUG: section 77 Delay Pools */ -#ifndef DELAYIDCOMPOSITE_H -#define DELAYIDCOMPOSITE_H +#ifndef SQUID_SRC_DELAYIDCOMPOSITE_H +#define SQUID_SRC_DELAYIDCOMPOSITE_H #if USE_DELAY_POOLS #include "base/forward.h" @@ -30,5 +30,5 @@ public: }; #endif /* USE_DELAY_POOLS */ -#endif /* DELAYIDCOMPOSITE_H */ +#endif /* SQUID_SRC_DELAYIDCOMPOSITE_H */ diff --git a/src/DelayPool.h b/src/DelayPool.h index 3217166b22..920f1d146b 100644 --- a/src/DelayPool.h +++ b/src/DelayPool.h @@ -8,8 +8,8 @@ /* DEBUG: section 77 Delay Pools */ -#ifndef DELAYPOOL_H -#define DELAYPOOL_H +#ifndef SQUID_SRC_DELAYPOOL_H +#define SQUID_SRC_DELAYPOOL_H #if USE_DELAY_POOLS #include "acl/forward.h" @@ -42,5 +42,5 @@ private: }; #endif /* USE_DELAY_POOLS */ -#endif /* DELAYPOOL_H */ +#endif /* SQUID_SRC_DELAYPOOL_H */ diff --git a/src/DelayPools.h b/src/DelayPools.h index b78469da40..44f267f0d1 100644 --- a/src/DelayPools.h +++ b/src/DelayPools.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_DELAYPOOLS_H -#define SQUID_DELAYPOOLS_H +#ifndef SQUID_SRC_DELAYPOOLS_H +#define SQUID_SRC_DELAYPOOLS_H #include @@ -55,5 +55,5 @@ private: static void RegisterWithCacheManager(void); }; -#endif /* SQUID_DELAYPOOLS_H */ +#endif /* SQUID_SRC_DELAYPOOLS_H */ diff --git a/src/DelaySpec.h b/src/DelaySpec.h index ec2c75fc24..f5777cd3b1 100644 --- a/src/DelaySpec.h +++ b/src/DelaySpec.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_DELAYSPEC_H -#define SQUID_DELAYSPEC_H +#ifndef SQUID_SRC_DELAYSPEC_H +#define SQUID_SRC_DELAYSPEC_H class StoreEntry; @@ -24,5 +24,5 @@ public: int64_t max_bytes; }; -#endif /* SQUID_DELAYSPEC_H */ +#endif /* SQUID_SRC_DELAYSPEC_H */ diff --git a/src/DelayTagged.h b/src/DelayTagged.h index bf2a112ecc..029d1012f3 100644 --- a/src/DelayTagged.h +++ b/src/DelayTagged.h @@ -8,8 +8,8 @@ /* DEBUG: section 77 Delay Pools */ -#ifndef DELAYTAGGED_H -#define DELAYTAGGED_H +#ifndef SQUID_SRC_DELAYTAGGED_H +#define SQUID_SRC_DELAYTAGGED_H #if USE_DELAY_POOLS @@ -79,5 +79,5 @@ private: }; #endif /* USE_DELAY_POOLS */ -#endif /* DELAYTAGGED_H */ +#endif /* SQUID_SRC_DELAYTAGGED_H */ diff --git a/src/DelayUser.h b/src/DelayUser.h index c477644ced..c6e4d0db33 100644 --- a/src/DelayUser.h +++ b/src/DelayUser.h @@ -8,8 +8,8 @@ /* DEBUG: section 77 Delay Pools */ -#ifndef DELAYUSER_H -#define DELAYUSER_H +#ifndef SQUID_SRC_DELAYUSER_H +#define SQUID_SRC_DELAYUSER_H #if USE_DELAY_POOLS && USE_AUTH @@ -77,5 +77,5 @@ private: }; #endif /* USE_DELAY_POOLS && USE_AUTH */ -#endif /* DELAYUSER_H */ +#endif /* SQUID_SRC_DELAYUSER_H */ diff --git a/src/DelayVector.h b/src/DelayVector.h index 612f17615b..91f25d4704 100644 --- a/src/DelayVector.h +++ b/src/DelayVector.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_DELAYVECTOR_H -#define SQUID_DELAYVECTOR_H +#ifndef SQUID_SRC_DELAYVECTOR_H +#define SQUID_SRC_DELAYVECTOR_H #if USE_DELAY_POOLS @@ -60,5 +60,5 @@ private: }; #endif /* USE_DELAY_POOLS */ -#endif /* SQUID_DELAYVECTOR_H */ +#endif /* SQUID_SRC_DELAYVECTOR_H */ diff --git a/src/DescriptorSet.h b/src/DescriptorSet.h index 3079c03b84..c21f52ded3 100644 --- a/src/DescriptorSet.h +++ b/src/DescriptorSet.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_DESCRIPTOR_SET_H -#define SQUID_DESCRIPTOR_SET_H +#ifndef SQUID_SRC_DESCRIPTORSET_H +#define SQUID_SRC_DESCRIPTORSET_H #include @@ -63,5 +63,5 @@ operator <<(std::ostream &os, const DescriptorSet &ds) return os; } -#endif /* SQUID_DESCRIPTOR_SET_H */ +#endif /* SQUID_SRC_DESCRIPTORSET_H */ diff --git a/src/DiskIO/AIO/AIODiskFile.h b/src/DiskIO/AIO/AIODiskFile.h index fa39824851..30cd1cc16a 100644 --- a/src/DiskIO/AIO/AIODiskFile.h +++ b/src/DiskIO/AIO/AIODiskFile.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_AIODISKFILE_H -#define SQUID_AIODISKFILE_H +#ifndef SQUID_SRC_DISKIO_AIO_AIODISKFILE_H +#define SQUID_SRC_DISKIO_AIO_AIODISKFILE_H #if HAVE_DISKIO_MODULE_AIO @@ -57,5 +57,5 @@ private: }; #endif /* HAVE_DISKIO_MODULE_AIO */ -#endif /* SQUID_AIODISKFILE_H */ +#endif /* SQUID_SRC_DISKIO_AIO_AIODISKFILE_H */ diff --git a/src/DiskIO/AIO/AIODiskIOModule.h b/src/DiskIO/AIO/AIODiskIOModule.h index 3f699808d4..5f0301eb24 100644 --- a/src/DiskIO/AIO/AIODiskIOModule.h +++ b/src/DiskIO/AIO/AIODiskIOModule.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_AIODISKIOMODULE_H -#define SQUID_AIODISKIOMODULE_H +#ifndef SQUID_SRC_DISKIO_AIO_AIODISKIOMODULE_H +#define SQUID_SRC_DISKIO_AIO_AIODISKIOMODULE_H #if HAVE_DISKIO_MODULE_AIO @@ -29,5 +29,5 @@ private: }; #endif /* HAVE_DISKIO_MODULE_AIO */ -#endif /* SQUID_AIODISKIOMODULE_H */ +#endif /* SQUID_SRC_DISKIO_AIO_AIODISKIOMODULE_H */ diff --git a/src/DiskIO/AIO/aio_win32.h b/src/DiskIO/AIO/aio_win32.h index e18eb5266d..f6b6664447 100644 --- a/src/DiskIO/AIO/aio_win32.h +++ b/src/DiskIO/AIO/aio_win32.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef __WIN32_AIO_H__ -#define __WIN32_AIO_H__ +#ifndef SQUID_SRC_DISKIO_AIO_AIO_WIN32_H +#define SQUID_SRC_DISKIO_AIO_AIO_WIN32_H #if HAVE_DISKIO_MODULE_AIO @@ -79,5 +79,5 @@ void aio_close(int); #endif /* _SQUID_WINDOWS_ */ #endif /* HAVE_DISKIO_MODULE_AIO */ -#endif /* __WIN32_AIO_H__ */ +#endif /* SQUID_SRC_DISKIO_AIO_AIO_WIN32_H */ diff --git a/src/DiskIO/AIO/async_io.h b/src/DiskIO/AIO/async_io.h index 9eb2a876a3..716554cc39 100644 --- a/src/DiskIO/AIO/async_io.h +++ b/src/DiskIO/AIO/async_io.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef __ASYNC_IO_H__ -#define __ASYNC_IO_H__ +#ifndef SQUID_SRC_DISKIO_AIO_ASYNC_IO_H +#define SQUID_SRC_DISKIO_AIO_ASYNC_IO_H #if HAVE_DISKIO_MODULE_AIO @@ -73,5 +73,5 @@ struct _async_queue { }; #endif /* HAVE_DISKIO_MODULE_AIO */ -#endif /* __ASYNC_IO_H_ */ +#endif /* SQUID_SRC_DISKIO_AIO_ASYNC_IO_H */ diff --git a/src/DiskIO/Blocking/BlockingDiskIOModule.h b/src/DiskIO/Blocking/BlockingDiskIOModule.h index 4ceb6999d5..4a88a0efa1 100644 --- a/src/DiskIO/Blocking/BlockingDiskIOModule.h +++ b/src/DiskIO/Blocking/BlockingDiskIOModule.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_BLOCKINGDISKIOMODULE_H -#define SQUID_BLOCKINGDISKIOMODULE_H +#ifndef SQUID_SRC_DISKIO_BLOCKING_BLOCKINGDISKIOMODULE_H +#define SQUID_SRC_DISKIO_BLOCKING_BLOCKINGDISKIOMODULE_H #include "DiskIO/DiskIOModule.h" @@ -26,5 +26,5 @@ private: static BlockingDiskIOModule Instance; }; -#endif /* SQUID_BLOCKINGDISKIOMODULE_H */ +#endif /* SQUID_SRC_DISKIO_BLOCKING_BLOCKINGDISKIOMODULE_H */ diff --git a/src/DiskIO/Blocking/BlockingFile.h b/src/DiskIO/Blocking/BlockingFile.h index 4720095dfe..d9c4e9a737 100644 --- a/src/DiskIO/Blocking/BlockingFile.h +++ b/src/DiskIO/Blocking/BlockingFile.h @@ -8,8 +8,8 @@ /* DEBUG: section 47 Store Directory Routines */ -#ifndef SQUID_BLOCKINGFILE_H -#define SQUID_BLOCKINGFILE_H +#ifndef SQUID_SRC_DISKIO_BLOCKING_BLOCKINGFILE_H +#define SQUID_SRC_DISKIO_BLOCKING_BLOCKINGFILE_H #include "cbdata.h" #include "DiskIO/DiskFile.h" @@ -50,5 +50,5 @@ private: void writeDone(int fd, int errflag, size_t len); }; -#endif /* SQUID_BLOCKINGFILE_H */ +#endif /* SQUID_SRC_DISKIO_BLOCKING_BLOCKINGFILE_H */ diff --git a/src/DiskIO/Blocking/BlockingIOStrategy.h b/src/DiskIO/Blocking/BlockingIOStrategy.h index 4997665956..f1ce650d6c 100644 --- a/src/DiskIO/Blocking/BlockingIOStrategy.h +++ b/src/DiskIO/Blocking/BlockingIOStrategy.h @@ -8,8 +8,8 @@ /* DEBUG: section 47 Store Directory Routines */ -#ifndef SQUID_BLOCKINGIOSTRATEGY_H -#define SQUID_BLOCKINGIOSTRATEGY_H +#ifndef SQUID_SRC_DISKIO_BLOCKING_BLOCKINGIOSTRATEGY_H +#define SQUID_SRC_DISKIO_BLOCKING_BLOCKINGIOSTRATEGY_H #include "DiskIO/DiskIOStrategy.h" class BlockingIOStrategy : public DiskIOStrategy @@ -23,5 +23,5 @@ public: void unlinkFile (char const *) override; }; -#endif /* SQUID_BLOCKINGIOSTRATEGY_H */ +#endif /* SQUID_SRC_DISKIO_BLOCKING_BLOCKINGIOSTRATEGY_H */ diff --git a/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.h b/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.h index 3fc285eef6..d76684e52f 100644 --- a/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.h +++ b/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_DISKDAEMONDISKIOMODULE_H -#define SQUID_DISKDAEMONDISKIOMODULE_H +#ifndef SQUID_SRC_DISKIO_DISKDAEMON_DISKDAEMONDISKIOMODULE_H +#define SQUID_SRC_DISKIO_DISKDAEMON_DISKDAEMONDISKIOMODULE_H #include "DiskIO/DiskIOModule.h" @@ -28,5 +28,5 @@ private: void registerWithCacheManager(void); }; -#endif /* SQUID_DISKDAEMONDISKIOMODULE_H */ +#endif /* SQUID_SRC_DISKIO_DISKDAEMON_DISKDAEMONDISKIOMODULE_H */ diff --git a/src/DiskIO/DiskDaemon/DiskdAction.h b/src/DiskIO/DiskDaemon/DiskdAction.h index 2d228be4d6..87ccd6ed9e 100644 --- a/src/DiskIO/DiskDaemon/DiskdAction.h +++ b/src/DiskIO/DiskDaemon/DiskdAction.h @@ -8,8 +8,8 @@ /* DEBUG: section 79 Squid-side DISKD I/O functions. */ -#ifndef SQUID_DISKD_ACTION_H -#define SQUID_DISKD_ACTION_H +#ifndef SQUID_SRC_DISKIO_DISKDAEMON_DISKDACTION_H +#define SQUID_SRC_DISKIO_DISKDAEMON_DISKDACTION_H #include "ipc/forward.h" #include "mgr/Action.h" @@ -71,5 +71,5 @@ private: DiskdActionData data; }; -#endif /* SQUID_DISKD_ACTION_H */ +#endif /* SQUID_SRC_DISKIO_DISKDAEMON_DISKDACTION_H */ diff --git a/src/DiskIO/DiskDaemon/DiskdFile.h b/src/DiskIO/DiskDaemon/DiskdFile.h index fa1450d376..66ff13d397 100644 --- a/src/DiskIO/DiskDaemon/DiskdFile.h +++ b/src/DiskIO/DiskDaemon/DiskdFile.h @@ -8,8 +8,8 @@ /* DEBUG: section 79 Squid-side DISKD I/O functions. */ -#ifndef __STORE_DISKDFILE_H__ -#define __STORE_DISKDFILE_H__ +#ifndef SQUID_SRC_DISKIO_DISKDAEMON_DISKDFILE_H +#define SQUID_SRC_DISKIO_DISKDAEMON_DISKDFILE_H #include "cbdata.h" #include "DiskIO/DiskFile.h" @@ -61,5 +61,5 @@ private: size_t inProgressIOs; }; -#endif +#endif /* SQUID_SRC_DISKIO_DISKDAEMON_DISKDFILE_H */ diff --git a/src/DiskIO/DiskDaemon/DiskdIOStrategy.h b/src/DiskIO/DiskDaemon/DiskdIOStrategy.h index 31cb636152..3897e4a9fa 100644 --- a/src/DiskIO/DiskDaemon/DiskdIOStrategy.h +++ b/src/DiskIO/DiskDaemon/DiskdIOStrategy.h @@ -8,8 +8,8 @@ /* DEBUG: section 79 Squid-side DISKD I/O functions. */ -#ifndef __STORE_DISKDIOSTRATEGY_H__ -#define __STORE_DISKDIOSTRATEGY_H__ +#ifndef SQUID_SRC_DISKIO_DISKDAEMON_DISKDIOSTRATEGY_H +#define SQUID_SRC_DISKIO_DISKDAEMON_DISKDIOSTRATEGY_H struct diomsg; @@ -119,5 +119,5 @@ struct diskd_stats_t { /// \ingroup diskd extern diskd_stats_t diskd_stats; -#endif +#endif /* SQUID_SRC_DISKIO_DISKDAEMON_DISKDIOSTRATEGY_H */ diff --git a/src/DiskIO/DiskDaemon/diomsg.h b/src/DiskIO/DiskDaemon/diomsg.h index eb9ca4811e..07b445b1d5 100644 --- a/src/DiskIO/DiskDaemon/diomsg.h +++ b/src/DiskIO/DiskDaemon/diomsg.h @@ -12,8 +12,8 @@ * Internal declarations for the diskd routines */ -#ifndef SQUID_DIOMSG_H__ -#define SQUID_DIOMSG_H__ +#ifndef SQUID_SRC_DISKIO_DISKDAEMON_DIOMSG_H +#define SQUID_SRC_DISKIO_DISKDAEMON_DIOMSG_H enum { _MQD_NOP, @@ -41,5 +41,5 @@ struct diomsg { static const int msg_snd_rcv_sz; }; -#endif /* SQUID_DIOMSG_H__ */ +#endif /* SQUID_SRC_DISKIO_DISKDAEMON_DIOMSG_H */ diff --git a/src/DiskIO/DiskFile.h b/src/DiskIO/DiskFile.h index 4e9c4b6026..3f90a40b0e 100644 --- a/src/DiskIO/DiskFile.h +++ b/src/DiskIO/DiskFile.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_DISKFILE_H -#define SQUID_DISKFILE_H +#ifndef SQUID_SRC_DISKIO_DISKFILE_H +#define SQUID_SRC_DISKIO_DISKFILE_H #include "base/RefCount.h" #include "time/gadgets.h" @@ -58,5 +58,5 @@ public: virtual bool ioInProgress() const = 0; }; -#endif /* SQUID_DISKFILE_H */ +#endif /* SQUID_SRC_DISKIO_DISKFILE_H */ diff --git a/src/DiskIO/DiskIOModule.h b/src/DiskIO/DiskIOModule.h index d5cae6083c..16fb42a0c5 100644 --- a/src/DiskIO/DiskIOModule.h +++ b/src/DiskIO/DiskIOModule.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_DISKIOMODULE_H -#define SQUID_DISKIOMODULE_H +#ifndef SQUID_SRC_DISKIO_DISKIOMODULE_H +#define SQUID_SRC_DISKIO_DISKIOMODULE_H #include @@ -57,5 +57,5 @@ private: static std::vector *_Modules; }; -#endif /* SQUID_DISKIOMODULE_H */ +#endif /* SQUID_SRC_DISKIO_DISKIOMODULE_H */ diff --git a/src/DiskIO/DiskIOStrategy.h b/src/DiskIO/DiskIOStrategy.h index 1d3e0eee8b..81891ecf05 100644 --- a/src/DiskIO/DiskIOStrategy.h +++ b/src/DiskIO/DiskIOStrategy.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_DISKIOSTRATEGY_H -#define SQUID_DISKIOSTRATEGY_H +#ifndef SQUID_SRC_DISKIO_DISKIOSTRATEGY_H +#define SQUID_SRC_DISKIO_DISKIOSTRATEGY_H #include "base/RefCount.h" #include "Store.h" @@ -86,5 +86,5 @@ private: DiskIOStrategy *io; }; -#endif /* SQUID_DISKIOSTRATEGY_H */ +#endif /* SQUID_SRC_DISKIO_DISKIOSTRATEGY_H */ diff --git a/src/DiskIO/DiskThreads/DiskThreads.h b/src/DiskIO/DiskThreads/DiskThreads.h index eea1232859..1dbe232849 100644 --- a/src/DiskIO/DiskThreads/DiskThreads.h +++ b/src/DiskIO/DiskThreads/DiskThreads.h @@ -12,8 +12,8 @@ * Internal declarations for the DiskThreads routines */ -#ifndef __DISKTHREADS_H__ -#define __DISKTHREADS_H__ +#ifndef SQUID_SRC_DISKIO_DISKTHREADS_DISKTHREADS_H +#define SQUID_SRC_DISKIO_DISKTHREADS_DISKTHREADS_H #include "dlink.h" #include "mem/forward.h" @@ -141,5 +141,5 @@ public: extern AIOCounts squidaio_counts; extern dlink_list used_list; -#endif +#endif /* SQUID_SRC_DISKIO_DISKTHREADS_DISKTHREADS_H */ diff --git a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.h b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.h index 6953ebe0a9..42afcd242d 100644 --- a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.h +++ b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.h @@ -8,8 +8,8 @@ /* DEBUG: section 79 Disk IO Routines */ -#ifndef SQUID_DISKTHREADSDISKFILE_H -#define SQUID_DISKTHREADSDISKFILE_H +#ifndef SQUID_SRC_DISKIO_DISKTHREADS_DISKTHREADSDISKFILE_H +#define SQUID_SRC_DISKIO_DISKTHREADS_DISKTHREADSDISKFILE_H #include "cbdata.h" #include "DiskIO/DiskFile.h" @@ -82,5 +82,5 @@ template IoResult IOResult(RefCount aRequest, RefCount aFile) { return IoResult(aFile, aRequest);} -#endif /* SQUID_DISKTHREADSDISKFILE_H */ +#endif /* SQUID_SRC_DISKIO_DISKTHREADS_DISKTHREADSDISKFILE_H */ diff --git a/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.h b/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.h index 289f3f8304..97492e1d59 100644 --- a/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.h +++ b/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_DISKTHREADSDISKIOMODULE_H -#define SQUID_DISKTHREADSDISKIOMODULE_H +#ifndef SQUID_SRC_DISKIO_DISKTHREADS_DISKTHREADSDISKIOMODULE_H +#define SQUID_SRC_DISKIO_DISKTHREADS_DISKTHREADSDISKIOMODULE_H #include "DiskIO/DiskIOModule.h" @@ -27,5 +27,5 @@ private: static DiskThreadsDiskIOModule Instance; }; -#endif /* SQUID_DISKTHREADSDISKIOMODULE_H */ +#endif /* SQUID_SRC_DISKIO_DISKTHREADS_DISKTHREADSDISKIOMODULE_H */ diff --git a/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.h b/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.h index d8076b6e3d..9d4b78af0e 100644 --- a/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.h +++ b/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.h @@ -8,8 +8,8 @@ /* DEBUG: section 79 Squid-side Disk I/O functions. */ -#ifndef __STORE_DISKTHREADEDIOSTRATEGY_H__ -#define __STORE_DISKTHREADEDIOSTRATEGY_H__ +#ifndef SQUID_SRC_DISKIO_DISKTHREADS_DISKTHREADSIOSTRATEGY_H +#define SQUID_SRC_DISKIO_DISKTHREADS_DISKTHREADSIOSTRATEGY_H #define _AIO_OPEN 0 #define _AIO_READ 1 @@ -43,5 +43,5 @@ private: void registerWithCacheManager(void); }; -#endif +#endif /* SQUID_SRC_DISKIO_DISKTHREADS_DISKTHREADSIOSTRATEGY_H */ diff --git a/src/DiskIO/IORequestor.h b/src/DiskIO/IORequestor.h index 846b570ef9..67ec5c030e 100644 --- a/src/DiskIO/IORequestor.h +++ b/src/DiskIO/IORequestor.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_IOREQUESTOR_H -#define SQUID_IOREQUESTOR_H +#ifndef SQUID_SRC_DISKIO_IOREQUESTOR_H +#define SQUID_SRC_DISKIO_IOREQUESTOR_H #include "base/RefCount.h" @@ -26,5 +26,5 @@ public: virtual void writeCompleted(int errflag, size_t len, RefCount) = 0; }; -#endif /* SQUID_IOREQUESTOR_H */ +#endif /* SQUID_SRC_DISKIO_IOREQUESTOR_H */ diff --git a/src/DiskIO/IpcIo/IpcIoDiskIOModule.h b/src/DiskIO/IpcIo/IpcIoDiskIOModule.h index 741a57b37e..5cd46d6552 100644 --- a/src/DiskIO/IpcIo/IpcIoDiskIOModule.h +++ b/src/DiskIO/IpcIo/IpcIoDiskIOModule.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_IPC_IODISKIOMODULE_H -#define SQUID_IPC_IODISKIOMODULE_H +#ifndef SQUID_SRC_DISKIO_IPCIO_IPCIODISKIOMODULE_H +#define SQUID_SRC_DISKIO_IPCIO_IPCIODISKIOMODULE_H #include "DiskIO/DiskIOModule.h" @@ -26,5 +26,5 @@ private: static IpcIoDiskIOModule Instance; }; -#endif /* SQUID_IPC_IODISKIOMODULE_H */ +#endif /* SQUID_SRC_DISKIO_IPCIO_IPCIODISKIOMODULE_H */ diff --git a/src/DiskIO/IpcIo/IpcIoFile.h b/src/DiskIO/IpcIo/IpcIoFile.h index b01b8ba5dd..2d5f622df2 100644 --- a/src/DiskIO/IpcIo/IpcIoFile.h +++ b/src/DiskIO/IpcIo/IpcIoFile.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_IPC_IOFILE_H -#define SQUID_IPC_IOFILE_H +#ifndef SQUID_SRC_DISKIO_IPCIO_IPCIOFILE_H +#define SQUID_SRC_DISKIO_IPCIO_IPCIOFILE_H #include "base/AsyncCall.h" #include "cbdata.h" @@ -185,5 +185,5 @@ private: IpcIoPendingRequest &operator =(const IpcIoPendingRequest &d); // ditto }; -#endif /* SQUID_IPC_IOFILE_H */ +#endif /* SQUID_SRC_DISKIO_IPCIO_IPCIOFILE_H */ diff --git a/src/DiskIO/IpcIo/IpcIoIOStrategy.h b/src/DiskIO/IpcIo/IpcIoIOStrategy.h index 9433f89739..7c7a3f6289 100644 --- a/src/DiskIO/IpcIo/IpcIoIOStrategy.h +++ b/src/DiskIO/IpcIo/IpcIoIOStrategy.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_IPC_IOIOSTRATEGY_H -#define SQUID_IPC_IOIOSTRATEGY_H +#ifndef SQUID_SRC_DISKIO_IPCIO_IPCIOIOSTRATEGY_H +#define SQUID_SRC_DISKIO_IPCIO_IPCIOIOSTRATEGY_H #include "DiskIO/DiskIOStrategy.h" class IpcIoIOStrategy : public DiskIOStrategy @@ -21,5 +21,5 @@ public: void unlinkFile (char const *) override; }; -#endif /* SQUID_IPC_IOIOSTRATEGY_H */ +#endif /* SQUID_SRC_DISKIO_IPCIO_IPCIOIOSTRATEGY_H */ diff --git a/src/DiskIO/Mmapped/MmappedDiskIOModule.h b/src/DiskIO/Mmapped/MmappedDiskIOModule.h index efa904a1bc..23224edbb5 100644 --- a/src/DiskIO/Mmapped/MmappedDiskIOModule.h +++ b/src/DiskIO/Mmapped/MmappedDiskIOModule.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_MMAPPEDDISKIOMODULE_H -#define SQUID_MMAPPEDDISKIOMODULE_H +#ifndef SQUID_SRC_DISKIO_MMAPPED_MMAPPEDDISKIOMODULE_H +#define SQUID_SRC_DISKIO_MMAPPED_MMAPPEDDISKIOMODULE_H #include "DiskIO/DiskIOModule.h" @@ -26,5 +26,5 @@ private: static MmappedDiskIOModule Instance; }; -#endif /* SQUID_MMAPPEDDISKIOMODULE_H */ +#endif /* SQUID_SRC_DISKIO_MMAPPED_MMAPPEDDISKIOMODULE_H */ diff --git a/src/DiskIO/Mmapped/MmappedFile.h b/src/DiskIO/Mmapped/MmappedFile.h index 27b36affe3..d67e244802 100644 --- a/src/DiskIO/Mmapped/MmappedFile.h +++ b/src/DiskIO/Mmapped/MmappedFile.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_MMAPPEDFILE_H -#define SQUID_MMAPPEDFILE_H +#ifndef SQUID_SRC_DISKIO_MMAPPED_MMAPPEDFILE_H +#define SQUID_SRC_DISKIO_MMAPPED_MMAPPEDFILE_H #include "cbdata.h" #include "DiskIO/DiskFile.h" @@ -48,5 +48,5 @@ private: void doClose(); }; -#endif /* SQUID_MMAPPEDFILE_H */ +#endif /* SQUID_SRC_DISKIO_MMAPPED_MMAPPEDFILE_H */ diff --git a/src/DiskIO/Mmapped/MmappedIOStrategy.h b/src/DiskIO/Mmapped/MmappedIOStrategy.h index 286b87b1de..3c8af59b8b 100644 --- a/src/DiskIO/Mmapped/MmappedIOStrategy.h +++ b/src/DiskIO/Mmapped/MmappedIOStrategy.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_MMAPPEDIOSTRATEGY_H -#define SQUID_MMAPPEDIOSTRATEGY_H +#ifndef SQUID_SRC_DISKIO_MMAPPED_MMAPPEDIOSTRATEGY_H +#define SQUID_SRC_DISKIO_MMAPPED_MMAPPEDIOSTRATEGY_H #include "DiskIO/DiskIOStrategy.h" class MmappedIOStrategy : public DiskIOStrategy @@ -21,5 +21,5 @@ public: void unlinkFile (char const *) override; }; -#endif /* SQUID_MMAPPEDIOSTRATEGY_H */ +#endif /* SQUID_SRC_DISKIO_MMAPPED_MMAPPEDIOSTRATEGY_H */ diff --git a/src/DiskIO/ReadRequest.h b/src/DiskIO/ReadRequest.h index e1b1834208..47f2145246 100644 --- a/src/DiskIO/ReadRequest.h +++ b/src/DiskIO/ReadRequest.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_READREQUEST_H -#define SQUID_READREQUEST_H +#ifndef SQUID_SRC_DISKIO_READREQUEST_H +#define SQUID_SRC_DISKIO_READREQUEST_H #include "base/RefCount.h" #include "cbdata.h" @@ -26,5 +26,5 @@ public: size_t len; }; -#endif /* SQUID_READREQUEST_H */ +#endif /* SQUID_SRC_DISKIO_READREQUEST_H */ diff --git a/src/DiskIO/WriteRequest.h b/src/DiskIO/WriteRequest.h index 8a45431f66..8a69124f6f 100644 --- a/src/DiskIO/WriteRequest.h +++ b/src/DiskIO/WriteRequest.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_WRITEREQUEST_H -#define SQUID_WRITEREQUEST_H +#ifndef SQUID_SRC_DISKIO_WRITEREQUEST_H +#define SQUID_SRC_DISKIO_WRITEREQUEST_H #include "base/RefCount.h" #include "cbdata.h" @@ -28,5 +28,5 @@ public: FREE *free_func; }; -#endif /* SQUID_WRITEREQUEST_H */ +#endif /* SQUID_SRC_DISKIO_WRITEREQUEST_H */ diff --git a/src/Downloader.h b/src/Downloader.h index 1698ba2474..df4f093b60 100644 --- a/src/Downloader.h +++ b/src/Downloader.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_DOWNLOADER_H -#define SQUID_DOWNLOADER_H +#ifndef SQUID_SRC_DOWNLOADER_H +#define SQUID_SRC_DOWNLOADER_H #include "base/AsyncCallbacks.h" #include "base/AsyncJob.h" @@ -87,5 +87,5 @@ private: DownloaderContextPointer context_; }; -#endif +#endif /* SQUID_SRC_DOWNLOADER_H */ diff --git a/src/ETag.h b/src/ETag.h index 1a7b33bac0..a0a058e5dc 100644 --- a/src/ETag.h +++ b/src/ETag.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_ETAG_H -#define _SQUID_ETAG_H +#ifndef SQUID_SRC_ETAG_H +#define SQUID_SRC_ETAG_H /** * ETag support is rudimantal; this struct is likely to change @@ -28,5 +28,5 @@ bool etagIsStrongEqual(const ETag &tag1, const ETag &tag2); /// whether etags are weak-equal bool etagIsWeakEqual(const ETag &tag1, const ETag &tag2); -#endif /* _SQUIDETAG_H */ +#endif /* SQUID_SRC_ETAG_H */ diff --git a/src/EventLoop.h b/src/EventLoop.h index 1f579cb0be..4136b4c823 100644 --- a/src/EventLoop.h +++ b/src/EventLoop.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_EVENTLOOP_H -#define SQUID_EVENTLOOP_H +#ifndef SQUID_SRC_EVENTLOOP_H +#define SQUID_SRC_EVENTLOOP_H #include "time/forward.h" @@ -92,5 +92,5 @@ private: bool runOnceResult; /**< the result from runOnce */ }; -#endif /* SQUID_EVENTLOOP_H */ +#endif /* SQUID_SRC_EVENTLOOP_H */ diff --git a/src/ExternalACL.h b/src/ExternalACL.h index d3b7689d66..5c141ec464 100644 --- a/src/ExternalACL.h +++ b/src/ExternalACL.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_EXTERNALACL_H -#define SQUID_EXTERNALACL_H +#ifndef SQUID_SRC_EXTERNALACL_H +#define SQUID_SRC_EXTERNALACL_H #include "acl/Checklist.h" #include "base/RefCount.h" @@ -71,5 +71,5 @@ void externalAclLookup(ACLChecklist * ch, void *acl_data, EAH * handler, void *d void externalAclInit(void); void externalAclShutdown(void); -#endif /* SQUID_EXTERNALACL_H */ +#endif /* SQUID_SRC_EXTERNALACL_H */ diff --git a/src/ExternalACLEntry.h b/src/ExternalACLEntry.h index aa60e2a938..75988ca977 100644 --- a/src/ExternalACLEntry.h +++ b/src/ExternalACLEntry.h @@ -8,8 +8,8 @@ /* DEBUG: section 82 External ACL */ -#ifndef SQUID_EXTERNALACLENTRY_H -#define SQUID_EXTERNALACLENTRY_H +#ifndef SQUID_SRC_EXTERNALACLENTRY_H +#define SQUID_SRC_EXTERNALACLENTRY_H #include "acl/Acl.h" #include "acl/forward.h" @@ -77,5 +77,5 @@ public: external_acl *def; }; -#endif +#endif /* SQUID_SRC_EXTERNALACLENTRY_H */ diff --git a/src/FadingCounter.h b/src/FadingCounter.h index 99221c9260..e28ef31c23 100644 --- a/src/FadingCounter.h +++ b/src/FadingCounter.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_FADING_COUNTER_H -#define SQUID_FADING_COUNTER_H +#ifndef SQUID_SRC_FADINGCOUNTER_H +#define SQUID_SRC_FADINGCOUNTER_H #include @@ -37,5 +37,5 @@ private: int total; ///< number of remembered events (possibly stale) }; -#endif /* SQUID_FADING_COUNTER_H */ +#endif /* SQUID_SRC_FADINGCOUNTER_H */ diff --git a/src/FileMap.h b/src/FileMap.h index fc80cd18c1..c1599c9bb4 100644 --- a/src/FileMap.h +++ b/src/FileMap.h @@ -8,8 +8,8 @@ /* DEBUG: section 08 Swap File Bitmap */ -#ifndef FILEMAP_H_ -#define FILEMAP_H_ +#ifndef SQUID_SRC_FILEMAP_H +#define SQUID_SRC_FILEMAP_H #include "store/forward.h" @@ -76,5 +76,5 @@ private: unsigned long *bitmap; }; -#endif /* FILEMAP_H_ */ +#endif /* SQUID_SRC_FILEMAP_H */ diff --git a/src/FwdState.h b/src/FwdState.h index bd99f786c9..c435609e3b 100644 --- a/src/FwdState.h +++ b/src/FwdState.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_FORWARD_H -#define SQUID_FORWARD_H +#ifndef SQUID_SRC_FWDSTATE_H +#define SQUID_SRC_FWDSTATE_H #include "base/forward.h" #include "base/JobWait.h" @@ -223,5 +223,5 @@ void getOutgoingAddress(HttpRequest *, const Comm::ConnectionPointer &); /// a collection of previously used persistent Squid-to-peer HTTP(S) connections extern PconnPool *fwdPconnPool; -#endif /* SQUID_FORWARD_H */ +#endif /* SQUID_SRC_FWDSTATE_H */ diff --git a/src/Generic.h b/src/Generic.h index 04f5bcaf4a..b11ba45d7d 100644 --- a/src/Generic.h +++ b/src/Generic.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_GENERIC_H -#define SQUID_GENERIC_H +#ifndef SQUID_SRC_GENERIC_H +#define SQUID_SRC_GENERIC_H #include "dlink.h" @@ -93,5 +93,5 @@ struct PointerPrinter { std::string delimiter; }; -#endif /* SQUID_GENERIC_H */ +#endif /* SQUID_SRC_GENERIC_H */ diff --git a/src/HappyConnOpener.h b/src/HappyConnOpener.h index 83946ee257..4960a620c7 100644 --- a/src/HappyConnOpener.h +++ b/src/HappyConnOpener.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_HAPPYCONNOPENER_H -#define SQUID_HAPPYCONNOPENER_H +#ifndef SQUID_SRC_HAPPYCONNOPENER_H +#define SQUID_SRC_HAPPYCONNOPENER_H #include "base/RefCount.h" #include "comm.h" #include "comm/Connection.h" @@ -245,5 +245,5 @@ private: mutable const char *ranOutOfTimeOrAttemptsEarlier_ = nullptr; }; -#endif +#endif /* SQUID_SRC_HAPPYCONNOPENER_H */ diff --git a/src/HierarchyLogEntry.h b/src/HierarchyLogEntry.h index f6541523b8..5f5d8b13f4 100644 --- a/src/HierarchyLogEntry.h +++ b/src/HierarchyLogEntry.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_HTTPHIERARCHYLOGENTRY_H -#define SQUID_HTTPHIERARCHYLOGENTRY_H +#ifndef SQUID_SRC_HIERARCHYLOGENTRY_H +#define SQUID_SRC_HIERARCHYLOGENTRY_H #include "comm/Connection.h" #include "enums.h" @@ -79,5 +79,5 @@ private: struct timeval totalResponseTime_; ///< cumulative for all peers }; -#endif /* SQUID_HTTPHIERARCHYLOGENTRY_H */ +#endif /* SQUID_SRC_HIERARCHYLOGENTRY_H */ diff --git a/src/HttpBody.h b/src/HttpBody.h index a6310124e8..85c771fb9b 100644 --- a/src/HttpBody.h +++ b/src/HttpBody.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef HTTPBODY_H_ -#define HTTPBODY_H_ +#ifndef SQUID_SRC_HTTPBODY_H +#define SQUID_SRC_HTTPBODY_H #include "sbuf/SBuf.h" @@ -50,5 +50,5 @@ private: SBuf raw_; // body bytes }; -#endif /* HTTPBODY_H_ */ +#endif /* SQUID_SRC_HTTPBODY_H */ diff --git a/src/HttpControlMsg.h b/src/HttpControlMsg.h index 08b4ebe20a..5e6d9c01d5 100644 --- a/src/HttpControlMsg.h +++ b/src/HttpControlMsg.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_HTTP_CONTROL_MSG_H -#define SQUID_HTTP_CONTROL_MSG_H +#ifndef SQUID_SRC_HTTPCONTROLMSG_H +#define SQUID_SRC_HTTPCONTROLMSG_H #include "base/AsyncCall.h" #include "HttpReply.h" @@ -66,5 +66,5 @@ operator <<(std::ostream &os, const HttpControlMsg &msg) return os << msg.reply << ", " << msg.cbSuccess; } -#endif /* SQUID_HTTP_CONTROL_MSG_H */ +#endif /* SQUID_SRC_HTTPCONTROLMSG_H */ diff --git a/src/HttpHdrCc.h b/src/HttpHdrCc.h index d604b555f3..b192b59ec6 100644 --- a/src/HttpHdrCc.h +++ b/src/HttpHdrCc.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_HTTPHDRCC_H -#define SQUID_HTTPHDRCC_H +#ifndef SQUID_SRC_HTTPHDRCC_H +#define SQUID_SRC_HTTPHDRCC_H #include "defines.h" #include "dlink.h" @@ -216,5 +216,5 @@ void httpHdrCcStatDumper(StoreEntry * sentry, int idx, double val, double size, std::ostream & operator<< (std::ostream &, HttpHdrCcType); -#endif /* SQUID_HTTPHDRCC_H */ +#endif /* SQUID_SRC_HTTPHDRCC_H */ diff --git a/src/HttpHdrContRange.h b/src/HttpHdrContRange.h index d048094173..7789c494ff 100644 --- a/src/HttpHdrContRange.h +++ b/src/HttpHdrContRange.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_HTTPHDRCONTRANGE_H -#define SQUID_HTTPHDRCONTRANGE_H +#ifndef SQUID_SRC_HTTPHDRCONTRANGE_H +#define SQUID_SRC_HTTPHDRCONTRANGE_H #include "HttpHeaderRange.h" @@ -37,5 +37,5 @@ void httpHdrContRangePackInto(const HttpHdrContRange * crange, Packable * p); void httpHdrContRangeSet(HttpHdrContRange *, HttpHdrRangeSpec, int64_t); void httpHeaderAddContRange(HttpHeader *, HttpHdrRangeSpec, int64_t); -#endif /* SQUID_HTTPHDRCONTRANGE_H */ +#endif /* SQUID_SRC_HTTPHDRCONTRANGE_H */ diff --git a/src/HttpHdrSc.h b/src/HttpHdrSc.h index df2854784a..236fe79584 100644 --- a/src/HttpHdrSc.h +++ b/src/HttpHdrSc.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_HTTPHDRSURROGATECONTROL_H -#define SQUID_HTTPHDRSURROGATECONTROL_H +#ifndef SQUID_SRC_HTTPHDRSC_H +#define SQUID_SRC_HTTPHDRSC_H #include "http/forward.h" #include "HttpHdrScTarget.h" @@ -45,5 +45,5 @@ HttpHdrSc *httpHdrScParseCreate(String const &); void httpHdrScSetMaxAge(HttpHdrSc *, char const *, int); http_hdr_sc_type &operator++(http_hdr_sc_type &); -#endif /* SQUID_HTTPHDRSURROGATECONTROL_H */ +#endif /* SQUID_SRC_HTTPHDRSC_H */ diff --git a/src/HttpHdrScTarget.h b/src/HttpHdrScTarget.h index c9de100bbb..aed42c6847 100644 --- a/src/HttpHdrScTarget.h +++ b/src/HttpHdrScTarget.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_HTTPHDRSURROGATECONTROLTARGET_H -#define SQUID_HTTPHDRSURROGATECONTROLTARGET_H +#ifndef SQUID_SRC_HTTPHDRSCTARGET_H +#define SQUID_SRC_HTTPHDRSCTARGET_H #include "defines.h" //for bit mask operations #include "http/forward.h" @@ -98,5 +98,5 @@ private: void httpHdrScTargetStatDumper(StoreEntry * sentry, int idx, double val, double size, int count); -#endif /* SQUID_HTTPHDRSURROGATECONTROLTARGET_H */ +#endif /* SQUID_SRC_HTTPHDRSCTARGET_H */ diff --git a/src/HttpHeader.h b/src/HttpHeader.h index 698372c20e..7875793f07 100644 --- a/src/HttpHeader.h +++ b/src/HttpHeader.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_HTTPHEADER_H -#define SQUID_HTTPHEADER_H +#ifndef SQUID_SRC_HTTPHEADER_H +#define SQUID_SRC_HTTPHEADER_H #include "anyp/ProtocolVersion.h" #include "base/LookupTable.h" @@ -205,5 +205,5 @@ void httpHeaderCalcMask(HttpHeaderMask * mask, Http::HdrType http_hdr_type_enums void httpHeaderInitModule(void); -#endif /* SQUID_HTTPHEADER_H */ +#endif /* SQUID_SRC_HTTPHEADER_H */ diff --git a/src/HttpHeaderFieldInfo.h b/src/HttpHeaderFieldInfo.h index da43d015cc..327f8eab34 100644 --- a/src/HttpHeaderFieldInfo.h +++ b/src/HttpHeaderFieldInfo.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_HTTPHEADERFIELDINFO_H_ -#define SQUID_HTTPHEADERFIELDINFO_H_ +#ifndef SQUID_SRC_HTTPHEADERFIELDINFO_H +#define SQUID_SRC_HTTPHEADERFIELDINFO_H #include "http/RegisteredHeaders.h" #include "HttpHeaderFieldStat.h" @@ -25,5 +25,5 @@ public: HttpHeaderFieldStat stat; }; -#endif /* SQUID_HTTPHEADERFIELDINFO_H_ */ +#endif /* SQUID_SRC_HTTPHEADERFIELDINFO_H */ diff --git a/src/HttpHeaderFieldStat.h b/src/HttpHeaderFieldStat.h index e79963367d..49144a6cd8 100644 --- a/src/HttpHeaderFieldStat.h +++ b/src/HttpHeaderFieldStat.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_HTTPHEADERFIELDSTAT_H_ -#define SQUID_HTTPHEADERFIELDSTAT_H_ +#ifndef SQUID_SRC_HTTPHEADERFIELDSTAT_H +#define SQUID_SRC_HTTPHEADERFIELDSTAT_H /// per field statistics. Currently a POD. class HttpHeaderFieldStat @@ -22,5 +22,5 @@ public: int repCount; /* number of repetitons */ }; -#endif /* SQUID_HTTPHEADERFIELDSTAT_H_ */ +#endif /* SQUID_SRC_HTTPHEADERFIELDSTAT_H */ diff --git a/src/HttpHeaderMask.h b/src/HttpHeaderMask.h index 2b56534a62..4c4f20391c 100644 --- a/src/HttpHeaderMask.h +++ b/src/HttpHeaderMask.h @@ -6,13 +6,13 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_HTTPHEADERMASK_H -#define SQUID_HTTPHEADERMASK_H +#ifndef SQUID_SRC_HTTPHEADERMASK_H +#define SQUID_SRC_HTTPHEADERMASK_H /* big mask for http headers */ typedef char HttpHeaderMask[12]; void httpHeaderMaskInit(HttpHeaderMask * mask, int value); -#endif /* SQUID_HTTPHEADERMASK_H */ +#endif /* SQUID_SRC_HTTPHEADERMASK_H */ diff --git a/src/HttpHeaderRange.h b/src/HttpHeaderRange.h index f45b9970c2..bb3200c003 100644 --- a/src/HttpHeaderRange.h +++ b/src/HttpHeaderRange.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_HTTPHEADERRANGE_H -#define SQUID_HTTPHEADERRANGE_H +#ifndef SQUID_SRC_HTTPHEADERRANGE_H +#define SQUID_SRC_HTTPHEADERRANGE_H #include "base/Range.h" #include "mem/forward.h" @@ -107,5 +107,5 @@ public: bool valid = false; }; -#endif /* SQUID_HTTPHEADERRANGE_H */ +#endif /* SQUID_SRC_HTTPHEADERRANGE_H */ diff --git a/src/HttpHeaderStat.h b/src/HttpHeaderStat.h index 28d3e1dee2..79750e30d3 100644 --- a/src/HttpHeaderStat.h +++ b/src/HttpHeaderStat.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef HTTPHEADERSTAT_H_ -#define HTTPHEADERSTAT_H_ +#ifndef SQUID_SRC_HTTPHEADERSTAT_H +#define SQUID_SRC_HTTPHEADERSTAT_H #include "HttpHdrCc.h" #include "HttpHdrSc.h" @@ -67,5 +67,5 @@ public: int busyDestroyedCount; }; -#endif /* HTTPHEADERSTAT_H_ */ +#endif /* SQUID_SRC_HTTPHEADERSTAT_H */ diff --git a/src/HttpHeaderTools.h b/src/HttpHeaderTools.h index 7c0e073dd6..9b6cd932a6 100644 --- a/src/HttpHeaderTools.h +++ b/src/HttpHeaderTools.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_HTTPHEADERTOOLS_H -#define SQUID_HTTPHEADERTOOLS_H +#ifndef SQUID_SRC_HTTPHEADERTOOLS_H +#define SQUID_SRC_HTTPHEADERTOOLS_H #include "acl/forward.h" #include "format/Format.h" @@ -133,5 +133,5 @@ const char *getStringPrefix(const char *str, size_t len); void httpHdrMangleList(HttpHeader *, HttpRequest *, const AccessLogEntryPointer &al, req_or_rep_t req_or_rep); -#endif +#endif /* SQUID_SRC_HTTPHEADERTOOLS_H */ diff --git a/src/HttpReply.h b/src/HttpReply.h index cf4cacce41..2bfc009c81 100644 --- a/src/HttpReply.h +++ b/src/HttpReply.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_HTTPREPLY_H -#define SQUID_HTTPREPLY_H +#ifndef SQUID_SRC_HTTPREPLY_H +#define SQUID_SRC_HTTPREPLY_H #include "http/StatusLine.h" #include "HttpBody.h" @@ -168,5 +168,5 @@ protected: bool parseFirstLine(const char *start, const char *end) override; }; -#endif /* SQUID_HTTPREPLY_H */ +#endif /* SQUID_SRC_HTTPREPLY_H */ diff --git a/src/HttpRequest.h b/src/HttpRequest.h index c9fb92d86d..9aace1bcc5 100644 --- a/src/HttpRequest.h +++ b/src/HttpRequest.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_HTTPREQUEST_H -#define SQUID_HTTPREQUEST_H +#ifndef SQUID_SRC_HTTPREQUEST_H +#define SQUID_SRC_HTTPREQUEST_H #include "anyp/Uri.h" #include "base/CbcPointer.h" @@ -289,5 +289,5 @@ const Ip::Address *FindListeningPortAddress(const HttpRequest *, const AccessLog /// nil parameter(s) indicate missing caller information and are handled safely unsigned short FindListeningPortNumber(const HttpRequest *, const AccessLogEntry *); -#endif /* SQUID_HTTPREQUEST_H */ +#endif /* SQUID_SRC_HTTPREQUEST_H */ diff --git a/src/HttpUpgradeProtocolAccess.h b/src/HttpUpgradeProtocolAccess.h index 078282a87d..adb3326079 100644 --- a/src/HttpUpgradeProtocolAccess.h +++ b/src/HttpUpgradeProtocolAccess.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_HTTP_UPGRADE_H -#define SQUID_HTTP_UPGRADE_H +#ifndef SQUID_SRC_HTTPUPGRADEPROTOCOLACCESS_H +#define SQUID_SRC_HTTPUPGRADEPROTOCOLACCESS_H #include "acl/forward.h" #include "sbuf/SBuf.h" @@ -114,5 +114,5 @@ HttpUpgradeProtocolAccess::forApplicable(const ProtocolView &offer, const Visito (void)visitor(ProtoOther, other); } -#endif /* SQUID_HTTP_UPGRADE_H */ +#endif /* SQUID_SRC_HTTPUPGRADEPROTOCOLACCESS_H */ diff --git a/src/ICP.h b/src/ICP.h index e74082d8d1..cb13c1c629 100644 --- a/src/ICP.h +++ b/src/ICP.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ICP_H -#define SQUID_ICP_H +#ifndef SQUID_SRC_ICP_H +#define SQUID_SRC_ICP_H /** \defgroup ServerProtocolICPAPI ICP @@ -125,5 +125,5 @@ int icpSetCacheKey(const cache_key * key); /// \ingroup ServerProtocolICPAPI const cache_key *icpGetCacheKey(const char *url, int reqnum); -#endif /* SQUID_ICP_H */ +#endif /* SQUID_SRC_ICP_H */ diff --git a/src/Instance.h b/src/Instance.h index af3c9d53b4..c2e44e7742 100644 --- a/src/Instance.h +++ b/src/Instance.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_INSTANCE_H -#define SQUID_INSTANCE_H +#ifndef SQUID_SRC_INSTANCE_H +#define SQUID_SRC_INSTANCE_H #if HAVE_SYS_TYPES_H #include @@ -32,5 +32,5 @@ pid_t Other(); } // namespace Instance -#endif +#endif /* SQUID_SRC_INSTANCE_H */ diff --git a/src/IoStats.h b/src/IoStats.h index f01787ec5a..f86f9c18e1 100644 --- a/src/IoStats.h +++ b/src/IoStats.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_IOSTATS_H_ -#define SQUID_IOSTATS_H_ +#ifndef SQUID_SRC_IOSTATS_H +#define SQUID_SRC_IOSTATS_H /// IO statistics. Currently a POD. class IoStats @@ -25,5 +25,5 @@ public: Http, Ftp; }; -#endif /* SQUID_IOSTATS_H_ */ +#endif /* SQUID_SRC_IOSTATS_H */ diff --git a/src/LoadableModule.h b/src/LoadableModule.h index 165fccda69..3c24675815 100644 --- a/src/LoadableModule.h +++ b/src/LoadableModule.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_LOADABLE_MODULE_H -#define SQUID_LOADABLE_MODULE_H +#ifndef SQUID_SRC_LOADABLEMODULE_H +#define SQUID_SRC_LOADABLEMODULE_H #include "SquidString.h" @@ -36,5 +36,5 @@ private: const char *errorMsg(); }; -#endif +#endif /* SQUID_SRC_LOADABLEMODULE_H */ diff --git a/src/LoadableModules.h b/src/LoadableModules.h index 4d656afd91..25e1624b4d 100644 --- a/src/LoadableModules.h +++ b/src/LoadableModules.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_LOADABLE_MODULES_H -#define SQUID_LOADABLE_MODULES_H +#ifndef SQUID_SRC_LOADABLEMODULES_H +#define SQUID_SRC_LOADABLEMODULES_H // TODO: add reporting for cachemgr // TODO: add reconfiguration support @@ -15,5 +15,5 @@ class wordlist; void LoadableModulesConfigure(const wordlist *names); -#endif /* SQUID_LOADABLE_MODULES_H */ +#endif /* SQUID_SRC_LOADABLEMODULES_H */ diff --git a/src/LogTags.h b/src/LogTags.h index 8e3dd5327e..d101c81a99 100644 --- a/src/LogTags.h +++ b/src/LogTags.h @@ -103,5 +103,5 @@ inline LogTags_ot &operator++ (LogTags_ot &aLogType) return aLogType; } -#endif +#endif /* SQUID_SRC_LOGTAGS_H */ diff --git a/src/MemBuf.h b/src/MemBuf.h index 7c4024420d..39a2095bd4 100644 --- a/src/MemBuf.h +++ b/src/MemBuf.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_MEMBUF_H -#define SQUID_MEMBUF_H +#ifndef SQUID_SRC_MEMBUF_H +#define SQUID_SRC_MEMBUF_H #include "base/Packable.h" #include "cbdata.h" @@ -159,5 +159,5 @@ public: /** returns free() function to be used, _freezes_ the object! */ void memBufReport(MemBuf * mb); -#endif /* SQUID_MEMBUF_H */ +#endif /* SQUID_SRC_MEMBUF_H */ diff --git a/src/MemObject.h b/src/MemObject.h index bed63b01ec..b0115669c7 100644 --- a/src/MemObject.h +++ b/src/MemObject.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_MEMOBJECT_H -#define SQUID_MEMOBJECT_H +#ifndef SQUID_SRC_MEMOBJECT_H +#define SQUID_SRC_MEMOBJECT_H #include "base/DelayedAsyncCalls.h" #include "dlink.h" @@ -228,5 +228,5 @@ private: /** global current memory removal policy */ extern RemovalPolicy *mem_policy; -#endif /* SQUID_MEMOBJECT_H */ +#endif /* SQUID_SRC_MEMOBJECT_H */ diff --git a/src/MemStore.h b/src/MemStore.h index b795254b94..fe27008fc0 100644 --- a/src/MemStore.h +++ b/src/MemStore.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_MEMSTORE_H -#define SQUID_MEMSTORE_H +#ifndef SQUID_SRC_MEMSTORE_H +#define SQUID_SRC_MEMSTORE_H #include "ipc/mem/Page.h" #include "ipc/mem/PageStack.h" @@ -123,5 +123,5 @@ private: // to check/update memory cache separately from the disk cache. And same API // would hurt because we can support synchronous get/put, unlike the disks. -#endif /* SQUID_MEMSTORE_H */ +#endif /* SQUID_SRC_MEMSTORE_H */ diff --git a/src/MessageBucket.h b/src/MessageBucket.h index 14781d8f0b..9cdea7c9d2 100644 --- a/src/MessageBucket.h +++ b/src/MessageBucket.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef MESSAGEBUCKET_H -#define MESSAGEBUCKET_H +#ifndef SQUID_SRC_MESSAGEBUCKET_H +#define SQUID_SRC_MESSAGEBUCKET_H #if USE_DELAY_POOLS @@ -37,5 +37,5 @@ private: #endif /* USE_DELAY_POOLS */ -#endif +#endif /* SQUID_SRC_MESSAGEBUCKET_H */ diff --git a/src/MessageDelayPools.h b/src/MessageDelayPools.h index e6567ed1f7..011d2f8426 100644 --- a/src/MessageDelayPools.h +++ b/src/MessageDelayPools.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef MESSAGEDELAYPOOLS_H -#define MESSAGEDELAYPOOLS_H +#ifndef SQUID_SRC_MESSAGEDELAYPOOLS_H +#define SQUID_SRC_MESSAGEDELAYPOOLS_H #if USE_DELAY_POOLS @@ -131,5 +131,5 @@ parse_response_delay_pool_access(MessageDelayConfig * cfg) } #endif -#endif +#endif /* SQUID_SRC_MESSAGEDELAYPOOLS_H */ diff --git a/src/MessageSizes.h b/src/MessageSizes.h index ea15adc610..e906756e5b 100644 --- a/src/MessageSizes.h +++ b/src/MessageSizes.h @@ -27,5 +27,5 @@ public: uint64_t messageTotal() const {return header + payloadData;} }; -#endif /* SQUID_SRC_MESSAGESIZES_H */ +#endif /* SQUID_SRC_MESSAGESIZES_H */ diff --git a/src/NeighborTypeDomainList.h b/src/NeighborTypeDomainList.h index 263e346c4c..bf3480f7a2 100644 --- a/src/NeighborTypeDomainList.h +++ b/src/NeighborTypeDomainList.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_NEIGHBORTYPEDOMAINLIST_H_ -#define SQUID_NEIGHBORTYPEDOMAINLIST_H_ +#ifndef SQUID_SRC_NEIGHBORTYPEDOMAINLIST_H +#define SQUID_SRC_NEIGHBORTYPEDOMAINLIST_H /// representation of a neighbor_type_domain configuration directive. A POD class NeighborTypeDomainList @@ -18,5 +18,5 @@ public: NeighborTypeDomainList *next; }; -#endif /* SQUID_NEIGHBORTYPEDOMAINLIST_H_ */ +#endif /* SQUID_SRC_NEIGHBORTYPEDOMAINLIST_H */ diff --git a/src/Notes.h b/src/Notes.h index 0c6229e23d..ff7e080761 100644 --- a/src/Notes.h +++ b/src/Notes.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_NOTES_H -#define SQUID_NOTES_H +#ifndef SQUID_SRC_NOTES_H +#define SQUID_SRC_NOTES_H #include "acl/forward.h" #include "base/RefCount.h" @@ -262,5 +262,5 @@ private: Entries entries; ///< The key/value pair entries }; -#endif +#endif /* SQUID_SRC_NOTES_H */ diff --git a/src/NullDelayId.h b/src/NullDelayId.h index 02f29d973c..8bfbf70281 100644 --- a/src/NullDelayId.h +++ b/src/NullDelayId.h @@ -8,8 +8,8 @@ /* DEBUG: section 77 Delay Pools */ -#ifndef NULLDELAYID_H -#define NULLDELAYID_H +#ifndef SQUID_SRC_NULLDELAYID_H +#define SQUID_SRC_NULLDELAYID_H #if USE_DELAY_POOLS #include "DelayIdComposite.h" @@ -24,5 +24,5 @@ public: void bytesIn(int) override {} }; #endif -#endif /* NULLDELAYID_H */ +#endif /* SQUID_SRC_NULLDELAYID_H */ diff --git a/src/Parsing.h b/src/Parsing.h index d2ddab5534..3df48caacf 100644 --- a/src/Parsing.h +++ b/src/Parsing.h @@ -8,8 +8,8 @@ /* DEBUG: section 03 Configuration File Parsing */ -#ifndef SQUID_PARSING_H -#define SQUID_PARSING_H +#ifndef SQUID_SRC_PARSING_H +#define SQUID_SRC_PARSING_H #include "ip/Address.h" @@ -60,5 +60,5 @@ bool StringToInt64(const char *str, int64_t &result, const char **p, int base); */ bool GetHostWithPort(char *token, Ip::Address *ipa); -#endif /* SQUID_PARSING_H */ +#endif /* SQUID_SRC_PARSING_H */ diff --git a/src/PeerDigest.h b/src/PeerDigest.h index 2864e35fdf..191cba9e29 100644 --- a/src/PeerDigest.h +++ b/src/PeerDigest.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_PEERDIGEST_H -#define SQUID_PEERDIGEST_H +#ifndef SQUID_SRC_PEERDIGEST_H +#define SQUID_SRC_PEERDIGEST_H #if USE_CACHE_DIGESTS @@ -122,5 +122,5 @@ void peerDigestStatsReport(const PeerDigest * pd, StoreEntry * e); #endif /* USE_CACHE_DIGESTS */ -#endif /* SQUID_PEERDIGEST_H */ +#endif /* SQUID_SRC_PEERDIGEST_H */ diff --git a/src/PeerPoolMgr.h b/src/PeerPoolMgr.h index 6f487f54a5..59a4896fab 100644 --- a/src/PeerPoolMgr.h +++ b/src/PeerPoolMgr.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_PEERPOOLMGR_H -#define SQUID_PEERPOOLMGR_H +#ifndef SQUID_SRC_PEERPOOLMGR_H +#define SQUID_SRC_PEERPOOLMGR_H #include "base/AsyncJob.h" #include "base/JobWait.h" @@ -71,5 +71,5 @@ private: unsigned int addrUsed; ///< counter for cycling through peer addresses }; -#endif /* SQUID_PEERPOOLMGR_H */ +#endif /* SQUID_SRC_PEERPOOLMGR_H */ diff --git a/src/PeerSelectState.h b/src/PeerSelectState.h index 15250d48c4..86c168dfed 100644 --- a/src/PeerSelectState.h +++ b/src/PeerSelectState.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_PEERSELECTSTATE_H -#define SQUID_PEERSELECTSTATE_H +#ifndef SQUID_SRC_PEERSELECTSTATE_H +#define SQUID_SRC_PEERSELECTSTATE_H #include "AccessLogEntry.h" #include "acl/Checklist.h" @@ -166,5 +166,5 @@ private: const InstanceId id; ///< unique identification in worker log }; -#endif /* SQUID_PEERSELECTSTATE_H */ +#endif /* SQUID_SRC_PEERSELECTSTATE_H */ diff --git a/src/PingData.h b/src/PingData.h index b5a645321f..ecab34cb86 100644 --- a/src/PingData.h +++ b/src/PingData.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_PINGDATA_H -#define SQUID_PINGDATA_H +#ifndef SQUID_SRC_PINGDATA_H +#define SQUID_SRC_PINGDATA_H #include "mem/PoolingAllocator.h" @@ -49,5 +49,5 @@ private: WaitingPeerSelectorPosition monitorRegistration; }; -#endif /* SQUID_PINGDATA_H */ +#endif /* SQUID_SRC_PINGDATA_H */ diff --git a/src/RefreshPattern.h b/src/RefreshPattern.h index 85b8a8500f..b49a769787 100644 --- a/src/RefreshPattern.h +++ b/src/RefreshPattern.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_REFRESHPATTERN_H_ -#define SQUID_REFRESHPATTERN_H_ +#ifndef SQUID_SRC_REFRESHPATTERN_H +#define SQUID_SRC_REFRESHPATTERN_H #include "base/RegexPattern.h" @@ -99,5 +99,5 @@ operator <<(std::ostream &os, const RefreshPattern &r) return os; } -#endif /* SQUID_REFRESHPATTERN_H_ */ +#endif /* SQUID_SRC_REFRESHPATTERN_H */ diff --git a/src/RemovalPolicy.h b/src/RemovalPolicy.h index cea63f4168..3ebdd59c19 100644 --- a/src/RemovalPolicy.h +++ b/src/RemovalPolicy.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_REMOVALPOLICY_H -#define SQUID_REMOVALPOLICY_H +#ifndef SQUID_SRC_REMOVALPOLICY_H +#define SQUID_SRC_REMOVALPOLICY_H #include "cbdata.h" @@ -79,5 +79,5 @@ RemovalPolicy *createRemovalPolicy(RemovalPolicySettings * settings); typedef RemovalPolicy *REMOVALPOLICYCREATE(wordlist * args); -#endif /* SQUID_REMOVALPOLICY_H */ +#endif /* SQUID_SRC_REMOVALPOLICY_H */ diff --git a/src/RequestFlags.h b/src/RequestFlags.h index ceef9213e5..07844d9d57 100644 --- a/src/RequestFlags.h +++ b/src/RequestFlags.h @@ -8,8 +8,8 @@ /* DEBUG: section 73 HTTP Request */ -#ifndef SQUID_REQUESTFLAGS_H_ -#define SQUID_REQUESTFLAGS_H_ +#ifndef SQUID_SRC_REQUESTFLAGS_H +#define SQUID_SRC_REQUESTFLAGS_H #include "base/SupportOrVeto.h" @@ -141,5 +141,5 @@ public: void disableCacheUse(const char *reason); }; -#endif /* SQUID_REQUESTFLAGS_H_ */ +#endif /* SQUID_SRC_REQUESTFLAGS_H */ diff --git a/src/ResolvedPeers.h b/src/ResolvedPeers.h index a5ae6d0832..a68900fcb9 100644 --- a/src/ResolvedPeers.h +++ b/src/ResolvedPeers.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_RESOLVEDPEERS_H -#define SQUID_RESOLVEDPEERS_H +#ifndef SQUID_SRC_RESOLVEDPEERS_H +#define SQUID_SRC_RESOLVEDPEERS_H #include "base/RefCount.h" #include "comm/forward.h" @@ -162,5 +162,5 @@ operator <<(std::ostream &os, const PeerConnectionPointer &dest) return os; } -#endif /* SQUID_RESOLVEDPEERS_H */ +#endif /* SQUID_SRC_RESOLVEDPEERS_H */ diff --git a/src/SBufStatsAction.h b/src/SBufStatsAction.h index 086cc16be6..8e3922216d 100644 --- a/src/SBufStatsAction.h +++ b/src/SBufStatsAction.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SBUFEXTRAS_H -#define SQUID_SBUFEXTRAS_H +#ifndef SQUID_SRC_SBUFSTATSACTION_H +#define SQUID_SRC_SBUFSTATSACTION_H #include "mgr/Action.h" #include "sbuf/SBuf.h" @@ -41,5 +41,5 @@ private: StatHist mbsizesatdestruct; }; -#endif /* SQUID_SBUFSTATSACTION_H */ +#endif /* SQUID_SRC_SBUFSTATSACTION_H */ diff --git a/src/SnmpRequest.h b/src/SnmpRequest.h index 3b1403b426..f32fda598a 100644 --- a/src/SnmpRequest.h +++ b/src/SnmpRequest.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SNMPREQUEST_H_ -#define SQUID_SNMPREQUEST_H_ +#ifndef SQUID_SRC_SNMPREQUEST_H +#define SQUID_SRC_SNMPREQUEST_H #if SQUID_SNMP #include "snmp_session.h" @@ -34,5 +34,5 @@ public: #endif /* SQUID_SNMP */ -#endif /* SQUID_SNMPREQUEST_H_ */ +#endif /* SQUID_SRC_SNMPREQUEST_H */ diff --git a/src/SquidConfig.h b/src/SquidConfig.h index 76f22d1ad6..7cb949b388 100644 --- a/src/SquidConfig.h +++ b/src/SquidConfig.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SQUIDCONFIG_H_ -#define SQUID_SQUIDCONFIG_H_ +#ifndef SQUID_SRC_SQUIDCONFIG_H +#define SQUID_SRC_SQUIDCONFIG_H #include "acl/forward.h" #include "base/RefCount.h" @@ -572,5 +572,5 @@ public: extern SquidConfig2 Config2; -#endif /* SQUID_SQUIDCONFIG_H_ */ +#endif /* SQUID_SRC_SQUIDCONFIG_H */ diff --git a/src/SquidIpc.h b/src/SquidIpc.h index e0baaeab4a..edf04b3aa7 100644 --- a/src/SquidIpc.h +++ b/src/SquidIpc.h @@ -8,8 +8,8 @@ /* DEBUG: section 54 Interprocess Communication */ -#ifndef SQUID_SQUIDIPC_H_ -#define SQUID_SQUIDIPC_H_ +#ifndef SQUID_SRC_SQUIDIPC_H +#define SQUID_SRC_SQUIDIPC_H namespace Ip { @@ -24,5 +24,5 @@ pid_t ipcCreate(int type, int *wfd, void **hIpc); -#endif /* SQUID_SQUIDIPC_H_ */ +#endif /* SQUID_SRC_SQUIDIPC_H */ diff --git a/src/SquidMath.h b/src/SquidMath.h index 23b7525a04..867f7fee63 100644 --- a/src/SquidMath.h +++ b/src/SquidMath.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_SQUIDMATH_H -#define _SQUID_SRC_SQUIDMATH_H +#ifndef SQUID_SRC_SQUIDMATH_H +#define SQUID_SRC_SQUIDMATH_H #include "base/forward.h" #include "base/TypeTraits.h" @@ -188,5 +188,5 @@ NaturalCast(const Source s) return NaturalSum(s).value(); } -#endif /* _SQUID_SRC_SQUIDMATH_H */ +#endif /* SQUID_SRC_SQUIDMATH_H */ diff --git a/src/SquidString.h b/src/SquidString.h index ffb215fa5e..22f5ec311d 100644 --- a/src/SquidString.h +++ b/src/SquidString.h @@ -8,8 +8,8 @@ /* DEBUG: section 67 String */ -#ifndef SQUID_STRING_H -#define SQUID_STRING_H +#ifndef SQUID_SRC_SQUIDSTRING_H +#define SQUID_SRC_SQUIDSTRING_H #include "base/TextException.h" #include "debug/Stream.h" @@ -185,5 +185,5 @@ int stringHasWhitespace(const char *); int stringHasCntl(const char *); char *strwordtok(char *buf, char **t); -#endif /* SQUID_STRING_H */ +#endif /* SQUID_SRC_SQUIDSTRING_H */ diff --git a/src/StatCounters.h b/src/StatCounters.h index 4d9c5c66f9..9afba25ecc 100644 --- a/src/StatCounters.h +++ b/src/StatCounters.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef STATCOUNTERS_H_ -#define STATCOUNTERS_H_ +#ifndef SQUID_SRC_STATCOUNTERS_H +#define SQUID_SRC_STATCOUNTERS_H #include "base/ByteCounter.h" #include "StatHist.h" @@ -169,5 +169,5 @@ public: extern StatCounters statCounter; -#endif /* STATCOUNTERS_H_ */ +#endif /* SQUID_SRC_STATCOUNTERS_H */ diff --git a/src/StatHist.h b/src/StatHist.h index f48c1b1eec..b50c139bbf 100644 --- a/src/StatHist.h +++ b/src/StatHist.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef STATHIST_H_ -#define STATHIST_H_ +#ifndef SQUID_SRC_STATHIST_H +#define SQUID_SRC_STATHIST_H /* for StoreEntry */ #include "Store.h" @@ -138,5 +138,5 @@ StatHist::operator =(const StatHist & src) return *this; } -#endif /* STATHIST_H_ */ +#endif /* SQUID_SRC_STATHIST_H */ diff --git a/src/Store.h b/src/Store.h index 3b74f07a6e..4650456fa4 100644 --- a/src/Store.h +++ b/src/Store.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_STORE_H -#define SQUID_STORE_H +#ifndef SQUID_SRC_STORE_H +#define SQUID_SRC_STORE_H #include "base/DelayedAsyncCalls.h" #include "base/Packable.h" @@ -463,5 +463,5 @@ extern FREE destroyStoreEntry; /// \ingroup StoreAPI void storeGetMemSpace(int size); -#endif /* SQUID_STORE_H */ +#endif /* SQUID_SRC_STORE_H */ diff --git a/src/StoreClient.h b/src/StoreClient.h index 4bd6965b0e..b0a83c3462 100644 --- a/src/StoreClient.h +++ b/src/StoreClient.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_STORECLIENT_H -#define SQUID_STORECLIENT_H +#ifndef SQUID_SRC_STORECLIENT_H +#define SQUID_SRC_STORECLIENT_H #include "acl/ChecklistFiller.h" #include "base/AsyncCall.h" @@ -229,5 +229,5 @@ int storeUnregister(store_client * sc, StoreEntry * e, void *data); int storePendingNClients(const StoreEntry * e); int storeClientIsThisAClient(store_client * sc, void *someClient); -#endif /* SQUID_STORECLIENT_H */ +#endif /* SQUID_SRC_STORECLIENT_H */ diff --git a/src/StoreFileSystem.h b/src/StoreFileSystem.h index f5d04e02df..f08cc45c0d 100644 --- a/src/StoreFileSystem.h +++ b/src/StoreFileSystem.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_STOREFILESYSTEM_H -#define SQUID_STOREFILESYSTEM_H +#ifndef SQUID_SRC_STOREFILESYSTEM_H +#define SQUID_SRC_STOREFILESYSTEM_H #include "base/TypeTraits.h" #include "store/forward.h" @@ -111,5 +111,5 @@ private: // TODO: Kill this typedef! typedef StoreFileSystem storefs_entry_t; -#endif /* SQUID_STOREFILESYSTEM_H */ +#endif /* SQUID_SRC_STOREFILESYSTEM_H */ diff --git a/src/StoreIOBuffer.h b/src/StoreIOBuffer.h index d473ac58c7..b27bc9c087 100644 --- a/src/StoreIOBuffer.h +++ b/src/StoreIOBuffer.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_STOREIOBUFFER_H -#define SQUID_STOREIOBUFFER_H +#ifndef SQUID_SRC_STOREIOBUFFER_H +#define SQUID_SRC_STOREIOBUFFER_H #include "base/Range.h" #include "MemBuf.h" @@ -67,5 +67,5 @@ operator <<(std::ostream &os, const StoreIOBuffer &b) (void*)b.data << (b.flags.error ? ", ERR" : "") << ')'; } -#endif /* SQUID_STOREIOBUFFER_H */ +#endif /* SQUID_SRC_STOREIOBUFFER_H */ diff --git a/src/StoreIOState.h b/src/StoreIOState.h index a3d56d050a..eef0bc073c 100644 --- a/src/StoreIOState.h +++ b/src/StoreIOState.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_STOREIOSTATE_H -#define SQUID_STOREIOSTATE_H +#ifndef SQUID_SRC_STOREIOSTATE_H +#define SQUID_SRC_STOREIOSTATE_H #include "base/RefCount.h" #include "cbdata.h" @@ -92,5 +92,5 @@ void storeClose(StoreIOState::Pointer, int how); void storeRead(StoreIOState::Pointer, char *, size_t, off_t, StoreIOState::STRCB *, void *); void storeIOWrite(StoreIOState::Pointer, char const *, size_t, off_t, FREE *); -#endif /* SQUID_STOREIOSTATE_H */ +#endif /* SQUID_SRC_STOREIOSTATE_H */ diff --git a/src/StoreSearch.h b/src/StoreSearch.h index 3b87a7b639..2ffd05de19 100644 --- a/src/StoreSearch.h +++ b/src/StoreSearch.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_STORESEARCH_H -#define SQUID_STORESEARCH_H +#ifndef SQUID_SRC_STORESEARCH_H +#define SQUID_SRC_STORESEARCH_H #include "base/RefCount.h" #include "Store.h" @@ -42,5 +42,5 @@ public: typedef RefCount StoreSearchPointer; -#endif /* SQUID_STORESEARCH_H */ +#endif /* SQUID_SRC_STORESEARCH_H */ diff --git a/src/StoreStats.h b/src/StoreStats.h index ab746fdd0b..2abf4fcd4b 100644 --- a/src/StoreStats.h +++ b/src/StoreStats.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_STORE_STATS_H -#define SQUID_STORE_STATS_H +#ifndef SQUID_SRC_STORESTATS_H +#define SQUID_SRC_STORESTATS_H /// High-level store statistics used by mgr:info action. Used inside PODs! class StoreInfoStats @@ -67,5 +67,5 @@ public: } create; ///< cache_dir selection and disk entry creation stats }; -#endif /* SQUID_STORE_STATS_H */ +#endif /* SQUID_SRC_STORESTATS_H */ diff --git a/src/StoreSwapLogData.h b/src/StoreSwapLogData.h index a6d05ae928..883d95fa60 100644 --- a/src/StoreSwapLogData.h +++ b/src/StoreSwapLogData.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_STORESWAPLOGDATA_H -#define SQUID_STORESWAPLOGDATA_H +#ifndef SQUID_SRC_STORESWAPLOGDATA_H +#define SQUID_SRC_STORESWAPLOGDATA_H /** \defgroup FileFormatSwapStateAPI swap.state File Structure @@ -191,5 +191,5 @@ public: int32_t record_size; }; -#endif /* SQUID_STORESWAPLOGDATA_H */ +#endif /* SQUID_SRC_STORESWAPLOGDATA_H */ diff --git a/src/StrList.h b/src/StrList.h index 7ee5b46afc..457d05d846 100644 --- a/src/StrList.h +++ b/src/StrList.h @@ -8,8 +8,8 @@ /* DEBUG: section 66 HTTP Header Tools */ -#ifndef SQUID_STRLIST_H_ -#define SQUID_STRLIST_H_ +#ifndef SQUID_SRC_STRLIST_H +#define SQUID_SRC_STRLIST_H #include "sbuf/forward.h" @@ -37,5 +37,5 @@ int strListGetItem(const String * str, char del, const char **item, int *ilen, c /// \returns the value of the found pair or an empty string. SBuf getListMember(const String &list, const char *key, const char delimiter); -#endif /* SQUID_STRLIST_H_ */ +#endif /* SQUID_SRC_STRLIST_H */ diff --git a/src/TimeOrTag.h b/src/TimeOrTag.h index acab8769d7..c3e8f1ddd6 100644 --- a/src/TimeOrTag.h +++ b/src/TimeOrTag.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_TIMEORTAG_H -#define _SQUID_TIMEORTAG_H +#ifndef SQUID_SRC_TIMEORTAG_H +#define SQUID_SRC_TIMEORTAG_H #include "ETag.h" @@ -22,5 +22,5 @@ public: int valid; /* true if struct is usable */ }; -#endif /* _SQUID_TIMEORTAG_H */ +#endif /* SQUID_SRC_TIMEORTAG_H */ diff --git a/src/Transients.h b/src/Transients.h index e05fdb73bd..ed69ed5299 100644 --- a/src/Transients.h +++ b/src/Transients.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_TRANSIENTS_H -#define SQUID_TRANSIENTS_H +#ifndef SQUID_SRC_TRANSIENTS_H +#define SQUID_SRC_TRANSIENTS_H #include "ipc/mem/Page.h" #include "ipc/mem/PageStack.h" @@ -111,5 +111,5 @@ private: // TODO: Why use Store as a base? We are not really a cache. -#endif /* SQUID_TRANSIENTS_H */ +#endif /* SQUID_SRC_TRANSIENTS_H */ diff --git a/src/XactionInitiator.h b/src/XactionInitiator.h index 68306dcc0d..a2dd22994a 100644 --- a/src/XactionInitiator.h +++ b/src/XactionInitiator.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_XACTION_INITIATOR_H -#define SQUID_SRC_XACTION_INITIATOR_H +#ifndef SQUID_SRC_XACTIONINITIATOR_H +#define SQUID_SRC_XACTIONINITIATOR_H /// identifies a protocol agent or Squid feature initiating transactions class XactionInitiator { @@ -64,5 +64,5 @@ private: Initiator initiator; }; -#endif // SQUID_SRC_XACTION_INITIATOR_H +#endif /* SQUID_SRC_XACTIONINITIATOR_H */ diff --git a/src/XactionStep.h b/src/XactionStep.h index 766f41dbd8..6431695147 100644 --- a/src/XactionStep.h +++ b/src/XactionStep.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_XACTIONSTEPS_H -#define SQUID_XACTIONSTEPS_H +#ifndef SQUID_SRC_XACTIONSTEP_H +#define SQUID_SRC_XACTIONSTEP_H enum class XactionStep { enumBegin_ = 0, // for WholeEnum iteration @@ -21,5 +21,5 @@ enum class XactionStep { enumEnd_ // for WholeEnum iteration }; -#endif /* SQUID_XACTIONSTEPS_H */ +#endif /* SQUID_SRC_XACTIONSTEP_H */ diff --git a/src/acl/Acl.h b/src/acl/Acl.h index d30e0ac7fe..a735f9be3d 100644 --- a/src/acl/Acl.h +++ b/src/acl/Acl.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACL_H -#define SQUID_ACL_H +#ifndef SQUID_SRC_ACL_ACL_H +#define SQUID_SRC_ACL_ACL_H #include "acl/forward.h" #include "acl/Options.h" @@ -215,5 +215,5 @@ public: /// XXX: find a way to remove or at least use a refcounted ACL pointer extern const char *AclMatchedName; /* NULL */ -#endif /* SQUID_ACL_H */ +#endif /* SQUID_SRC_ACL_ACL_H */ diff --git a/src/acl/AclDenyInfoList.h b/src/acl/AclDenyInfoList.h index 8e205e31ad..355199c554 100644 --- a/src/acl/AclDenyInfoList.h +++ b/src/acl/AclDenyInfoList.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLDENYINFOLIST_H_ -#define SQUID_ACLDENYINFOLIST_H_ +#ifndef SQUID_SRC_ACL_ACLDENYINFOLIST_H +#define SQUID_SRC_ACL_ACLDENYINFOLIST_H #include "acl/forward.h" #include "error/forward.h" @@ -40,5 +40,5 @@ public: AclDenyInfoList *next = nullptr; }; -#endif /* SQUID_ACLDENYINFOLIST_H_ */ +#endif /* SQUID_SRC_ACL_ACLDENYINFOLIST_H */ diff --git a/src/acl/AclSizeLimit.h b/src/acl/AclSizeLimit.h index c54ac756e7..f63b7a69f0 100644 --- a/src/acl/AclSizeLimit.h +++ b/src/acl/AclSizeLimit.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLSIZELIMIT_H_ -#define SQUID_ACLSIZELIMIT_H_ +#ifndef SQUID_SRC_ACL_ACLSIZELIMIT_H +#define SQUID_SRC_ACL_ACLSIZELIMIT_H #include "acl/forward.h" #include "cbdata.h" @@ -26,5 +26,5 @@ public: int64_t size; }; -#endif /* SQUID_ACLSIZELIMIT_H_ */ +#endif /* SQUID_SRC_ACL_ACLSIZELIMIT_H */ diff --git a/src/acl/AdaptationService.h b/src/acl/AdaptationService.h index 1fb997c2db..d759c158a5 100644 --- a/src/acl/AdaptationService.h +++ b/src/acl/AdaptationService.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLADAPTATIONSERVICE_H -#define SQUID_ACLADAPTATIONSERVICE_H +#ifndef SQUID_SRC_ACL_ADAPTATIONSERVICE_H +#define SQUID_SRC_ACL_ADAPTATIONSERVICE_H #include "acl/Strategy.h" @@ -19,5 +19,5 @@ public: int match (ACLData * &, ACLFilledChecklist *) override; }; -#endif /* SQUID_ACLADAPTATIONSERVICE_H */ +#endif /* SQUID_SRC_ACL_ADAPTATIONSERVICE_H */ diff --git a/src/acl/AdaptationServiceData.h b/src/acl/AdaptationServiceData.h index 4776ea24a8..2ff866f716 100644 --- a/src/acl/AdaptationServiceData.h +++ b/src/acl/AdaptationServiceData.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ADAPTATIONSERVICEDATA_H -#define SQUID_ADAPTATIONSERVICEDATA_H +#ifndef SQUID_SRC_ACL_ADAPTATIONSERVICEDATA_H +#define SQUID_SRC_ACL_ADAPTATIONSERVICEDATA_H #include "acl/Acl.h" #include "acl/Data.h" @@ -21,5 +21,5 @@ public: void parse() override; }; -#endif /* SQUID_ADAPTATIONSERVICEDATA_H */ +#endif /* SQUID_SRC_ACL_ADAPTATIONSERVICEDATA_H */ diff --git a/src/acl/Address.h b/src/acl/Address.h index 0b085926df..06477e29dc 100644 --- a/src/acl/Address.h +++ b/src/acl/Address.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_ACL_ADDRESS_H -#define _SQUID_SRC_ACL_ADDRESS_H +#ifndef SQUID_SRC_ACL_ADDRESS_H +#define SQUID_SRC_ACL_ADDRESS_H #include "acl/Acl.h" #include "ip/Address.h" @@ -32,5 +32,5 @@ public: } // namespace Acl -#endif /* _SQUID_SRC_ACL_ADDRESS_H */ +#endif /* SQUID_SRC_ACL_ADDRESS_H */ diff --git a/src/acl/AllOf.h b/src/acl/AllOf.h index 5eea089912..78f7a8e194 100644 --- a/src/acl/AllOf.h +++ b/src/acl/AllOf.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACL_ALL_OF_H -#define SQUID_ACL_ALL_OF_H +#ifndef SQUID_SRC_ACL_ALLOF_H +#define SQUID_SRC_ACL_ALLOF_H #include "acl/InnerNode.h" @@ -34,5 +34,5 @@ private: } // namespace Acl -#endif /* SQUID_ACL_ALL_OF_H */ +#endif /* SQUID_SRC_ACL_ALLOF_H */ diff --git a/src/acl/AnnotationData.h b/src/acl/AnnotationData.h index 2dd1288d10..9616e88656 100644 --- a/src/acl/AnnotationData.h +++ b/src/acl/AnnotationData.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLANNOTATIONDATA_H -#define SQUID_ACLANNOTATIONDATA_H +#ifndef SQUID_SRC_ACL_ANNOTATIONDATA_H +#define SQUID_SRC_ACL_ANNOTATIONDATA_H #include "AccessLogEntry.h" #include "acl/Data.h" @@ -34,5 +34,5 @@ private: Notes::Pointer notes; }; -#endif /* SQUID_ACLANNOTATIONDATA_H */ +#endif /* SQUID_SRC_ACL_ANNOTATIONDATA_H */ diff --git a/src/acl/AnyOf.h b/src/acl/AnyOf.h index 91822e0792..98d15a0663 100644 --- a/src/acl/AnyOf.h +++ b/src/acl/AnyOf.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACL_ANY_OF_H -#define SQUID_ACL_ANY_OF_H +#ifndef SQUID_SRC_ACL_ANYOF_H +#define SQUID_SRC_ACL_ANYOF_H #include "acl/BoolOps.h" @@ -27,5 +27,5 @@ public: } // namespace Acl -#endif /* SQUID_ACL_ANY_OF_H */ +#endif /* SQUID_SRC_ACL_ANYOF_H */ diff --git a/src/acl/Arp.h b/src/acl/Arp.h index 50ebe9f999..be3ba65ea0 100644 --- a/src/acl/Arp.h +++ b/src/acl/Arp.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLARP_H -#define SQUID_ACLARP_H +#ifndef SQUID_SRC_ACL_ARP_H +#define SQUID_SRC_ACL_ARP_H #include "acl/Acl.h" @@ -39,5 +39,5 @@ protected: AclArpData_t aclArpData; }; -#endif /* SQUID_ACLARP_H */ +#endif /* SQUID_SRC_ACL_ARP_H */ diff --git a/src/acl/Asn.h b/src/acl/Asn.h index a02b43e589..f6e48eb58b 100644 --- a/src/acl/Asn.h +++ b/src/acl/Asn.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLASN_H -#define SQUID_ACLASN_H +#ifndef SQUID_SRC_ACL_ASN_H +#define SQUID_SRC_ACL_ASN_H #include "acl/Data.h" #include "base/CbDataList.h" @@ -40,5 +40,5 @@ private: CbDataList *data; }; -#endif /* SQUID_ACLASN_H */ +#endif /* SQUID_SRC_ACL_ASN_H */ diff --git a/src/acl/AtStep.h b/src/acl/AtStep.h index e3d8018bd1..1435cc864c 100644 --- a/src/acl/AtStep.h +++ b/src/acl/AtStep.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLATSTEP_H -#define SQUID_ACLATSTEP_H +#ifndef SQUID_SRC_ACL_ATSTEP_H +#define SQUID_SRC_ACL_ATSTEP_H #include "acl/Strategy.h" #include "XactionStep.h" @@ -20,5 +20,5 @@ public: int match (ACLData * &, ACLFilledChecklist *) override; }; -#endif /* SQUID_ACLATSTEP_H */ +#endif /* SQUID_SRC_ACL_ATSTEP_H */ diff --git a/src/acl/AtStepData.h b/src/acl/AtStepData.h index 574f078f6a..611cd0b8e1 100644 --- a/src/acl/AtStepData.h +++ b/src/acl/AtStepData.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLATSTEPDATA_H -#define SQUID_ACLATSTEPDATA_H +#ifndef SQUID_SRC_ACL_ATSTEPDATA_H +#define SQUID_SRC_ACL_ATSTEPDATA_H #include "acl/Acl.h" #include "acl/Data.h" @@ -29,5 +29,5 @@ public: std::list values; }; -#endif /* SQUID_ACLSSL_ERRORDATA_H */ +#endif /* SQUID_SRC_ACL_ATSTEPDATA_H */ diff --git a/src/acl/BoolOps.h b/src/acl/BoolOps.h index 8455214b02..b2ff8b5b80 100644 --- a/src/acl/BoolOps.h +++ b/src/acl/BoolOps.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACL_LOGIC_H -#define SQUID_ACL_LOGIC_H +#ifndef SQUID_SRC_ACL_BOOLOPS_H +#define SQUID_SRC_ACL_BOOLOPS_H #include "acl/InnerNode.h" @@ -77,5 +77,5 @@ private: } // namespace Acl -#endif /* SQUID_ACL_LOGIC_H */ +#endif /* SQUID_SRC_ACL_BOOLOPS_H */ diff --git a/src/acl/Certificate.h b/src/acl/Certificate.h index e8fc70144b..b046653bb0 100644 --- a/src/acl/Certificate.h +++ b/src/acl/Certificate.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLCERTIFICATE_H -#define SQUID_ACLCERTIFICATE_H +#ifndef SQUID_SRC_ACL_CERTIFICATE_H +#define SQUID_SRC_ACL_CERTIFICATE_H #include "acl/Acl.h" #include "acl/Checklist.h" @@ -23,5 +23,5 @@ public: int match (ACLData * &, ACLFilledChecklist *) override; }; -#endif /* SQUID_ACLCERTIFICATE_H */ +#endif /* SQUID_SRC_ACL_CERTIFICATE_H */ diff --git a/src/acl/CertificateData.h b/src/acl/CertificateData.h index d9622976fa..b12d009265 100644 --- a/src/acl/CertificateData.h +++ b/src/acl/CertificateData.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLCERTIFICATEDATA_H -#define SQUID_ACLCERTIFICATEDATA_H +#ifndef SQUID_SRC_ACL_CERTIFICATEDATA_H +#define SQUID_SRC_ACL_CERTIFICATEDATA_H #include "acl/Acl.h" #include "acl/Data.h" @@ -45,5 +45,5 @@ private: Ssl::GETX509ATTRIBUTE *sslAttributeCall; }; -#endif /* SQUID_ACLCERTIFICATEDATA_H */ +#endif /* SQUID_SRC_ACL_CERTIFICATEDATA_H */ diff --git a/src/acl/CharacterSetOption.h b/src/acl/CharacterSetOption.h index ad69897bb5..97d9f52050 100644 --- a/src/acl/CharacterSetOption.h +++ b/src/acl/CharacterSetOption.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACL_CHARACTER_SET_OPTION_H -#define SQUID_ACL_CHARACTER_SET_OPTION_H +#ifndef SQUID_SRC_ACL_CHARACTERSETOPTION_H +#define SQUID_SRC_ACL_CHARACTERSETOPTION_H #include "acl/Options.h" #include "base/CharacterSet.h" @@ -46,5 +46,5 @@ public: } // namespace Acl -#endif /* SQUID_ACL_CHARACTER_SET_OPTION_H */ +#endif /* SQUID_SRC_ACL_CHARACTERSETOPTION_H */ diff --git a/src/acl/Checklist.h b/src/acl/Checklist.h index 57800c819e..78dfeb44e0 100644 --- a/src/acl/Checklist.h +++ b/src/acl/Checklist.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLCHECKLIST_H -#define SQUID_ACLCHECKLIST_H +#ifndef SQUID_SRC_ACL_CHECKLIST_H +#define SQUID_SRC_ACL_CHECKLIST_H #include "acl/InnerNode.h" #include @@ -245,5 +245,5 @@ private: /* internal methods */ std::vector bannedActions_; }; -#endif /* SQUID_ACLCHECKLIST_H */ +#endif /* SQUID_SRC_ACL_CHECKLIST_H */ diff --git a/src/acl/ChecklistFiller.h b/src/acl/ChecklistFiller.h index 3a31de0533..08517e7391 100644 --- a/src/acl/ChecklistFiller.h +++ b/src/acl/ChecklistFiller.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACL_CHECKLIST_FILLER_H -#define SQUID_ACL_CHECKLIST_FILLER_H +#ifndef SQUID_SRC_ACL_CHECKLISTFILLER_H +#define SQUID_SRC_ACL_CHECKLISTFILLER_H #include "acl/forward.h" @@ -26,5 +26,5 @@ public: } // namespace Acl -#endif /* SQUID_ACL_CHECKLIST_FILLER_H */ +#endif /* SQUID_SRC_ACL_CHECKLISTFILLER_H */ diff --git a/src/acl/ConnMark.h b/src/acl/ConnMark.h index 10e56f6b36..79ab52df2f 100644 --- a/src/acl/ConnMark.h +++ b/src/acl/ConnMark.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLCONNMARK_H -#define SQUID_ACLCONNMARK_H +#ifndef SQUID_SRC_ACL_CONNMARK_H +#define SQUID_SRC_ACL_CONNMARK_H #include "acl/Acl.h" #include "ip/forward.h" @@ -36,5 +36,5 @@ private: } // namespace Acl -#endif /* SQUID_ACLCONNMARK_H */ +#endif /* SQUID_SRC_ACL_CONNMARK_H */ diff --git a/src/acl/ConnectionsEncrypted.h b/src/acl/ConnectionsEncrypted.h index 82cb890954..2ef5c3e310 100644 --- a/src/acl/ConnectionsEncrypted.h +++ b/src/acl/ConnectionsEncrypted.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACL_CONNECTIONS_ENCRYPTED_H -#define SQUID_ACL_CONNECTIONS_ENCRYPTED_H +#ifndef SQUID_SRC_ACL_CONNECTIONSENCRYPTED_H +#define SQUID_SRC_ACL_CONNECTIONSENCRYPTED_H #include "acl/Acl.h" #include "acl/Checklist.h" @@ -35,5 +35,5 @@ protected: } // namespace Acl -#endif /* SQUID_ACL_CONNECTIONS_ENCRYPTED_H */ +#endif /* SQUID_SRC_ACL_CONNECTIONSENCRYPTED_H */ diff --git a/src/acl/Data.h b/src/acl/Data.h index 2e5a105e3c..49fac9ff64 100644 --- a/src/acl/Data.h +++ b/src/acl/Data.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLDATA_H -#define SQUID_ACLDATA_H +#ifndef SQUID_SRC_ACL_DATA_H +#define SQUID_SRC_ACL_DATA_H #include "acl/Options.h" #include "sbuf/List.h" @@ -33,5 +33,5 @@ public: virtual bool empty() const =0; }; -#endif /* SQUID_ACLDATA_H */ +#endif /* SQUID_SRC_ACL_DATA_H */ diff --git a/src/acl/DestinationAsn.h b/src/acl/DestinationAsn.h index f7da6511e0..c9f7476520 100644 --- a/src/acl/DestinationAsn.h +++ b/src/acl/DestinationAsn.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLDESTINATIONASN_H -#define SQUID_ACLDESTINATIONASN_H +#ifndef SQUID_SRC_ACL_DESTINATIONASN_H +#define SQUID_SRC_ACL_DESTINATIONASN_H #include "acl/Asn.h" #include "acl/Strategy.h" @@ -22,5 +22,5 @@ public: bool requiresRequest() const override {return true;} }; -#endif /* SQUID_ACLDESTINATIONASN_H */ +#endif /* SQUID_SRC_ACL_DESTINATIONASN_H */ diff --git a/src/acl/DestinationDomain.h b/src/acl/DestinationDomain.h index 6ed635d816..330c84ee56 100644 --- a/src/acl/DestinationDomain.h +++ b/src/acl/DestinationDomain.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLDESTINATIONDOMAIN_H -#define SQUID_ACLDESTINATIONDOMAIN_H +#ifndef SQUID_SRC_ACL_DESTINATIONDOMAIN_H +#define SQUID_SRC_ACL_DESTINATIONDOMAIN_H #include "acl/Acl.h" #include "acl/Checklist.h" @@ -42,5 +42,5 @@ private: static void LookupDone(const char *, const Dns::LookupDetails &, void *); }; -#endif /* SQUID_ACLDESTINATIONDOMAIN_H */ +#endif /* SQUID_SRC_ACL_DESTINATIONDOMAIN_H */ diff --git a/src/acl/DestinationIp.h b/src/acl/DestinationIp.h index 9d3453e0ff..d565a937e7 100644 --- a/src/acl/DestinationIp.h +++ b/src/acl/DestinationIp.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLDESTINATIONIP_H -#define SQUID_ACLDESTINATIONIP_H +#ifndef SQUID_SRC_ACL_DESTINATIONIP_H +#define SQUID_SRC_ACL_DESTINATIONIP_H #include "acl/Checklist.h" #include "acl/Ip.h" @@ -38,5 +38,5 @@ private: Acl::BooleanOptionValue lookupBanned; ///< are DNS lookups allowed? }; -#endif /* SQUID_ACLDESTINATIONIP_H */ +#endif /* SQUID_SRC_ACL_DESTINATIONIP_H */ diff --git a/src/acl/DomainData.h b/src/acl/DomainData.h index 61fe622bd9..6642c78bc5 100644 --- a/src/acl/DomainData.h +++ b/src/acl/DomainData.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLDOMAINDATA_H -#define SQUID_ACLDOMAINDATA_H +#ifndef SQUID_SRC_ACL_DOMAINDATA_H +#define SQUID_SRC_ACL_DOMAINDATA_H #include "acl/Acl.h" #include "acl/Data.h" @@ -28,5 +28,5 @@ public: Splay *domains; }; -#endif /* SQUID_ACLDOMAINDATA_H */ +#endif /* SQUID_SRC_ACL_DOMAINDATA_H */ diff --git a/src/acl/Eui64.h b/src/acl/Eui64.h index ad7363f25a..b010ee7cd1 100644 --- a/src/acl/Eui64.h +++ b/src/acl/Eui64.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLEUI64_H -#define SQUID_ACLEUI64_H +#ifndef SQUID_SRC_ACL_EUI64_H +#define SQUID_SRC_ACL_EUI64_H #include "acl/Acl.h" @@ -38,5 +38,5 @@ protected: char const *class_; }; -#endif /* SQUID_ACLEUI64_H */ +#endif /* SQUID_SRC_ACL_EUI64_H */ diff --git a/src/acl/ExtUser.h b/src/acl/ExtUser.h index 358e431cc2..fea40aec86 100644 --- a/src/acl/ExtUser.h +++ b/src/acl/ExtUser.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_EXTUSER_H -#define SQUID_EXTUSER_H +#ifndef SQUID_SRC_ACL_EXTUSER_H +#define SQUID_SRC_ACL_EXTUSER_H #if USE_AUTH @@ -39,5 +39,5 @@ private: }; #endif /* USE_AUTH */ -#endif /* SQUID_EXTUSER_H */ +#endif /* SQUID_SRC_ACL_EXTUSER_H */ diff --git a/src/acl/FilledChecklist.h b/src/acl/FilledChecklist.h index 0e71be360a..1c289b5f7e 100644 --- a/src/acl/FilledChecklist.h +++ b/src/acl/FilledChecklist.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLFILLED_CHECKLIST_H -#define SQUID_ACLFILLED_CHECKLIST_H +#ifndef SQUID_SRC_ACL_FILLEDCHECKLIST_H +#define SQUID_SRC_ACL_FILLEDCHECKLIST_H #include "AccessLogEntry.h" #include "acl/Checklist.h" @@ -125,5 +125,5 @@ ACLFilledChecklist *Filled(ACLChecklist *checklist) return dynamic_cast(checklist); } -#endif /* SQUID_ACLFILLED_CHECKLIST_H */ +#endif /* SQUID_SRC_ACL_FILLEDCHECKLIST_H */ diff --git a/src/acl/Gadgets.h b/src/acl/Gadgets.h index ca1cb86957..aa40d5ec9f 100644 --- a/src/acl/Gadgets.h +++ b/src/acl/Gadgets.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACL_GADGETS_H -#define SQUID_ACL_GADGETS_H +#ifndef SQUID_SRC_ACL_GADGETS_H +#define SQUID_SRC_ACL_GADGETS_H #include "acl/forward.h" #include "error/forward.h" @@ -62,5 +62,5 @@ void dump_acl_access(StoreEntry * entry, const char *name, acl_access * head); /// \ingroup ACLAPI void dump_acl_list(StoreEntry * entry, ACLList * head); -#endif /* SQUID_ACL_GADGETS_H */ +#endif /* SQUID_SRC_ACL_GADGETS_H */ diff --git a/src/acl/HasComponent.h b/src/acl/HasComponent.h index a0a8e5203e..6c91bb4aa8 100644 --- a/src/acl/HasComponent.h +++ b/src/acl/HasComponent.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLHASCOMPONENT_H -#define SQUID_ACLHASCOMPONENT_H +#ifndef SQUID_SRC_ACL_HASCOMPONENT_H +#define SQUID_SRC_ACL_HASCOMPONENT_H #include "acl/Strategised.h" #include "acl/Strategy.h" @@ -19,5 +19,5 @@ public: int match(ACLData * &, ACLFilledChecklist *) override; }; -#endif +#endif /* SQUID_SRC_ACL_HASCOMPONENT_H */ diff --git a/src/acl/HasComponentData.h b/src/acl/HasComponentData.h index 98a8d811a8..2c2b7c5fb2 100644 --- a/src/acl/HasComponentData.h +++ b/src/acl/HasComponentData.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLHASCOMPONENTDATA_H -#define SQUID_ACLHASCOMPONENTDATA_H +#ifndef SQUID_SRC_ACL_HASCOMPONENTDATA_H +#define SQUID_SRC_ACL_HASCOMPONENTDATA_H #include "acl/Checklist.h" #include "acl/Data.h" @@ -39,5 +39,5 @@ private: std::vector componentMethods; }; -#endif +#endif /* SQUID_SRC_ACL_HASCOMPONENTDATA_H */ diff --git a/src/acl/HierCode.h b/src/acl/HierCode.h index 821df248df..9302425ffc 100644 --- a/src/acl/HierCode.h +++ b/src/acl/HierCode.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLHIERCODE_H -#define SQUID_ACLHIERCODE_H +#ifndef SQUID_SRC_ACL_HIERCODE_H +#define SQUID_SRC_ACL_HIERCODE_H #include "acl/Strategy.h" #include "hier_code.h" @@ -21,5 +21,5 @@ public: bool requiresRequest() const override {return true;} }; -#endif /* SQUID_ACLHIERCODE_H */ +#endif /* SQUID_SRC_ACL_HIERCODE_H */ diff --git a/src/acl/HierCodeData.h b/src/acl/HierCodeData.h index 775ff0e005..bd5e321994 100644 --- a/src/acl/HierCodeData.h +++ b/src/acl/HierCodeData.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLHIERCODEDATA_H -#define SQUID_ACLHIERCODEDATA_H +#ifndef SQUID_SRC_ACL_HIERCODEDATA_H +#define SQUID_SRC_ACL_HIERCODEDATA_H #include "acl/Acl.h" #include "acl/Data.h" @@ -29,5 +29,5 @@ public: bool values[HIER_MAX]; }; -#endif /* SQUID_ACLHIERCODEDATA_H */ +#endif /* SQUID_SRC_ACL_HIERCODEDATA_H */ diff --git a/src/acl/HttpHeaderData.h b/src/acl/HttpHeaderData.h index e11c6d280b..5036d114dc 100644 --- a/src/acl/HttpHeaderData.h +++ b/src/acl/HttpHeaderData.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLHTTPHEADERDATA_H -#define SQUID_ACLHTTPHEADERDATA_H +#ifndef SQUID_SRC_ACL_HTTPHEADERDATA_H +#define SQUID_SRC_ACL_HTTPHEADERDATA_H #include "acl/Data.h" #include "HttpHeader.h" @@ -35,5 +35,5 @@ private: ACLData * regex_rule; }; -#endif /* SQUID_ACLHTTPHEADERDATA_H */ +#endif /* SQUID_SRC_ACL_HTTPHEADERDATA_H */ diff --git a/src/acl/HttpRepHeader.h b/src/acl/HttpRepHeader.h index 3e17d6d444..3257b557c8 100644 --- a/src/acl/HttpRepHeader.h +++ b/src/acl/HttpRepHeader.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLHTTPREPHEADER_H -#define SQUID_ACLHTTPREPHEADER_H +#ifndef SQUID_SRC_ACL_HTTPREPHEADER_H +#define SQUID_SRC_ACL_HTTPREPHEADER_H #include "acl/Strategised.h" #include "acl/Strategy.h" @@ -22,5 +22,5 @@ public: bool requiresReply() const override { return true; } }; -#endif /* SQUID_ACLHTTPREPHEADER_H */ +#endif /* SQUID_SRC_ACL_HTTPREPHEADER_H */ diff --git a/src/acl/HttpReqHeader.h b/src/acl/HttpReqHeader.h index 30d0b4aa56..c6cdc74026 100644 --- a/src/acl/HttpReqHeader.h +++ b/src/acl/HttpReqHeader.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLHTTPREQHEADER_H -#define SQUID_ACLHTTPREQHEADER_H +#ifndef SQUID_SRC_ACL_HTTPREQHEADER_H +#define SQUID_SRC_ACL_HTTPREQHEADER_H #include "acl/Strategy.h" #include "HttpHeader.h" @@ -21,5 +21,5 @@ public: bool requiresRequest() const override { return true; } }; -#endif /* SQUID_ACLHTTPREQHEADER_H */ +#endif /* SQUID_SRC_ACL_HTTPREQHEADER_H */ diff --git a/src/acl/HttpStatus.h b/src/acl/HttpStatus.h index 6e9997e540..67842a0c83 100644 --- a/src/acl/HttpStatus.h +++ b/src/acl/HttpStatus.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLHTTPSTATUS_H -#define SQUID_ACLHTTPSTATUS_H +#ifndef SQUID_SRC_ACL_HTTPSTATUS_H +#define SQUID_SRC_ACL_HTTPSTATUS_H #include "acl/Acl.h" #include "acl/Checklist.h" @@ -44,5 +44,5 @@ protected: char const *class_; }; -#endif /* SQUID_ACLHTTPSTATUS_H */ +#endif /* SQUID_SRC_ACL_HTTPSTATUS_H */ diff --git a/src/acl/InnerNode.h b/src/acl/InnerNode.h index 2b381124d2..2a37d6454c 100644 --- a/src/acl/InnerNode.h +++ b/src/acl/InnerNode.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACL_INNER_NODE_H -#define SQUID_ACL_INNER_NODE_H +#ifndef SQUID_SRC_ACL_INNERNODE_H +#define SQUID_SRC_ACL_INNERNODE_H #include "acl/Acl.h" #include @@ -55,5 +55,5 @@ protected: } // namespace Acl -#endif /* SQUID_ACL_INNER_NODE_H */ +#endif /* SQUID_SRC_ACL_INNERNODE_H */ diff --git a/src/acl/IntRange.h b/src/acl/IntRange.h index b6b3d571f7..2207088e11 100644 --- a/src/acl/IntRange.h +++ b/src/acl/IntRange.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLINTRANGE_H -#define SQUID_ACLINTRANGE_H +#ifndef SQUID_SRC_ACL_INTRANGE_H +#define SQUID_SRC_ACL_INTRANGE_H #include "acl/Data.h" #include "base/Range.h" @@ -31,5 +31,5 @@ private: std::list ranges; }; -#endif /* SQUID_ACLINTRANGE_H */ +#endif /* SQUID_SRC_ACL_INTRANGE_H */ diff --git a/src/acl/Ip.h b/src/acl/Ip.h index 86754f46c3..cad2193047 100644 --- a/src/acl/Ip.h +++ b/src/acl/Ip.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLIP_H -#define SQUID_ACLIP_H +#ifndef SQUID_SRC_ACL_IP_H +#define SQUID_SRC_ACL_IP_H #include "acl/Acl.h" #include "acl/Data.h" @@ -66,5 +66,5 @@ protected: }; -#endif /* SQUID_ACLIP_H */ +#endif /* SQUID_SRC_ACL_IP_H */ diff --git a/src/acl/LocalIp.h b/src/acl/LocalIp.h index 02f1215e1b..11b118b3e8 100644 --- a/src/acl/LocalIp.h +++ b/src/acl/LocalIp.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLLOCALIP_H -#define SQUID_ACLLOCALIP_H +#ifndef SQUID_SRC_ACL_LOCALIP_H +#define SQUID_SRC_ACL_LOCALIP_H #include "acl/Ip.h" @@ -21,5 +21,5 @@ public: int match(ACLChecklist *checklist) override; }; -#endif /* SQUID_ACLLOCALIP_H */ +#endif /* SQUID_SRC_ACL_LOCALIP_H */ diff --git a/src/acl/LocalPort.h b/src/acl/LocalPort.h index 9e1a82202e..40e110c863 100644 --- a/src/acl/LocalPort.h +++ b/src/acl/LocalPort.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLLOCALPORT_H -#define SQUID_ACLLOCALPORT_H +#ifndef SQUID_SRC_ACL_LOCALPORT_H +#define SQUID_SRC_ACL_LOCALPORT_H #include "acl/Strategy.h" @@ -19,5 +19,5 @@ public: int match (ACLData * &, ACLFilledChecklist *) override; }; -#endif /* SQUID_ACLLOCALPORT_H */ +#endif /* SQUID_SRC_ACL_LOCALPORT_H */ diff --git a/src/acl/MaxConnection.h b/src/acl/MaxConnection.h index 121c6bb9c7..4c8ba883f7 100644 --- a/src/acl/MaxConnection.h +++ b/src/acl/MaxConnection.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLMAXCONNECTION_H -#define SQUID_ACLMAXCONNECTION_H +#ifndef SQUID_SRC_ACL_MAXCONNECTION_H +#define SQUID_SRC_ACL_MAXCONNECTION_H #include "acl/Acl.h" @@ -33,5 +33,5 @@ protected: int limit; }; -#endif /* SQUID_ACLMAXCONNECTION_H */ +#endif /* SQUID_SRC_ACL_MAXCONNECTION_H */ diff --git a/src/acl/Method.h b/src/acl/Method.h index 9c5c4d833b..cd3169e2b8 100644 --- a/src/acl/Method.h +++ b/src/acl/Method.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLMETHOD_H -#define SQUID_ACLMETHOD_H +#ifndef SQUID_SRC_ACL_METHOD_H +#define SQUID_SRC_ACL_METHOD_H #include "acl/Strategy.h" #include "http/RequestMethod.h" @@ -21,5 +21,5 @@ public: bool requiresRequest() const override {return true;} }; -#endif /* SQUID_ACLMETHOD_H */ +#endif /* SQUID_SRC_ACL_METHOD_H */ diff --git a/src/acl/MethodData.h b/src/acl/MethodData.h index 0d58f02ade..340b18c969 100644 --- a/src/acl/MethodData.h +++ b/src/acl/MethodData.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLMETHODDATA_H -#define SQUID_ACLMETHODDATA_H +#ifndef SQUID_SRC_ACL_METHODDATA_H +#define SQUID_SRC_ACL_METHODDATA_H #include "acl/Acl.h" #include "acl/Data.h" @@ -32,5 +32,5 @@ public: static int ThePurgeCount; ///< PURGE methods seen by parse() }; -#endif /* SQUID_ACLMETHODDATA_H */ +#endif /* SQUID_SRC_ACL_METHODDATA_H */ diff --git a/src/acl/MyPortName.h b/src/acl/MyPortName.h index fbb630a61d..17116b73b4 100644 --- a/src/acl/MyPortName.h +++ b/src/acl/MyPortName.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLMYPORTNAME_H -#define SQUID_ACLMYPORTNAME_H +#ifndef SQUID_SRC_ACL_MYPORTNAME_H +#define SQUID_SRC_ACL_MYPORTNAME_H #include "acl/Strategy.h" class ACLMyPortNameStrategy : public ACLStrategy @@ -17,5 +17,5 @@ public: int match (ACLData * &, ACLFilledChecklist *) override; }; -#endif /* SQUID_ACLMYPORTNAME_H */ +#endif /* SQUID_SRC_ACL_MYPORTNAME_H */ diff --git a/src/acl/Note.h b/src/acl/Note.h index 1024d032ac..58cc8ae433 100644 --- a/src/acl/Note.h +++ b/src/acl/Note.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLNOTE_H -#define SQUID_ACLNOTE_H +#ifndef SQUID_SRC_ACL_NOTE_H +#define SQUID_SRC_ACL_NOTE_H #include "acl/CharacterSetOption.h" #include "acl/Data.h" @@ -41,5 +41,5 @@ private: bool matchNotes(ACLData *, const NotePairs *) const; }; -#endif /* SQUID_ACLNOTE_H */ +#endif /* SQUID_SRC_ACL_NOTE_H */ diff --git a/src/acl/NoteData.h b/src/acl/NoteData.h index dc0950bac0..a0daf44e73 100644 --- a/src/acl/NoteData.h +++ b/src/acl/NoteData.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLNOTEDATA_H -#define SQUID_ACLNOTEDATA_H +#ifndef SQUID_SRC_ACL_NOTEDATA_H +#define SQUID_SRC_ACL_NOTEDATA_H #include "acl/Data.h" #include "Notes.h" @@ -33,5 +33,5 @@ private: ACLStringData *values; ///< if set, at least one value must match }; -#endif /* SQUID_ACLNOTEDATA_H */ +#endif /* SQUID_SRC_ACL_NOTEDATA_H */ diff --git a/src/acl/Options.h b/src/acl/Options.h index e19a6036e3..acb36ff38b 100644 --- a/src/acl/Options.h +++ b/src/acl/Options.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACL_OPTIONS_H -#define SQUID_ACL_OPTIONS_H +#ifndef SQUID_SRC_ACL_OPTIONS_H +#define SQUID_SRC_ACL_OPTIONS_H #include "acl/forward.h" #include "sbuf/forward.h" @@ -230,5 +230,5 @@ std::ostream &operator <<(std::ostream &, const Options &); } // namespace Acl -#endif /* SQUID_ACL_OPTIONS_H */ +#endif /* SQUID_SRC_ACL_OPTIONS_H */ diff --git a/src/acl/PeerName.h b/src/acl/PeerName.h index ed0246d9de..0c7d80a1fe 100644 --- a/src/acl/PeerName.h +++ b/src/acl/PeerName.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLPEERNAME_H -#define SQUID_ACLPEERNAME_H +#ifndef SQUID_SRC_ACL_PEERNAME_H +#define SQUID_SRC_ACL_PEERNAME_H #include "acl/Strategy.h" @@ -18,5 +18,5 @@ public: int match (ACLData * &, ACLFilledChecklist *) override; }; -#endif /* SQUID_ACLPEERNAME_H */ +#endif /* SQUID_SRC_ACL_PEERNAME_H */ diff --git a/src/acl/Protocol.h b/src/acl/Protocol.h index a7ef518ca8..0b17efd81f 100644 --- a/src/acl/Protocol.h +++ b/src/acl/Protocol.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLPROTOCOL_H -#define SQUID_ACLPROTOCOL_H +#ifndef SQUID_SRC_ACL_PROTOCOL_H +#define SQUID_SRC_ACL_PROTOCOL_H #include "acl/Strategy.h" #include "anyp/ProtocolType.h" @@ -20,5 +20,5 @@ public: bool requiresRequest() const override {return true;} }; -#endif /* SQUID_ACLPROTOCOL_H */ +#endif /* SQUID_SRC_ACL_PROTOCOL_H */ diff --git a/src/acl/ProtocolData.h b/src/acl/ProtocolData.h index 056e0b3641..cba5e45650 100644 --- a/src/acl/ProtocolData.h +++ b/src/acl/ProtocolData.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLPROTOCOLDATA_H -#define SQUID_ACLPROTOCOLDATA_H +#ifndef SQUID_SRC_ACL_PROTOCOLDATA_H +#define SQUID_SRC_ACL_PROTOCOLDATA_H #include "acl/Acl.h" #include "acl/Data.h" @@ -30,5 +30,5 @@ public: std::list values; }; -#endif /* SQUID_ACLPROTOCOLDATA_H */ +#endif /* SQUID_SRC_ACL_PROTOCOLDATA_H */ diff --git a/src/acl/Random.h b/src/acl/Random.h index 98d6654620..be2ab93cc6 100644 --- a/src/acl/Random.h +++ b/src/acl/Random.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACL_RANDOM_H -#define SQUID_ACL_RANDOM_H +#ifndef SQUID_SRC_ACL_RANDOM_H +#define SQUID_SRC_ACL_RANDOM_H #include "acl/Acl.h" @@ -32,5 +32,5 @@ protected: char const *class_; }; -#endif /* SQUID_ACL_RANDOM_H */ +#endif /* SQUID_SRC_ACL_RANDOM_H */ diff --git a/src/acl/RegexData.h b/src/acl/RegexData.h index bebdd3c9b4..80b156455b 100644 --- a/src/acl/RegexData.h +++ b/src/acl/RegexData.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLREGEXDATA_H -#define SQUID_ACLREGEXDATA_H +#ifndef SQUID_SRC_ACL_REGEXDATA_H +#define SQUID_SRC_ACL_REGEXDATA_H #include "acl/Data.h" @@ -36,5 +36,5 @@ private: std::list data; }; -#endif /* SQUID_ACLREGEXDATA_H */ +#endif /* SQUID_SRC_ACL_REGEXDATA_H */ diff --git a/src/acl/ReplyHeaderStrategy.h b/src/acl/ReplyHeaderStrategy.h index 26005ae6b0..7a246b518e 100644 --- a/src/acl/ReplyHeaderStrategy.h +++ b/src/acl/ReplyHeaderStrategy.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLREPLYHEADERSTRATEGY_H -#define SQUID_ACLREPLYHEADERSTRATEGY_H +#ifndef SQUID_SRC_ACL_REPLYHEADERSTRATEGY_H +#define SQUID_SRC_ACL_REPLYHEADERSTRATEGY_H #include "acl/Acl.h" #include "acl/Data.h" @@ -36,5 +36,5 @@ ACLReplyHeaderStrategy
::match (ACLData * &data, ACLFilledC return data->match(theHeader); } -#endif /* SQUID_REPLYHEADERSTRATEGY_H */ +#endif /* SQUID_SRC_ACL_REPLYHEADERSTRATEGY_H */ diff --git a/src/acl/ReplyMimeType.h b/src/acl/ReplyMimeType.h index 2af7cb2371..8dcd970ec0 100644 --- a/src/acl/ReplyMimeType.h +++ b/src/acl/ReplyMimeType.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLREPLYMIMETYPE_H -#define SQUID_ACLREPLYMIMETYPE_H +#ifndef SQUID_SRC_ACL_REPLYMIMETYPE_H +#define SQUID_SRC_ACL_REPLYMIMETYPE_H #include "acl/Data.h" #include "acl/FilledChecklist.h" @@ -27,5 +27,5 @@ ACLReplyHeaderStrategy::match(ACLData return data->match(theHeader); } -#endif /* SQUID_ACLREPLYMIMETYPE_H */ +#endif /* SQUID_SRC_ACL_REPLYMIMETYPE_H */ diff --git a/src/acl/RequestHeaderStrategy.h b/src/acl/RequestHeaderStrategy.h index dc04068215..d4f3478e53 100644 --- a/src/acl/RequestHeaderStrategy.h +++ b/src/acl/RequestHeaderStrategy.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLREQUESTHEADERSTRATEGY_H -#define SQUID_ACLREQUESTHEADERSTRATEGY_H +#ifndef SQUID_SRC_ACL_REQUESTHEADERSTRATEGY_H +#define SQUID_SRC_ACL_REQUESTHEADERSTRATEGY_H #include "acl/Acl.h" #include "acl/Data.h" #include "acl/FilledChecklist.h" @@ -35,5 +35,5 @@ ACLRequestHeaderStrategy
::match (ACLData * &data, ACLFille return data->match(theHeader); } -#endif /* SQUID_REQUESTHEADERSTRATEGY_H */ +#endif /* SQUID_SRC_ACL_REQUESTHEADERSTRATEGY_H */ diff --git a/src/acl/RequestMimeType.h b/src/acl/RequestMimeType.h index 3927cd7eb9..e67036b756 100644 --- a/src/acl/RequestMimeType.h +++ b/src/acl/RequestMimeType.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLREQUESTMIMETYPE_H -#define SQUID_ACLREQUESTMIMETYPE_H +#ifndef SQUID_SRC_ACL_REQUESTMIMETYPE_H +#define SQUID_SRC_ACL_REQUESTMIMETYPE_H #include "acl/Data.h" #include "acl/FilledChecklist.h" @@ -27,5 +27,5 @@ ACLRequestHeaderStrategy::match (ACLDatamatch(theHeader); } -#endif /* SQUID_ACLREQUESTMIMETYPE_H */ +#endif /* SQUID_SRC_ACL_REQUESTMIMETYPE_H */ diff --git a/src/acl/ServerCertificate.h b/src/acl/ServerCertificate.h index 8315c81a1c..49de19a300 100644 --- a/src/acl/ServerCertificate.h +++ b/src/acl/ServerCertificate.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLSERVERCERTIFICATE_H -#define SQUID_ACLSERVERCERTIFICATE_H +#ifndef SQUID_SRC_ACL_SERVERCERTIFICATE_H +#define SQUID_SRC_ACL_SERVERCERTIFICATE_H #include "acl/Acl.h" #include "acl/Checklist.h" @@ -22,5 +22,5 @@ public: int match (ACLData * &, ACLFilledChecklist *) override; }; -#endif /* SQUID_ACLSERVERCERTIFICATE_H */ +#endif /* SQUID_SRC_ACL_SERVERCERTIFICATE_H */ diff --git a/src/acl/ServerName.h b/src/acl/ServerName.h index a797c1c22d..b7ea57f5b8 100644 --- a/src/acl/ServerName.h +++ b/src/acl/ServerName.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLSERVERNAME_H -#define SQUID_ACLSERVERNAME_H +#ifndef SQUID_SRC_ACL_SERVERNAME_H +#define SQUID_SRC_ACL_SERVERNAME_H #include "acl/Acl.h" #include "acl/DomainData.h" @@ -36,5 +36,5 @@ private: Acl::BooleanOptionValue useConsensus; ///< Ignore mismatching names }; -#endif /* SQUID_ACLSERVERNAME_H */ +#endif /* SQUID_SRC_ACL_SERVERNAME_H */ diff --git a/src/acl/SourceAsn.h b/src/acl/SourceAsn.h index 416115357c..61b247802e 100644 --- a/src/acl/SourceAsn.h +++ b/src/acl/SourceAsn.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACL_SOURCEASN_H -#define SQUID_ACL_SOURCEASN_H +#ifndef SQUID_SRC_ACL_SOURCEASN_H +#define SQUID_SRC_ACL_SOURCEASN_H #include "acl/Strategy.h" #include "ip/Address.h" @@ -21,5 +21,5 @@ public: int match (ACLData * &, ACLFilledChecklist *) override; }; -#endif /* SQUID_ACL_SOURCEASN_H */ +#endif /* SQUID_SRC_ACL_SOURCEASN_H */ diff --git a/src/acl/SourceDomain.h b/src/acl/SourceDomain.h index 99cac9ea60..b385c925b8 100644 --- a/src/acl/SourceDomain.h +++ b/src/acl/SourceDomain.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLSOURCEDOMAIN_H -#define SQUID_ACLSOURCEDOMAIN_H +#ifndef SQUID_SRC_ACL_SOURCEDOMAIN_H +#define SQUID_SRC_ACL_SOURCEDOMAIN_H #include "acl/Acl.h" #include "acl/Checklist.h" #include "acl/Data.h" @@ -33,5 +33,5 @@ private: static void LookupDone(const char *, const Dns::LookupDetails &, void *); }; -#endif /* SQUID_ACLSOURCEDOMAIN_H */ +#endif /* SQUID_SRC_ACL_SOURCEDOMAIN_H */ diff --git a/src/acl/SourceIp.h b/src/acl/SourceIp.h index 8596cbf696..130d486e63 100644 --- a/src/acl/SourceIp.h +++ b/src/acl/SourceIp.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLSOURCEIP_H -#define SQUID_ACLSOURCEIP_H +#ifndef SQUID_SRC_ACL_SOURCEIP_H +#define SQUID_SRC_ACL_SOURCEIP_H #include "acl/Ip.h" @@ -20,5 +20,5 @@ public: int match(ACLChecklist *checklist) override; }; -#endif /* SQUID_ACLSOURCEIP_H */ +#endif /* SQUID_SRC_ACL_SOURCEIP_H */ diff --git a/src/acl/SquidError.h b/src/acl/SquidError.h index 5d31126b79..2b1fdadf0d 100644 --- a/src/acl/SquidError.h +++ b/src/acl/SquidError.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLSQUIDERROR_H -#define SQUID_ACLSQUIDERROR_H +#ifndef SQUID_SRC_ACL_SQUIDERROR_H +#define SQUID_SRC_ACL_SQUIDERROR_H #include "acl/Strategy.h" #include "error/forward.h" @@ -19,5 +19,5 @@ public: int match (ACLData * &, ACLFilledChecklist *) override; }; -#endif /* SQUID_ACLSQUIDERROR_H */ +#endif /* SQUID_SRC_ACL_SQUIDERROR_H */ diff --git a/src/acl/SquidErrorData.h b/src/acl/SquidErrorData.h index a31e31a0e9..b3d6fbe27b 100644 --- a/src/acl/SquidErrorData.h +++ b/src/acl/SquidErrorData.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLSQUIDERRORDATA_H -#define SQUID_ACLSQUIDERRORDATA_H +#ifndef SQUID_SRC_ACL_SQUIDERRORDATA_H +#define SQUID_SRC_ACL_SQUIDERRORDATA_H #include "acl/Data.h" #include "base/CbDataList.h" @@ -30,5 +30,5 @@ private: CbDataListContainer errors; }; -#endif //SQUID_ACLSQUIDERRORDATA_H +#endif /* SQUID_SRC_ACL_SQUIDERRORDATA_H */ diff --git a/src/acl/SslError.h b/src/acl/SslError.h index 4bc8a187f2..185b5e0eca 100644 --- a/src/acl/SslError.h +++ b/src/acl/SslError.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLSSL_ERROR_H -#define SQUID_ACLSSL_ERROR_H +#ifndef SQUID_SRC_ACL_SSLERROR_H +#define SQUID_SRC_ACL_SSLERROR_H #include "acl/Strategy.h" #include "security/forward.h" @@ -19,5 +19,5 @@ public: int match (ACLData * &, ACLFilledChecklist *) override; }; -#endif /* SQUID_ACLSSL_ERROR_H */ +#endif /* SQUID_SRC_ACL_SSLERROR_H */ diff --git a/src/acl/SslErrorData.h b/src/acl/SslErrorData.h index 1fbfe8ac9e..c3559dcdf9 100644 --- a/src/acl/SslErrorData.h +++ b/src/acl/SslErrorData.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLSSL_ERRORDATA_H -#define SQUID_ACLSSL_ERRORDATA_H +#ifndef SQUID_SRC_ACL_SSLERRORDATA_H +#define SQUID_SRC_ACL_SSLERRORDATA_H #include "acl/Acl.h" #include "acl/Data.h" @@ -28,5 +28,5 @@ public: Security::Errors values; }; -#endif /* SQUID_ACLSSL_ERRORDATA_H */ +#endif /* SQUID_SRC_ACL_SSLERRORDATA_H */ diff --git a/src/acl/Strategised.h b/src/acl/Strategised.h index 46650d755d..57eec1ffd0 100644 --- a/src/acl/Strategised.h +++ b/src/acl/Strategised.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLSTRATEGISED_H -#define SQUID_ACLSTRATEGISED_H +#ifndef SQUID_SRC_ACL_STRATEGISED_H +#define SQUID_SRC_ACL_STRATEGISED_H #include "acl/Acl.h" #include "acl/Data.h" @@ -123,5 +123,5 @@ ACLStrategised::valid () const return matcher->valid(); } -#endif /* SQUID_ACLSTRATEGISED_H */ +#endif /* SQUID_SRC_ACL_STRATEGISED_H */ diff --git a/src/acl/Strategy.h b/src/acl/Strategy.h index a3712bcee9..4a8d808966 100644 --- a/src/acl/Strategy.h +++ b/src/acl/Strategy.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLSTRATEGY_H -#define SQUID_ACLSTRATEGY_H +#ifndef SQUID_SRC_ACL_STRATEGY_H +#define SQUID_SRC_ACL_STRATEGY_H #include "acl/Acl.h" #include "acl/Data.h" @@ -36,5 +36,5 @@ public: virtual ~ACLStrategy() {} }; -#endif /* SQUID_ACLSTRATEGY_H */ +#endif /* SQUID_SRC_ACL_STRATEGY_H */ diff --git a/src/acl/StringData.h b/src/acl/StringData.h index 64617e1b56..c073ae52ab 100644 --- a/src/acl/StringData.h +++ b/src/acl/StringData.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLSTRINGDATA_H -#define SQUID_ACLSTRINGDATA_H +#ifndef SQUID_SRC_ACL_STRINGDATA_H +#define SQUID_SRC_ACL_STRINGDATA_H #include "acl/Acl.h" #include "acl/Data.h" @@ -37,5 +37,5 @@ private: StringValues_t stringValues; }; -#endif /* SQUID_ACLSTRINGDATA_H */ +#endif /* SQUID_SRC_ACL_STRINGDATA_H */ diff --git a/src/acl/Tag.h b/src/acl/Tag.h index 528eaad297..40c66fec65 100644 --- a/src/acl/Tag.h +++ b/src/acl/Tag.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLTAG_H -#define SQUID_ACLTAG_H +#ifndef SQUID_SRC_ACL_TAG_H +#define SQUID_SRC_ACL_TAG_H #include "acl/Strategy.h" @@ -18,5 +18,5 @@ public: int match (ACLData * &, ACLFilledChecklist *) override; }; -#endif /* SQUID_ACLMYPORTNAME_H */ +#endif /* SQUID_SRC_ACL_TAG_H */ diff --git a/src/acl/Time.h b/src/acl/Time.h index 9a44fd4a47..c58fe32b02 100644 --- a/src/acl/Time.h +++ b/src/acl/Time.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLTIME_H -#define SQUID_ACLTIME_H +#ifndef SQUID_SRC_ACL_TIME_H +#define SQUID_SRC_ACL_TIME_H #include "acl/Data.h" #include "acl/Strategised.h" @@ -18,5 +18,5 @@ public: int match (ACLData * &, ACLFilledChecklist *) override; }; -#endif /* SQUID_ACLTIME_H */ +#endif /* SQUID_SRC_ACL_TIME_H */ diff --git a/src/acl/TimeData.h b/src/acl/TimeData.h index 53edc57327..448f7acfac 100644 --- a/src/acl/TimeData.h +++ b/src/acl/TimeData.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLTIMEDATA_H -#define SQUID_ACLTIMEDATA_H +#ifndef SQUID_SRC_ACL_TIMEDATA_H +#define SQUID_SRC_ACL_TIMEDATA_H #include "acl/Acl.h" #include "acl/Data.h" @@ -31,5 +31,5 @@ private: ACLTimeData *next; }; -#endif /* SQUID_ACLTIMEDATA_H */ +#endif /* SQUID_SRC_ACL_TIMEDATA_H */ diff --git a/src/acl/TransactionInitiator.h b/src/acl/TransactionInitiator.h index 5b573b27b9..6ca6e45371 100644 --- a/src/acl/TransactionInitiator.h +++ b/src/acl/TransactionInitiator.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACL_TRANSACTION_INITIATOR_H -#define SQUID_ACL_TRANSACTION_INITIATOR_H +#ifndef SQUID_SRC_ACL_TRANSACTIONINITIATOR_H +#define SQUID_SRC_ACL_TRANSACTIONINITIATOR_H #include "acl/Acl.h" #include "acl/Checklist.h" @@ -39,5 +39,5 @@ protected: } // namespace Acl -#endif /* SQUID_ACL_TRANSACTION_INITIATOR_H */ +#endif /* SQUID_SRC_ACL_TRANSACTIONINITIATOR_H */ diff --git a/src/acl/Tree.h b/src/acl/Tree.h index df144dad2d..e0c1eb2215 100644 --- a/src/acl/Tree.h +++ b/src/acl/Tree.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACL_TREE_H -#define SQUID_ACL_TREE_H +#ifndef SQUID_SRC_ACL_TREE_H +#define SQUID_SRC_ACL_TREE_H #include "acl/BoolOps.h" #include "sbuf/List.h" @@ -81,5 +81,5 @@ Tree::treeDump(const char *prefix, ActionToStringConverter converter) const } // namespace Acl -#endif /* SQUID_ACL_TREE_H */ +#endif /* SQUID_SRC_ACL_TREE_H */ diff --git a/src/acl/Url.h b/src/acl/Url.h index d705f64af2..aaf91b31a8 100644 --- a/src/acl/Url.h +++ b/src/acl/Url.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLURL_H -#define SQUID_ACLURL_H +#ifndef SQUID_SRC_ACL_URL_H +#define SQUID_SRC_ACL_URL_H #include "acl/Data.h" #include "acl/Strategised.h" @@ -20,5 +20,5 @@ public: bool requiresRequest() const override {return true;} }; -#endif /* SQUID_ACLURL_H */ +#endif /* SQUID_SRC_ACL_URL_H */ diff --git a/src/acl/UrlLogin.h b/src/acl/UrlLogin.h index e32ac064cb..8c7cc39742 100644 --- a/src/acl/UrlLogin.h +++ b/src/acl/UrlLogin.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLURLLOGIN_H -#define SQUID_ACLURLLOGIN_H +#ifndef SQUID_SRC_ACL_URLLOGIN_H +#define SQUID_SRC_ACL_URLLOGIN_H #include "acl/Acl.h" #include "acl/Data.h" @@ -21,5 +21,5 @@ public: bool requiresRequest() const override {return true;} }; -#endif /* SQUID_ACLURLLOGIN_H */ +#endif /* SQUID_SRC_ACL_URLLOGIN_H */ diff --git a/src/acl/UrlPath.h b/src/acl/UrlPath.h index d86acfefbe..5e90a55cd6 100644 --- a/src/acl/UrlPath.h +++ b/src/acl/UrlPath.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLURLPATH_H -#define SQUID_ACLURLPATH_H +#ifndef SQUID_SRC_ACL_URLPATH_H +#define SQUID_SRC_ACL_URLPATH_H #include "acl/Strategy.h" @@ -19,5 +19,5 @@ public: bool requiresRequest() const override {return true;} }; -#endif /* SQUID_ACLURLPATH_H */ +#endif /* SQUID_SRC_ACL_URLPATH_H */ diff --git a/src/acl/UrlPort.h b/src/acl/UrlPort.h index 75d6f80025..8da781a81f 100644 --- a/src/acl/UrlPort.h +++ b/src/acl/UrlPort.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLURLPORT_H -#define SQUID_ACLURLPORT_H +#ifndef SQUID_SRC_ACL_URLPORT_H +#define SQUID_SRC_ACL_URLPORT_H #include "acl/Strategy.h" @@ -19,5 +19,5 @@ public: bool requiresRequest() const override {return true;} }; -#endif /* SQUID_ACLURLPORT_H */ +#endif /* SQUID_SRC_ACL_URLPORT_H */ diff --git a/src/acl/UserData.h b/src/acl/UserData.h index 1c830f4bc2..695bd081e0 100644 --- a/src/acl/UserData.h +++ b/src/acl/UserData.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLUSERDATA_H -#define SQUID_ACLUSERDATA_H +#ifndef SQUID_SRC_ACL_USERDATA_H +#define SQUID_SRC_ACL_USERDATA_H #include "acl/Acl.h" #include "acl/Data.h" @@ -44,5 +44,5 @@ private: }; -#endif /* SQUID_ACLUSERDATA_H */ +#endif /* SQUID_SRC_ACL_USERDATA_H */ diff --git a/src/acl/forward.h b/src/acl/forward.h index f6ccdd990f..55a423864f 100644 --- a/src/acl/forward.h +++ b/src/acl/forward.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACL_FORWARD_H -#define SQUID_ACL_FORWARD_H +#ifndef SQUID_SRC_ACL_FORWARD_H +#define SQUID_SRC_ACL_FORWARD_H #include "base/RefCount.h" @@ -48,5 +48,5 @@ typedef void ACLCB(Acl::Answer, void *); class ExternalACLEntry; typedef RefCount ExternalACLEntryPointer; -#endif /* SQUID_ACL_FORWARD_H */ +#endif /* SQUID_SRC_ACL_FORWARD_H */ diff --git a/src/adaptation/AccessCheck.h b/src/adaptation/AccessCheck.h index fc2459a5f9..1807c4da80 100644 --- a/src/adaptation/AccessCheck.h +++ b/src/adaptation/AccessCheck.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ADAPTATION__ACCESS_CHECK_H -#define SQUID_ADAPTATION__ACCESS_CHECK_H +#ifndef SQUID_SRC_ADAPTATION_ACCESSCHECK_H +#define SQUID_SRC_ADAPTATION_ACCESSCHECK_H #include "acl/Acl.h" #include "adaptation/Elements.h" @@ -73,5 +73,5 @@ protected: } // namespace Adaptation -#endif /* SQUID_ADAPTATION__ACCESS_CHECK_H */ +#endif /* SQUID_SRC_ADAPTATION_ACCESSCHECK_H */ diff --git a/src/adaptation/AccessRule.h b/src/adaptation/AccessRule.h index 2b3be70640..85589c4c30 100644 --- a/src/adaptation/AccessRule.h +++ b/src/adaptation/AccessRule.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ADAPTATION__ACCESS_RULE_H -#define SQUID_ADAPTATION__ACCESS_RULE_H +#ifndef SQUID_SRC_ADAPTATION_ACCESSRULE_H +#define SQUID_SRC_ADAPTATION_ACCESSRULE_H #include "acl/forward.h" #include "adaptation/forward.h" @@ -51,5 +51,5 @@ AccessRule *FindRuleByGroupId(const String &groupId); } // namespace Adaptation -#endif /* SQUID_ADAPTATION__ACCESS_RULE_H */ +#endif /* SQUID_SRC_ADAPTATION_ACCESSRULE_H */ diff --git a/src/adaptation/Answer.h b/src/adaptation/Answer.h index 554f11973d..2fcb51459e 100644 --- a/src/adaptation/Answer.h +++ b/src/adaptation/Answer.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ADAPTATION__ANSWER_H -#define SQUID_ADAPTATION__ANSWER_H +#ifndef SQUID_SRC_ADAPTATION_ANSWER_H +#define SQUID_SRC_ADAPTATION_ANSWER_H #include "adaptation/forward.h" #include "http/forward.h" @@ -53,5 +53,5 @@ std::ostream &operator <<(std::ostream &os, const Answer &answer) } // namespace Adaptation -#endif /* SQUID_ADAPTATION__ANSWER_H */ +#endif /* SQUID_SRC_ADAPTATION_ANSWER_H */ diff --git a/src/adaptation/Config.h b/src/adaptation/Config.h index 279cee7d4a..4081aab08e 100644 --- a/src/adaptation/Config.h +++ b/src/adaptation/Config.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ADAPTATION__CONFIG_H -#define SQUID_ADAPTATION__CONFIG_H +#ifndef SQUID_SRC_ADAPTATION_CONFIG_H +#define SQUID_SRC_ADAPTATION_CONFIG_H #include "acl/forward.h" #include "adaptation/Elements.h" @@ -104,5 +104,5 @@ private: } // namespace Adaptation -#endif /* SQUID_ADAPTATION__CONFIG_H */ +#endif /* SQUID_SRC_ADAPTATION_CONFIG_H */ diff --git a/src/adaptation/DynamicGroupCfg.h b/src/adaptation/DynamicGroupCfg.h index b7e22cafcf..0e828d68b1 100644 --- a/src/adaptation/DynamicGroupCfg.h +++ b/src/adaptation/DynamicGroupCfg.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ADAPTATION__DYNAMIC_GROUP_CFG_H -#define SQUID_ADAPTATION__DYNAMIC_GROUP_CFG_H +#ifndef SQUID_SRC_ADAPTATION_DYNAMICGROUPCFG_H +#define SQUID_SRC_ADAPTATION_DYNAMICGROUPCFG_H #include "SquidString.h" @@ -43,5 +43,5 @@ std::ostream &operator <<(std::ostream &os, const DynamicGroupCfg &cfg) } // namespace Adaptation -#endif /* SQUID_ADAPTATION__DYNAMIC_GROUP_CFG_H */ +#endif /* SQUID_SRC_ADAPTATION_DYNAMICGROUPCFG_H */ diff --git a/src/adaptation/Elements.h b/src/adaptation/Elements.h index 3119bbe0de..d9d294fe71 100644 --- a/src/adaptation/Elements.h +++ b/src/adaptation/Elements.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ADAPTATION__ELEMENTS_H -#define SQUID_ADAPTATION__ELEMENTS_H +#ifndef SQUID_SRC_ADAPTATION_ELEMENTS_H +#define SQUID_SRC_ADAPTATION_ELEMENTS_H // widely used adaptation primitives @@ -24,5 +24,5 @@ const char *vectPointStr(VectPoint); // TODO: make into a stream op? } // namespace Adaptation -#endif /* SQUID_ADAPTATION_ELEMENTS_H */ +#endif /* SQUID_SRC_ADAPTATION_ELEMENTS_H */ diff --git a/src/adaptation/History.h b/src/adaptation/History.h index bac0b21a64..251e2b897f 100644 --- a/src/adaptation/History.h +++ b/src/adaptation/History.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ADAPT_HISTORY_H -#define SQUID_ADAPT_HISTORY_H +#ifndef SQUID_SRC_ADAPTATION_HISTORY_H +#define SQUID_SRC_ADAPTATION_HISTORY_H #include "adaptation/DynamicGroupCfg.h" #include "adaptation/forward.h" @@ -108,5 +108,5 @@ private: } // namespace Adaptation -#endif +#endif /* SQUID_SRC_ADAPTATION_HISTORY_H */ diff --git a/src/adaptation/Initiate.h b/src/adaptation/Initiate.h index 3529f65423..8474618ab3 100644 --- a/src/adaptation/Initiate.h +++ b/src/adaptation/Initiate.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ADAPTATION__INITIATE_H -#define SQUID_ADAPTATION__INITIATE_H +#ifndef SQUID_SRC_ADAPTATION_INITIATE_H +#define SQUID_SRC_ADAPTATION_INITIATE_H #include "adaptation/forward.h" #include "base/AsyncJob.h" @@ -57,5 +57,5 @@ private: } // namespace Adaptation -#endif /* SQUID_ADAPTATION__INITIATE_H */ +#endif /* SQUID_SRC_ADAPTATION_INITIATE_H */ diff --git a/src/adaptation/Initiator.h b/src/adaptation/Initiator.h index 46d8c6a248..fd1a01a436 100644 --- a/src/adaptation/Initiator.h +++ b/src/adaptation/Initiator.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ADAPTATION__INITIATOR_H -#define SQUID_ADAPTATION__INITIATOR_H +#ifndef SQUID_SRC_ADAPTATION_INITIATOR_H +#define SQUID_SRC_ADAPTATION_INITIATOR_H #include "adaptation/forward.h" #include "base/AsyncJob.h" @@ -54,5 +54,5 @@ protected: } // namespace Adaptation -#endif /* SQUID_ADAPTATION__INITIATOR_H */ +#endif /* SQUID_SRC_ADAPTATION_INITIATOR_H */ diff --git a/src/adaptation/Iterator.h b/src/adaptation/Iterator.h index cb19ea8bd8..64497d0ec5 100644 --- a/src/adaptation/Iterator.h +++ b/src/adaptation/Iterator.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ADAPTATION__ITERATOR_H -#define SQUID_ADAPTATION__ITERATOR_H +#ifndef SQUID_SRC_ADAPTATION_ITERATOR_H +#define SQUID_SRC_ADAPTATION_ITERATOR_H #include "adaptation/Initiate.h" #include "adaptation/Initiator.h" @@ -75,5 +75,5 @@ protected: } // namespace Adaptation -#endif /* SQUID_ADAPTATION__ITERATOR_H */ +#endif /* SQUID_SRC_ADAPTATION_ITERATOR_H */ diff --git a/src/adaptation/Message.h b/src/adaptation/Message.h index b8c93ad29b..52293c3d78 100644 --- a/src/adaptation/Message.h +++ b/src/adaptation/Message.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID__ADAPTATION__MESSAGE_H -#define SQUID__ADAPTATION__MESSAGE_H +#ifndef SQUID_SRC_ADAPTATION_MESSAGE_H +#define SQUID_SRC_ADAPTATION_MESSAGE_H #include "base/RefCount.h" #include "http/forward.h" @@ -54,5 +54,5 @@ private: // TODO: replace ICAPInOut with Adaptation::Message (adding one for "cause") -#endif /* SQUID__ADAPTATION__MESSAGE_H */ +#endif /* SQUID_SRC_ADAPTATION_MESSAGE_H */ diff --git a/src/adaptation/Service.h b/src/adaptation/Service.h index c7ea7f9b84..3325c97e11 100644 --- a/src/adaptation/Service.h +++ b/src/adaptation/Service.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ADAPTATION__SERVICE_H -#define SQUID_ADAPTATION__SERVICE_H +#ifndef SQUID_SRC_ADAPTATION_SERVICE_H +#define SQUID_SRC_ADAPTATION_SERVICE_H #include "AccessLogEntry.h" #include "adaptation/Elements.h" @@ -76,5 +76,5 @@ void DetachServices(); } // namespace Adaptation -#endif /* SQUID_ADAPTATION__SERVICE_H */ +#endif /* SQUID_SRC_ADAPTATION_SERVICE_H */ diff --git a/src/adaptation/ServiceConfig.h b/src/adaptation/ServiceConfig.h index 14e9ed7975..642951fe5d 100644 --- a/src/adaptation/ServiceConfig.h +++ b/src/adaptation/ServiceConfig.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ADAPTATION__SERVICE_CONFIG_H -#define SQUID_ADAPTATION__SERVICE_CONFIG_H +#ifndef SQUID_SRC_ADAPTATION_SERVICECONFIG_H +#define SQUID_SRC_ADAPTATION_SERVICECONFIG_H #include "adaptation/Elements.h" #include "base/RefCount.h" @@ -69,5 +69,5 @@ protected: } // namespace Adaptation -#endif /* SQUID_ADAPTATION__SERVICE_CONFIG_H */ +#endif /* SQUID_SRC_ADAPTATION_SERVICECONFIG_H */ diff --git a/src/adaptation/ServiceFilter.h b/src/adaptation/ServiceFilter.h index 2eca99b360..6f3c661cf6 100644 --- a/src/adaptation/ServiceFilter.h +++ b/src/adaptation/ServiceFilter.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ADAPTATION__SERVICE_FILTER_H -#define SQUID_ADAPTATION__SERVICE_FILTER_H +#ifndef SQUID_SRC_ADAPTATION_SERVICEFILTER_H +#define SQUID_SRC_ADAPTATION_SERVICEFILTER_H #include "AccessLogEntry.h" #include "adaptation/Elements.h" @@ -40,5 +40,5 @@ std::ostream &operator <<(std::ostream &, const ServiceFilter &); } // namespace Adaptation -#endif /* SQUID_ADAPTATION__SERVICE_FILTER_H */ +#endif /* SQUID_SRC_ADAPTATION_SERVICEFILTER_H */ diff --git a/src/adaptation/ServiceGroups.h b/src/adaptation/ServiceGroups.h index 430ff503b3..d74d259b9e 100644 --- a/src/adaptation/ServiceGroups.h +++ b/src/adaptation/ServiceGroups.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ADAPTATION__SERVICE_GROUPS_H -#define SQUID_ADAPTATION__SERVICE_GROUPS_H +#ifndef SQUID_SRC_ADAPTATION_SERVICEGROUPS_H +#define SQUID_SRC_ADAPTATION_SERVICEGROUPS_H #include "adaptation/Elements.h" #include "adaptation/forward.h" @@ -156,5 +156,5 @@ ServiceGroupPointer FindGroup(const ServiceGroup::Id &id); } // namespace Adaptation -#endif /* SQUID_ADAPTATION__SERVICE_GROUPS_H */ +#endif /* SQUID_SRC_ADAPTATION_SERVICEGROUPS_H */ diff --git a/src/adaptation/ecap/Config.h b/src/adaptation/ecap/Config.h index 9b1d92746f..2956b48e52 100644 --- a/src/adaptation/ecap/Config.h +++ b/src/adaptation/ecap/Config.h @@ -8,8 +8,8 @@ /* DEBUG: section 93 eCAP Interface */ -#ifndef SQUID_ECAP_CONFIG_H -#define SQUID_ECAP_CONFIG_H +#ifndef SQUID_SRC_ADAPTATION_ECAP_CONFIG_H +#define SQUID_SRC_ADAPTATION_ECAP_CONFIG_H #include "adaptation/Config.h" #include "adaptation/ServiceConfig.h" @@ -59,5 +59,5 @@ extern Config TheConfig; } // namespace Ecap } // namespace Adaptation -#endif /* SQUID_ECAP_CONFIG_H */ +#endif /* SQUID_SRC_ADAPTATION_ECAP_CONFIG_H */ diff --git a/src/adaptation/ecap/Host.h b/src/adaptation/ecap/Host.h index 3e9e3efcba..11fc67ac10 100644 --- a/src/adaptation/ecap/Host.h +++ b/src/adaptation/ecap/Host.h @@ -8,8 +8,8 @@ /* DEBUG: section 93 eCAP Interface */ -#ifndef SQUID_ECAP_HOST_H -#define SQUID_ECAP_HOST_H +#ifndef SQUID_SRC_ADAPTATION_ECAP_HOST_H +#define SQUID_SRC_ADAPTATION_ECAP_HOST_H #include @@ -53,5 +53,5 @@ extern const libecap::Name metaBypassable; ///< an ecap_service parameter } // namespace Ecap } // namespace Adaptation -#endif /* SQUID_ECAP_HOST_H */ +#endif /* SQUID_SRC_ADAPTATION_ECAP_HOST_H */ diff --git a/src/adaptation/ecap/MessageRep.h b/src/adaptation/ecap/MessageRep.h index 97ecb543db..fb13706386 100644 --- a/src/adaptation/ecap/MessageRep.h +++ b/src/adaptation/ecap/MessageRep.h @@ -8,8 +8,8 @@ /* DEBUG: section 93 eCAP Interface */ -#ifndef SQUID__ECAP__MESSAGE_REP_H -#define SQUID__ECAP__MESSAGE_REP_H +#ifndef SQUID_SRC_ADAPTATION_ECAP_MESSAGEREP_H +#define SQUID_SRC_ADAPTATION_ECAP_MESSAGEREP_H #include "adaptation/forward.h" #include "adaptation/Message.h" @@ -175,5 +175,5 @@ private: } // namespace Ecap } // namespace Adaptation -#endif /* SQUID__E_CAP__MESSAGE_REP_H */ +#endif /* SQUID_SRC_ADAPTATION_ECAP_MESSAGEREP_H */ diff --git a/src/adaptation/ecap/Registry.h b/src/adaptation/ecap/Registry.h index 62172ae668..0f68022961 100644 --- a/src/adaptation/ecap/Registry.h +++ b/src/adaptation/ecap/Registry.h @@ -10,6 +10,8 @@ #define SQUID_SRC_ADAPTATION_ECAP_REGISTRY_H // TBD +#ifndef SQUID_SRC_ADAPTATION_ECAP_REGISTRY_H +#define SQUID_SRC_ADAPTATION_ECAP_REGISTRY_H #endif /* SQUID_SRC_ADAPTATION_ECAP_REGISTRY_H */ diff --git a/src/adaptation/ecap/ServiceRep.h b/src/adaptation/ecap/ServiceRep.h index ec953e8032..1fa7affd3c 100644 --- a/src/adaptation/ecap/ServiceRep.h +++ b/src/adaptation/ecap/ServiceRep.h @@ -8,8 +8,8 @@ /* DEBUG: section 93 eCAP Interface */ -#ifndef SQUID_ECAP_SERVICE_REP_H -#define SQUID_ECAP_SERVICE_REP_H +#ifndef SQUID_SRC_ADAPTATION_ECAP_SERVICEREP_H +#define SQUID_SRC_ADAPTATION_ECAP_SERVICEREP_H #include "adaptation/forward.h" #include "adaptation/Service.h" @@ -66,5 +66,5 @@ void CheckUnusedAdapterServices(const Services& services); } // namespace Ecap } // namespace Adaptation -#endif /* SQUID_ECAP_SERVICE_REP_H */ +#endif /* SQUID_SRC_ADAPTATION_ECAP_SERVICEREP_H */ diff --git a/src/adaptation/ecap/XactionRep.h b/src/adaptation/ecap/XactionRep.h index 49c62c0e16..cc43b37179 100644 --- a/src/adaptation/ecap/XactionRep.h +++ b/src/adaptation/ecap/XactionRep.h @@ -8,8 +8,8 @@ /* DEBUG: section 93 eCAP Interface */ -#ifndef SQUID_ECAP_XACTION_REP_H -#define SQUID_ECAP_XACTION_REP_H +#ifndef SQUID_SRC_ADAPTATION_ECAP_XACTIONREP_H +#define SQUID_SRC_ADAPTATION_ECAP_XACTIONREP_H #include "adaptation/ecap/MessageRep.h" #include "adaptation/ecap/ServiceRep.h" @@ -129,5 +129,5 @@ private: } // namespace Ecap } // namespace Adaptation -#endif /* SQUID_ECAP_XACTION_REP_H */ +#endif /* SQUID_SRC_ADAPTATION_ECAP_XACTIONREP_H */ diff --git a/src/adaptation/forward.h b/src/adaptation/forward.h index a04ca6f906..a7e12974f9 100644 --- a/src/adaptation/forward.h +++ b/src/adaptation/forward.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ADAPTATION__FORWARD_H -#define SQUID_ADAPTATION__FORWARD_H +#ifndef SQUID_SRC_ADAPTATION_FORWARD_H +#define SQUID_SRC_ADAPTATION_FORWARD_H // forward-declarations for commonly used adaptation classes @@ -37,5 +37,5 @@ typedef RefCount ServiceGroupPointer; } // namespace Adaptation -#endif /* SQUID_ADAPTATION__FORWARD_H */ +#endif /* SQUID_SRC_ADAPTATION_FORWARD_H */ diff --git a/src/adaptation/icap/Client.h b/src/adaptation/icap/Client.h index 83be69d9cb..92473b499f 100644 --- a/src/adaptation/icap/Client.h +++ b/src/adaptation/icap/Client.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ICAPCLIENT_H -#define SQUID_ICAPCLIENT_H +#ifndef SQUID_SRC_ADAPTATION_ICAP_CLIENT_H +#define SQUID_SRC_ADAPTATION_ICAP_CLIENT_H // ICAP-related things needed by code unaware of ICAP internals. @@ -22,5 +22,5 @@ void CleanModule(); } // namespace Icap } // namespace Adaptation -#endif /* SQUID_ICAPCLIENT_H */ +#endif /* SQUID_SRC_ADAPTATION_ICAP_CLIENT_H */ diff --git a/src/adaptation/icap/Config.h b/src/adaptation/icap/Config.h index ccf1ec5606..76976efb5b 100644 --- a/src/adaptation/icap/Config.h +++ b/src/adaptation/icap/Config.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ICAPCONFIG_H -#define SQUID_ICAPCONFIG_H +#ifndef SQUID_SRC_ADAPTATION_ICAP_CONFIG_H +#define SQUID_SRC_ADAPTATION_ICAP_CONFIG_H #include "acl/forward.h" #include "adaptation/Config.h" @@ -56,5 +56,5 @@ extern Config TheConfig; } // namespace Icap } // namespace Adaptation -#endif /* SQUID_ICAPCONFIG_H */ +#endif /* SQUID_SRC_ADAPTATION_ICAP_CONFIG_H */ diff --git a/src/adaptation/icap/Elements.h b/src/adaptation/icap/Elements.h index 0e9fb1ba74..fd3a9c2d6c 100644 --- a/src/adaptation/icap/Elements.h +++ b/src/adaptation/icap/Elements.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ICAPELEMENTS_H -#define SQUID_ICAPELEMENTS_H +#ifndef SQUID_SRC_ADAPTATION_ICAP_ELEMENTS_H +#define SQUID_SRC_ADAPTATION_ICAP_ELEMENTS_H #include "adaptation/Elements.h" @@ -50,5 +50,5 @@ extern const XactOutcome xoSatisfied; ///< request satisfaction } // namespace Icap } // namespace Adaptation -#endif /* SQUID_ICAPCLIENT_H */ +#endif /* SQUID_SRC_ADAPTATION_ICAP_ELEMENTS_H */ diff --git a/src/adaptation/icap/History.h b/src/adaptation/icap/History.h index 15613aef56..385f6d17bf 100644 --- a/src/adaptation/icap/History.h +++ b/src/adaptation/icap/History.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ICAPHISTORY_H -#define SQUID_ICAPHISTORY_H +#ifndef SQUID_SRC_ADAPTATION_ICAP_HISTORY_H +#define SQUID_SRC_ADAPTATION_ICAP_HISTORY_H #include "base/RefCount.h" #include "enums.h" @@ -56,5 +56,5 @@ private: } // namespace Icap } // namespace Adaptation -#endif /*SQUID_HISTORY_H*/ +#endif /* SQUID_SRC_ADAPTATION_ICAP_HISTORY_H */ diff --git a/src/adaptation/icap/InOut.h b/src/adaptation/icap/InOut.h index e4257f530e..6c5a63614f 100644 --- a/src/adaptation/icap/InOut.h +++ b/src/adaptation/icap/InOut.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ICAPINOUT_H -#define SQUID_ICAPINOUT_H +#ifndef SQUID_SRC_ADAPTATION_ICAP_INOUT_H +#define SQUID_SRC_ADAPTATION_ICAP_INOUT_H #include "HttpReply.h" @@ -66,5 +66,5 @@ public: } // namespace Icap } // namespace Adaptation -#endif /* SQUID_ICAPINOUT_H */ +#endif /* SQUID_SRC_ADAPTATION_ICAP_INOUT_H */ diff --git a/src/adaptation/icap/Launcher.h b/src/adaptation/icap/Launcher.h index fcd1501bcc..bbd79dfa6e 100644 --- a/src/adaptation/icap/Launcher.h +++ b/src/adaptation/icap/Launcher.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ICAPLAUNCHER_H -#define SQUID_ICAPLAUNCHER_H +#ifndef SQUID_SRC_ADAPTATION_ICAP_LAUNCHER_H +#define SQUID_SRC_ADAPTATION_ICAP_LAUNCHER_H #include "adaptation/icap/ServiceRep.h" #include "adaptation/Initiate.h" @@ -110,5 +110,5 @@ operator <<(std::ostream &os, const XactAbortInfo &xai) } // namespace Icap } // namespace Adaptation -#endif /* SQUID_ICAPLAUNCHER_H */ +#endif /* SQUID_SRC_ADAPTATION_ICAP_LAUNCHER_H */ diff --git a/src/adaptation/icap/ModXact.h b/src/adaptation/icap/ModXact.h index 00068c2d42..89a099c0b1 100644 --- a/src/adaptation/icap/ModXact.h +++ b/src/adaptation/icap/ModXact.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ICAPMODXACT_H -#define SQUID_ICAPMODXACT_H +#ifndef SQUID_SRC_ADAPTATION_ICAP_MODXACT_H +#define SQUID_SRC_ADAPTATION_ICAP_MODXACT_H #include "AccessLogEntry.h" #include "adaptation/icap/InOut.h" @@ -398,5 +398,5 @@ protected: } // namespace Icap } // namespace Adaptation -#endif /* SQUID_ICAPMOD_XACT_H */ +#endif /* SQUID_SRC_ADAPTATION_ICAP_MODXACT_H */ diff --git a/src/adaptation/icap/OptXact.h b/src/adaptation/icap/OptXact.h index a973c8331f..7db7a07861 100644 --- a/src/adaptation/icap/OptXact.h +++ b/src/adaptation/icap/OptXact.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ICAPOPTXACT_H -#define SQUID_ICAPOPTXACT_H +#ifndef SQUID_SRC_ADAPTATION_ICAP_OPTXACT_H +#define SQUID_SRC_ADAPTATION_ICAP_OPTXACT_H #include "adaptation/icap/Launcher.h" #include "adaptation/icap/Xaction.h" @@ -66,5 +66,5 @@ protected: } // namespace Icap } // namespace Adaptation -#endif /* SQUID_ICAPOPTXACT_H */ +#endif /* SQUID_SRC_ADAPTATION_ICAP_OPTXACT_H */ diff --git a/src/adaptation/icap/Options.h b/src/adaptation/icap/Options.h index 4412690968..823d77e1ef 100644 --- a/src/adaptation/icap/Options.h +++ b/src/adaptation/icap/Options.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ICAPOPTIONS_H -#define SQUID_ICAPOPTIONS_H +#ifndef SQUID_SRC_ADAPTATION_ICAP_OPTIONS_H +#define SQUID_SRC_ADAPTATION_ICAP_OPTIONS_H #include "adaptation/icap/ServiceRep.h" @@ -100,5 +100,5 @@ private: } // namespace Icap } // namespace Adaptation -#endif /* SQUID_ICAPOPTIONS_H */ +#endif /* SQUID_SRC_ADAPTATION_ICAP_OPTIONS_H */ diff --git a/src/adaptation/icap/ServiceRep.h b/src/adaptation/icap/ServiceRep.h index 01077009dd..7afb3851f8 100644 --- a/src/adaptation/icap/ServiceRep.h +++ b/src/adaptation/icap/ServiceRep.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ICAPSERVICEREP_H -#define SQUID_ICAPSERVICEREP_H +#ifndef SQUID_SRC_ADAPTATION_ICAP_SERVICEREP_H +#define SQUID_SRC_ADAPTATION_ICAP_SERVICEREP_H #include "adaptation/forward.h" #include "adaptation/icap/Elements.h" @@ -205,5 +205,5 @@ public: } // namespace Icap } // namespace Adaptation -#endif /* SQUID_ICAPSERVICEREP_H */ +#endif /* SQUID_SRC_ADAPTATION_ICAP_SERVICEREP_H */ diff --git a/src/adaptation/icap/Xaction.h b/src/adaptation/icap/Xaction.h index 73bc2dd8ad..fe62874c77 100644 --- a/src/adaptation/icap/Xaction.h +++ b/src/adaptation/icap/Xaction.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ICAPXACTION_H -#define SQUID_ICAPXACTION_H +#ifndef SQUID_SRC_ADAPTATION_ICAP_XACTION_H +#define SQUID_SRC_ADAPTATION_ICAP_XACTION_H #include "AccessLogEntry.h" #include "adaptation/icap/ServiceRep.h" @@ -171,5 +171,5 @@ private: } // namespace Icap } // namespace Adaptation -#endif /* SQUID_ICAPXACTION_H */ +#endif /* SQUID_SRC_ADAPTATION_ICAP_XACTION_H */ diff --git a/src/adaptation/icap/icap_log.h b/src/adaptation/icap/icap_log.h index 89ddf2ab6b..a384bfd47c 100644 --- a/src/adaptation/icap/icap_log.h +++ b/src/adaptation/icap/icap_log.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef ICAP_LOG_H_ -#define ICAP_LOG_H_ +#ifndef SQUID_SRC_ADAPTATION_ICAP_ICAP_LOG_H +#define SQUID_SRC_ADAPTATION_ICAP_ICAP_LOG_H #include "AccessLogEntry.h" #include "base/RefCount.h" @@ -23,5 +23,5 @@ void icapLogLog(AccessLogEntryPointer &al); extern int IcapLogfileStatus; -#endif /*ICAP_LOG_H_*/ +#endif /* SQUID_SRC_ADAPTATION_ICAP_ICAP_LOG_H */ diff --git a/src/anyp/PortCfg.h b/src/anyp/PortCfg.h index 97dab0dab6..61e5c35aca 100644 --- a/src/anyp/PortCfg.h +++ b/src/anyp/PortCfg.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ANYP_PORTCFG_H -#define SQUID_ANYP_PORTCFG_H +#ifndef SQUID_SRC_ANYP_PORTCFG_H +#define SQUID_SRC_ANYP_PORTCFG_H #include "anyp/forward.h" #include "anyp/ProtocolVersion.h" @@ -91,5 +91,5 @@ extern AnyP::PortCfgPointer FtpPortList; extern int NHttpSockets; extern int HttpSockets[MAXTCPLISTENPORTS]; -#endif /* SQUID_ANYP_PORTCFG_H */ +#endif /* SQUID_SRC_ANYP_PORTCFG_H */ diff --git a/src/anyp/ProtocolType.h b/src/anyp/ProtocolType.h index 6e5ef8f431..31156086d8 100644 --- a/src/anyp/ProtocolType.h +++ b/src/anyp/ProtocolType.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_ANYP_PROTOCOLTYPE_H -#define _SQUID_SRC_ANYP_PROTOCOLTYPE_H +#ifndef SQUID_SRC_ANYP_PROTOCOLTYPE_H +#define SQUID_SRC_ANYP_PROTOCOLTYPE_H #include @@ -61,5 +61,5 @@ operator <<(std::ostream &os, ProtocolType const &p) } // namespace AnyP -#endif /* _SQUID_SRC_ANYP_PROTOCOLTYPE_H */ +#endif /* SQUID_SRC_ANYP_PROTOCOLTYPE_H */ diff --git a/src/anyp/ProtocolVersion.h b/src/anyp/ProtocolVersion.h index 6125e247d3..098eab5554 100644 --- a/src/anyp/ProtocolVersion.h +++ b/src/anyp/ProtocolVersion.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ANYP_PROTOCOLVERSION_H -#define SQUID_ANYP_PROTOCOLVERSION_H +#ifndef SQUID_SRC_ANYP_PROTOCOLVERSION_H +#define SQUID_SRC_ANYP_PROTOCOLVERSION_H #include "anyp/ProtocolType.h" @@ -99,5 +99,5 @@ operator << (std::ostream &os, const ProtocolVersion &v) } // namespace AnyP -#endif /* SQUID_ANYP_PROTOCOLVERSION_H */ +#endif /* SQUID_SRC_ANYP_PROTOCOLVERSION_H */ diff --git a/src/anyp/TrafficMode.h b/src/anyp/TrafficMode.h index 2e74cad9aa..2eddf5b352 100644 --- a/src/anyp/TrafficMode.h +++ b/src/anyp/TrafficMode.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ANYP_TRAFFIC_MODE_H -#define SQUID_ANYP_TRAFFIC_MODE_H +#ifndef SQUID_SRC_ANYP_TRAFFICMODE_H +#define SQUID_SRC_ANYP_TRAFFICMODE_H namespace AnyP { @@ -81,5 +81,5 @@ public: } // namespace AnyP -#endif +#endif /* SQUID_SRC_ANYP_TRAFFICMODE_H */ diff --git a/src/anyp/UriScheme.h b/src/anyp/UriScheme.h index 492e98b80c..1d78764c4b 100644 --- a/src/anyp/UriScheme.h +++ b/src/anyp/UriScheme.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ANYP_URISCHEME_H -#define SQUID_ANYP_URISCHEME_H +#ifndef SQUID_SRC_ANYP_URISCHEME_H +#define SQUID_SRC_ANYP_URISCHEME_H #include "anyp/ProtocolType.h" #include "sbuf/SBuf.h" @@ -78,5 +78,5 @@ operator <<(std::ostream &os, const UriScheme &scheme) } // namespace AnyP -#endif /* SQUID_ANYP_URISCHEME_H */ +#endif /* SQUID_SRC_ANYP_URISCHEME_H */ diff --git a/src/anyp/forward.h b/src/anyp/forward.h index 342e05db7c..b7f03e6f07 100644 --- a/src/anyp/forward.h +++ b/src/anyp/forward.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_ANYP_FORWARD_H -#define _SQUID_SRC_ANYP_FORWARD_H +#ifndef SQUID_SRC_ANYP_FORWARD_H +#define SQUID_SRC_ANYP_FORWARD_H #include "base/RefCount.h" @@ -22,5 +22,5 @@ class UriScheme; } // namespace AnyP -#endif /* _SQUID_SRC_ANYP_FORWARD_H */ +#endif /* SQUID_SRC_ANYP_FORWARD_H */ diff --git a/src/auth/Acl.h b/src/auth/Acl.h index 7486a198d6..98b741e389 100644 --- a/src/auth/Acl.h +++ b/src/auth/Acl.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_AUTH_ACL_H -#define SQUID_AUTH_ACL_H +#ifndef SQUID_SRC_AUTH_ACL_H +#define SQUID_SRC_AUTH_ACL_H #if USE_AUTH @@ -22,5 +22,5 @@ class ACLChecklist; Acl::Answer AuthenticateAcl(ACLChecklist *ch); #endif /* USE_AUTH */ -#endif /* SQUID_AUTH_ACL_H */ +#endif /* SQUID_SRC_AUTH_ACL_H */ diff --git a/src/auth/AclMaxUserIp.h b/src/auth/AclMaxUserIp.h index f6493b7f94..7928570734 100644 --- a/src/auth/AclMaxUserIp.h +++ b/src/auth/AclMaxUserIp.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLMAXUSERIP_H -#define SQUID_ACLMAXUSERIP_H +#ifndef SQUID_SRC_AUTH_ACLMAXUSERIP_H +#define SQUID_SRC_AUTH_ACLMAXUSERIP_H #if USE_AUTH @@ -44,5 +44,5 @@ private: }; #endif /* USE_AUTH */ -#endif /* SQUID_ACLMAXUSERIP_H */ +#endif /* SQUID_SRC_AUTH_ACLMAXUSERIP_H */ diff --git a/src/auth/AclProxyAuth.h b/src/auth/AclProxyAuth.h index 7febb60924..f3b9f5ad20 100644 --- a/src/auth/AclProxyAuth.h +++ b/src/auth/AclProxyAuth.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ACLPROXYAUTH_H -#define SQUID_ACLPROXYAUTH_H +#ifndef SQUID_SRC_AUTH_ACLPROXYAUTH_H +#define SQUID_SRC_AUTH_ACLPROXYAUTH_H #if USE_AUTH @@ -56,5 +56,5 @@ private: }; #endif /* USE_AUTH */ -#endif /* SQUID_ACLPROXYAUTH_H */ +#endif /* SQUID_SRC_AUTH_ACLPROXYAUTH_H */ diff --git a/src/auth/AuthAclState.h b/src/auth/AuthAclState.h index 6cfdfd2aed..fa6772b782 100644 --- a/src/auth/AuthAclState.h +++ b/src/auth/AuthAclState.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID__SRC_AUTH_AUTHACLSTATE_H -#define _SQUID__SRC_AUTH_AUTHACLSTATE_H +#ifndef SQUID_SRC_AUTH_AUTHACLSTATE_H +#define SQUID_SRC_AUTH_AUTHACLSTATE_H #if USE_AUTH @@ -19,5 +19,5 @@ typedef enum { } AuthAclState; #endif /* USE_AUTH */ -#endif /* _SQUID__SRC_AUTH_AUTHACLSTATE_H */ +#endif /* SQUID_SRC_AUTH_AUTHACLSTATE_H */ diff --git a/src/auth/CredentialState.h b/src/auth/CredentialState.h index f1a5aa9d70..95b651e2d6 100644 --- a/src/auth/CredentialState.h +++ b/src/auth/CredentialState.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_AUTH_CREDENTIALSTATE_H -#define _SQUID_AUTH_CREDENTIALSTATE_H +#ifndef SQUID_SRC_AUTH_CREDENTIALSTATE_H +#define SQUID_SRC_AUTH_CREDENTIALSTATE_H namespace Auth { @@ -24,5 +24,5 @@ extern const char *CredentialState_str[]; } // namespace Auth -#endif /* _SQUID_AUTH_CREDENTIALSTATE_H */ +#endif /* SQUID_SRC_AUTH_CREDENTIALSTATE_H */ diff --git a/src/auth/Gadgets.h b/src/auth/Gadgets.h index f2584346c6..49008ea747 100644 --- a/src/auth/Gadgets.h +++ b/src/auth/Gadgets.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_AUTH_GADGETS_H -#define SQUID_AUTH_GADGETS_H +#ifndef SQUID_SRC_AUTH_GADGETS_H +#define SQUID_SRC_AUTH_GADGETS_H #if USE_AUTH @@ -50,5 +50,5 @@ void authenticateOnCloseConnection(ConnStateData * conn); std::vector authenticateCachedUsersList(); #endif /* USE_AUTH */ -#endif /* SQUID_AUTH_GADGETS_H */ +#endif /* SQUID_SRC_AUTH_GADGETS_H */ diff --git a/src/auth/Scheme.h b/src/auth/Scheme.h index c4b9475909..caef8ce6a6 100644 --- a/src/auth/Scheme.h +++ b/src/auth/Scheme.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_AUTH_SCHEME_H -#define SQUID_AUTH_SCHEME_H +#ifndef SQUID_SRC_AUTH_SCHEME_H +#define SQUID_SRC_AUTH_SCHEME_H #if USE_AUTH @@ -73,5 +73,5 @@ private: } // namespace Auth #endif /* USE_AUTH */ -#endif /* SQUID_AUTH_SCHEME_H */ +#endif /* SQUID_SRC_AUTH_SCHEME_H */ diff --git a/src/auth/SchemesConfig.h b/src/auth/SchemesConfig.h index e36514daaa..21f4fb05f3 100644 --- a/src/auth/SchemesConfig.h +++ b/src/auth/SchemesConfig.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SCHEMES_CONFIG_H -#define SQUID_SCHEMES_CONFIG_H +#ifndef SQUID_SRC_AUTH_SCHEMESCONFIG_H +#define SQUID_SRC_AUTH_SCHEMESCONFIG_H #if USE_AUTH @@ -45,5 +45,5 @@ public: } // namespace Auth #endif /* USE_AUTH */ -#endif /* SQUID_SCHEMES_CONFIG_H */ +#endif /* SQUID_SRC_AUTH_SCHEMESCONFIG_H */ diff --git a/src/auth/Type.h b/src/auth/Type.h index af16ecf84d..44602bb438 100644 --- a/src/auth/Type.h +++ b/src/auth/Type.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID__SRC_AUTH_AUTHTYPE_H -#define _SQUID__SRC_AUTH_AUTHTYPE_H +#ifndef SQUID_SRC_AUTH_TYPE_H +#define SQUID_SRC_AUTH_TYPE_H #if USE_AUTH @@ -28,5 +28,5 @@ extern const char *Type_str[]; }; // namespace Auth #endif /* USE_AUTH */ -#endif +#endif /* SQUID_SRC_AUTH_TYPE_H */ diff --git a/src/auth/User.h b/src/auth/User.h index d649b5232d..46d402770e 100644 --- a/src/auth/User.h +++ b/src/auth/User.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_AUTH_USER_H -#define SQUID_AUTH_USER_H +#ifndef SQUID_SRC_AUTH_USER_H +#define SQUID_SRC_AUTH_USER_H #if USE_AUTH @@ -124,5 +124,5 @@ private: } // namespace Auth #endif /* USE_AUTH */ -#endif /* SQUID_AUTH_USER_H */ +#endif /* SQUID_SRC_AUTH_USER_H */ diff --git a/src/auth/UserRequest.h b/src/auth/UserRequest.h index 0e975bfaec..f2d7eefb3b 100644 --- a/src/auth/UserRequest.h +++ b/src/auth/UserRequest.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_AUTH_USERREQUEST_H -#define SQUID_AUTH_USERREQUEST_H +#ifndef SQUID_SRC_AUTH_USERREQUEST_H +#define SQUID_SRC_AUTH_USERREQUEST_H #if USE_AUTH @@ -250,5 +250,5 @@ int authenticateAuthUserRequestIPCount(Auth::UserRequest::Pointer); int authenticateUserAuthenticated(Auth::UserRequest::Pointer); #endif /* USE_AUTH */ -#endif /* SQUID_AUTHUSERREQUEST_H */ +#endif /* SQUID_SRC_AUTH_USERREQUEST_H */ diff --git a/src/auth/basic/Config.h b/src/auth/basic/Config.h index a6555d28c6..e0b4ad07ef 100644 --- a/src/auth/basic/Config.h +++ b/src/auth/basic/Config.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef __AUTH_BASIC_H__ -#define __AUTH_BASIC_H__ +#ifndef SQUID_SRC_AUTH_BASIC_CONFIG_H +#define SQUID_SRC_AUTH_BASIC_CONFIG_H #if HAVE_AUTH_MODULE_BASIC @@ -53,5 +53,5 @@ private: extern helper *basicauthenticators; #endif /* HAVE_AUTH_MODULE_BASIC */ -#endif /* __AUTH_BASIC_H__ */ +#endif /* SQUID_SRC_AUTH_BASIC_CONFIG_H */ diff --git a/src/auth/basic/NCSA/crypt_md5.h b/src/auth/basic/NCSA/crypt_md5.h index 9cf88aab47..80382f03f0 100644 --- a/src/auth/basic/NCSA/crypt_md5.h +++ b/src/auth/basic/NCSA/crypt_md5.h @@ -20,13 +20,13 @@ * to64(salt+4, rand(), 4); * salt[0] = '\0'; */ -#ifndef _CRYPT_MD5_H -#define _CRYPT_MD5_H +#ifndef SQUID_SRC_AUTH_BASIC_NCSA_CRYPT_MD5_H +#define SQUID_SRC_AUTH_BASIC_NCSA_CRYPT_MD5_H char *crypt_md5(const char *pw, const char *salt); /* MD5 hash without salt */ char *md5sum(const char *s); -#endif /* _CRYPT_MD5_H */ +#endif /* SQUID_SRC_AUTH_BASIC_NCSA_CRYPT_MD5_H */ diff --git a/src/auth/basic/NIS/nis_support.h b/src/auth/basic/NIS/nis_support.h index 4282b0ea3d..01b9dbf5be 100644 --- a/src/auth/basic/NIS/nis_support.h +++ b/src/auth/basic/NIS/nis_support.h @@ -5,6 +5,8 @@ * contributions from numerous individuals and organizations. * Please see the COPYING and CONTRIBUTORS files for details. */ +#ifndef SQUID_SRC_AUTH_BASIC_NIS_NIS_SUPPORT_H +#define SQUID_SRC_AUTH_BASIC_NIS_NIS_SUPPORT_H #ifndef SQUID_SRC_AUTH_BASIC_NIS_NIS_SUPPORT_H #define SQUID_SRC_AUTH_BASIC_NIS_NIS_SUPPORT_H diff --git a/src/auth/basic/SMB_LM/msntauth.h b/src/auth/basic/SMB_LM/msntauth.h index 69d972d591..b4a496f906 100644 --- a/src/auth/basic/SMB_LM/msntauth.h +++ b/src/auth/basic/SMB_LM/msntauth.h @@ -6,11 +6,11 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_HELPERS_BASIC_AUTH_MSNT_MSNTAUTH_H -#define _SQUID_HELPERS_BASIC_AUTH_MSNT_MSNTAUTH_H +#ifndef SQUID_SRC_AUTH_BASIC_SMB_LM_MSNTAUTH_H +#define SQUID_SRC_AUTH_BASIC_SMB_LM_MSNTAUTH_H extern int QueryServers(char *, char *); extern void Check_forallowchange(void); -#endif /* _SQUID_HELPERS_BASIC_AUTH_MSNT_MSNTAUTH_H */ +#endif /* SQUID_SRC_AUTH_BASIC_SMB_LM_MSNTAUTH_H */ diff --git a/src/auth/basic/SMB_LM/valid.h b/src/auth/basic/SMB_LM/valid.h index abfad3d00a..bfdb009291 100644 --- a/src/auth/basic/SMB_LM/valid.h +++ b/src/auth/basic/SMB_LM/valid.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _VALID_H_ -#define _VALID_H_ +#ifndef SQUID_SRC_AUTH_BASIC_SMB_LM_VALID_H +#define SQUID_SRC_AUTH_BASIC_SMB_LM_VALID_H /* SMB User verification function */ #define NTV_NO_ERROR 0 @@ -17,5 +17,5 @@ int Valid_User(char *USERNAME, char *PASSWORD, const char *SERVER, char *BACKUP, const char *DOMAIN); -#endif +#endif /* SQUID_SRC_AUTH_BASIC_SMB_LM_VALID_H */ diff --git a/src/auth/basic/SSPI/valid.h b/src/auth/basic/SSPI/valid.h index 3ba0d49988..edb4cf1b09 100644 --- a/src/auth/basic/SSPI/valid.h +++ b/src/auth/basic/SSPI/valid.h @@ -33,8 +33,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. */ -#ifndef _VALID_H_ -#define _VALID_H_ +#ifndef SQUID_SRC_AUTH_BASIC_SSPI_VALID_H +#define SQUID_SRC_AUTH_BASIC_SSPI_VALID_H #include "sspwin32.h" @@ -101,5 +101,5 @@ debug(char *format,...) } #endif /* __GNUC__ */ -#endif +#endif /* SQUID_SRC_AUTH_BASIC_SSPI_VALID_H */ diff --git a/src/auth/basic/Scheme.h b/src/auth/basic/Scheme.h index 841a50040d..586d2bca8d 100644 --- a/src/auth/basic/Scheme.h +++ b/src/auth/basic/Scheme.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_AUTH_BASIC_SCHEME_H -#define SQUID_AUTH_BASIC_SCHEME_H +#ifndef SQUID_SRC_AUTH_BASIC_SCHEME_H +#define SQUID_SRC_AUTH_BASIC_SCHEME_H #if HAVE_AUTH_MODULE_BASIC @@ -43,5 +43,5 @@ private: } // namespace Auth #endif /* HAVE_AUTH_MODULE_BASIC */ -#endif /* SQUID_AUTH_BASIC_SCHEME_H */ +#endif /* SQUID_SRC_AUTH_BASIC_SCHEME_H */ diff --git a/src/auth/basic/User.h b/src/auth/basic/User.h index 181cf9f76d..d241100445 100644 --- a/src/auth/basic/User.h +++ b/src/auth/basic/User.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_AUTH_BASIC_USER_H -#define _SQUID_AUTH_BASIC_USER_H +#ifndef SQUID_SRC_AUTH_BASIC_USER_H +#define SQUID_SRC_AUTH_BASIC_USER_H #if HAVE_AUTH_MODULE_BASIC @@ -54,5 +54,5 @@ private: } // namespace Auth #endif /* HAVE_AUTH_MODULE_BASIC */ -#endif /* _SQUID_AUTH_BASIC_USER_H */ +#endif /* SQUID_SRC_AUTH_BASIC_USER_H */ diff --git a/src/auth/basic/UserRequest.h b/src/auth/basic/UserRequest.h index 945cfef8a9..bb384b0d19 100644 --- a/src/auth/basic/UserRequest.h +++ b/src/auth/basic/UserRequest.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_AUTH_BASIC_USERREQUEST_H -#define _SQUID_SRC_AUTH_BASIC_USERREQUEST_H +#ifndef SQUID_SRC_AUTH_BASIC_USERREQUEST_H +#define SQUID_SRC_AUTH_BASIC_USERREQUEST_H #if HAVE_AUTH_MODULE_BASIC @@ -46,5 +46,5 @@ private: } // namespace Auth #endif /* HAVE_AUTH_MODULE_BASIC */ -#endif /* _SQUID_SRC_AUTH_BASIC_USERREQUEST_H */ +#endif /* SQUID_SRC_AUTH_BASIC_USERREQUEST_H */ diff --git a/src/auth/digest/Config.h b/src/auth/digest/Config.h index 174a1a2cfd..498c1c35bc 100644 --- a/src/auth/digest/Config.h +++ b/src/auth/digest/Config.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef __AUTH_DIGEST_H__ -#define __AUTH_DIGEST_H__ +#ifndef SQUID_SRC_AUTH_DIGEST_CONFIG_H +#define SQUID_SRC_AUTH_DIGEST_CONFIG_H #if HAVE_AUTH_MODULE_DIGEST @@ -103,5 +103,5 @@ public: extern helper *digestauthenticators; #endif /* HAVE_AUTH_MODULE_DIGEST */ -#endif +#endif /* SQUID_SRC_AUTH_DIGEST_CONFIG_H */ diff --git a/src/auth/digest/LDAP/digest_common.h b/src/auth/digest/LDAP/digest_common.h index 17f386a561..f016916cf6 100644 --- a/src/auth/digest/LDAP/digest_common.h +++ b/src/auth/digest/LDAP/digest_common.h @@ -10,8 +10,8 @@ * Digest helper API details. */ -#ifndef SQUID_DIGEST_COMMON_H_ -#define SQUID_DIGEST_COMMON_H_ +#ifndef SQUID_SRC_AUTH_DIGEST_LDAP_DIGEST_COMMON_H +#define SQUID_SRC_AUTH_DIGEST_LDAP_DIGEST_COMMON_H #include "hash.h" #include "rfc2617.h" @@ -51,5 +51,5 @@ typedef struct _request_data { typedef void HandleArguments(int, char **); typedef void HHA1Creator(RequestData *); -#endif /* SQUID_DIGEST_COMMON_H_ */ +#endif /* SQUID_SRC_AUTH_DIGEST_LDAP_DIGEST_COMMON_H */ diff --git a/src/auth/digest/Scheme.h b/src/auth/digest/Scheme.h index 1b314f8639..9042c45599 100644 --- a/src/auth/digest/Scheme.h +++ b/src/auth/digest/Scheme.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_AUTH_DIGEST_SCHEME_H -#define SQUID_AUTH_DIGEST_SCHEME_H +#ifndef SQUID_SRC_AUTH_DIGEST_SCHEME_H +#define SQUID_SRC_AUTH_DIGEST_SCHEME_H #if HAVE_AUTH_MODULE_DIGEST @@ -45,5 +45,5 @@ private: } // namespace Auth #endif /* HAVE_AUTH_MODULE_DIGEST */ -#endif /* SQUID_AUTH_DIGEST_SCHEME_H */ +#endif /* SQUID_SRC_AUTH_DIGEST_SCHEME_H */ diff --git a/src/auth/digest/User.h b/src/auth/digest/User.h index 44c73279d0..263470f972 100644 --- a/src/auth/digest/User.h +++ b/src/auth/digest/User.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_AUTH_DIGEST_USER_H -#define _SQUID_AUTH_DIGEST_USER_H +#ifndef SQUID_SRC_AUTH_DIGEST_USER_H +#define SQUID_SRC_AUTH_DIGEST_USER_H #if HAVE_AUTH_MODULE_DIGEST @@ -48,5 +48,5 @@ public: } // namespace Auth #endif /* HAVE_AUTH_MODULE_DIGEST */ -#endif /* _SQUID_AUTH_DIGEST_USER_H */ +#endif /* SQUID_SRC_AUTH_DIGEST_USER_H */ diff --git a/src/auth/digest/UserRequest.h b/src/auth/digest/UserRequest.h index 16433585b4..11ecb182a8 100644 --- a/src/auth/digest/UserRequest.h +++ b/src/auth/digest/UserRequest.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_AUTH_DIGEST_USERREQUEST_H -#define _SQUID_SRC_AUTH_DIGEST_USERREQUEST_H +#ifndef SQUID_SRC_AUTH_DIGEST_USERREQUEST_H +#define SQUID_SRC_AUTH_DIGEST_USERREQUEST_H #if HAVE_AUTH_MODULE_DIGEST @@ -70,5 +70,5 @@ private: } // namespace Auth #endif /* HAVE_AUTH_MODULE_DIGEST */ -#endif /* _SQUID_SRC_AUTH_DIGEST_USERREQUEST_H */ +#endif /* SQUID_SRC_AUTH_DIGEST_USERREQUEST_H */ diff --git a/src/auth/digest/eDirectory/digest_common.h b/src/auth/digest/eDirectory/digest_common.h index b54d0e1966..a60f224752 100644 --- a/src/auth/digest/eDirectory/digest_common.h +++ b/src/auth/digest/eDirectory/digest_common.h @@ -10,8 +10,8 @@ * Digest helper API details. */ -#ifndef SQUID_DIGEST_COMMON_H_ -#define SQUID_DIGEST_COMMON_H_ +#ifndef SQUID_SRC_AUTH_DIGEST_EDIRECTORY_DIGEST_COMMON_H +#define SQUID_SRC_AUTH_DIGEST_EDIRECTORY_DIGEST_COMMON_H #include "hash.h" #include "rfc2617.h" @@ -54,5 +54,5 @@ typedef struct _request_data { typedef void HandleArguments(int, char **); typedef void HHA1Creator(RequestData *); -#endif /* SQUID_DIGEST_COMMON_H_ */ +#endif /* SQUID_SRC_AUTH_DIGEST_EDIRECTORY_DIGEST_COMMON_H */ diff --git a/src/auth/digest/eDirectory/edir_ldapext.h b/src/auth/digest/eDirectory/edir_ldapext.h index aaea9cc882..5e42900663 100644 --- a/src/auth/digest/eDirectory/edir_ldapext.h +++ b/src/auth/digest/eDirectory/edir_ldapext.h @@ -5,7 +5,6 @@ * contributions from numerous individuals and organizations. * Please see the COPYING and CONTRIBUTORS files for details. */ - #ifndef SQUID_SRC_AUTH_DIGEST_EDIRECTORY_EDIR_LDAPEXT_H #define SQUID_SRC_AUTH_DIGEST_EDIRECTORY_EDIR_LDAPEXT_H diff --git a/src/auth/digest/file/digest_common.h b/src/auth/digest/file/digest_common.h index 6a9219318b..8fd18aa1ed 100644 --- a/src/auth/digest/file/digest_common.h +++ b/src/auth/digest/file/digest_common.h @@ -10,8 +10,8 @@ * Digest helper API details. */ -#ifndef SQUID_DIGEST_COMMON_H_ -#define SQUID_DIGEST_COMMON_H_ +#ifndef SQUID_SRC_AUTH_DIGEST_FILE_DIGEST_COMMON_H +#define SQUID_SRC_AUTH_DIGEST_FILE_DIGEST_COMMON_H #include "hash.h" #include "rfc2617.h" @@ -46,5 +46,5 @@ typedef struct _request_data { typedef void HandleArguments(int, char **); typedef void HHA1Creator(RequestData *); -#endif /* SQUID_DIGEST_COMMON_H_ */ +#endif /* SQUID_SRC_AUTH_DIGEST_FILE_DIGEST_COMMON_H */ diff --git a/src/auth/negotiate/Config.h b/src/auth/negotiate/Config.h index b4dc2fe416..34306cdd48 100644 --- a/src/auth/negotiate/Config.h +++ b/src/auth/negotiate/Config.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef __AUTH_NEGOTIATE_H__ -#define __AUTH_NEGOTIATE_H__ +#ifndef SQUID_SRC_AUTH_NEGOTIATE_CONFIG_H +#define SQUID_SRC_AUTH_NEGOTIATE_CONFIG_H #if HAVE_AUTH_MODULE_NEGOTIATE @@ -42,5 +42,5 @@ public: extern statefulhelper *negotiateauthenticators; #endif /* HAVE_AUTH_MODULE_NEGOTIATE */ -#endif +#endif /* SQUID_SRC_AUTH_NEGOTIATE_CONFIG_H */ diff --git a/src/auth/negotiate/Scheme.h b/src/auth/negotiate/Scheme.h index 8ef943fb87..7408bcfa8c 100644 --- a/src/auth/negotiate/Scheme.h +++ b/src/auth/negotiate/Scheme.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_AUTH_NEGOTIATE_SCHEME_H -#define SQUID_AUTH_NEGOTIATE_SCHEME_H +#ifndef SQUID_SRC_AUTH_NEGOTIATE_SCHEME_H +#define SQUID_SRC_AUTH_NEGOTIATE_SCHEME_H #if HAVE_AUTH_MODULE_NEGOTIATE @@ -44,5 +44,5 @@ private: } // namespace Auth #endif /* HAVE_AUTH_MODULE_NEGOTIATE */ -#endif /* SQUID_AUTH_NEGOTIATE_SCHEME_H */ +#endif /* SQUID_SRC_AUTH_NEGOTIATE_SCHEME_H */ diff --git a/src/auth/negotiate/User.h b/src/auth/negotiate/User.h index e868d988ca..283e515829 100644 --- a/src/auth/negotiate/User.h +++ b/src/auth/negotiate/User.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_AUTH_NEGOTIATE_USER_H -#define _SQUID_AUTH_NEGOTIATE_USER_H +#ifndef SQUID_SRC_AUTH_NEGOTIATE_USER_H +#define SQUID_SRC_AUTH_NEGOTIATE_USER_H #if HAVE_AUTH_MODULE_NEGOTIATE @@ -42,5 +42,5 @@ public: } // namespace Auth #endif /* HAVE_AUTH_MODULE_NEGOTIATE */ -#endif /* _SQUID_AUTH_NEGOTIATE_USER_H */ +#endif /* SQUID_SRC_AUTH_NEGOTIATE_USER_H */ diff --git a/src/auth/negotiate/UserRequest.h b/src/auth/negotiate/UserRequest.h index 906814037a..b07a5d3ffd 100644 --- a/src/auth/negotiate/UserRequest.h +++ b/src/auth/negotiate/UserRequest.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_AUTH_NEGOTIATE_USERREQUEST_H -#define _SQUID_SRC_AUTH_NEGOTIATE_USERREQUEST_H +#ifndef SQUID_SRC_AUTH_NEGOTIATE_USERREQUEST_H +#define SQUID_SRC_AUTH_NEGOTIATE_USERREQUEST_H #if HAVE_AUTH_MODULE_NEGOTIATE @@ -66,5 +66,5 @@ private: } // namespace Auth #endif /* HAVE_AUTH_MODULE_NEGOTIATE */ -#endif /* _SQUID_SRC_AUTH_NEGOTIATE_USERREQUEST_H */ +#endif /* SQUID_SRC_AUTH_NEGOTIATE_USERREQUEST_H */ diff --git a/src/auth/ntlm/Config.h b/src/auth/ntlm/Config.h index 86570d2265..e9370d0735 100644 --- a/src/auth/ntlm/Config.h +++ b/src/auth/ntlm/Config.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef __AUTH_NTLM_H__ -#define __AUTH_NTLM_H__ +#ifndef SQUID_SRC_AUTH_NTLM_CONFIG_H +#define SQUID_SRC_AUTH_NTLM_CONFIG_H #if HAVE_AUTH_MODULE_NTLM @@ -45,5 +45,5 @@ public: extern statefulhelper *ntlmauthenticators; #endif /* HAVE_AUTH_MODULE_NTLM */ -#endif +#endif /* SQUID_SRC_AUTH_NTLM_CONFIG_H */ diff --git a/src/auth/ntlm/Scheme.h b/src/auth/ntlm/Scheme.h index 47d0a6edfc..bb93e4fba7 100644 --- a/src/auth/ntlm/Scheme.h +++ b/src/auth/ntlm/Scheme.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_AUTH_NTLM_SCHEME_H -#define SQUID_AUTH_NTLM_SCHEME_H +#ifndef SQUID_SRC_AUTH_NTLM_SCHEME_H +#define SQUID_SRC_AUTH_NTLM_SCHEME_H #if HAVE_AUTH_MODULE_NTLM @@ -41,5 +41,5 @@ public: } // namespace Auth #endif /* HAVE_AUTH_MODULE_NTLM */ -#endif /* SQUID_AUTH_NTLM_SCHEME_H */ +#endif /* SQUID_SRC_AUTH_NTLM_SCHEME_H */ diff --git a/src/auth/ntlm/User.h b/src/auth/ntlm/User.h index 8899eef5d2..e0e7587399 100644 --- a/src/auth/ntlm/User.h +++ b/src/auth/ntlm/User.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_AUTH_NTLM_USER_H -#define _SQUID_AUTH_NTLM_USER_H +#ifndef SQUID_SRC_AUTH_NTLM_USER_H +#define SQUID_SRC_AUTH_NTLM_USER_H #if HAVE_AUTH_MODULE_NTLM @@ -40,5 +40,5 @@ public: } // namespace Auth #endif /* HAVE_AUTH_MODULE_NTLM */ -#endif /* _SQUID_AUTH_NTLM_USER_H */ +#endif /* SQUID_SRC_AUTH_NTLM_USER_H */ diff --git a/src/auth/ntlm/UserRequest.h b/src/auth/ntlm/UserRequest.h index 9692d63a21..6b222c466e 100644 --- a/src/auth/ntlm/UserRequest.h +++ b/src/auth/ntlm/UserRequest.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_AUTH_NTLM_USERREQUEST_H -#define _SQUID_SRC_AUTH_NTLM_USERREQUEST_H +#ifndef SQUID_SRC_AUTH_NTLM_USERREQUEST_H +#define SQUID_SRC_AUTH_NTLM_USERREQUEST_H #if HAVE_AUTH_MODULE_NTLM @@ -64,5 +64,5 @@ private: } // namespace Auth #endif /* HAVE_AUTH_MODULE_NTLM */ -#endif /* _SQUID_SRC_AUTH_NTLM_USERREQUEST_H */ +#endif /* SQUID_SRC_AUTH_NTLM_USERREQUEST_H */ diff --git a/src/auth/toUtf.h b/src/auth/toUtf.h index f1d1b21bff..ece43719e4 100644 --- a/src/auth/toUtf.h +++ b/src/auth/toUtf.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_CHARSET_H -#define _SQUID_CHARSET_H +#ifndef SQUID_SRC_AUTH_TOUTF_H +#define SQUID_SRC_AUTH_TOUTF_H #include "sbuf/forward.h" @@ -20,5 +20,5 @@ SBuf Cp1251ToUtf8(const char *in); /// returns whether the given input is a valid (or empty) sequence of UTF-8 code points bool isValidUtf8String(const char *source, const char *sourceEnd); -#endif /* _SQUID_CHARSET_H */ +#endif /* SQUID_SRC_AUTH_TOUTF_H */ diff --git a/src/base/AsyncCall.h b/src/base/AsyncCall.h index 3dc638ee69..ee2046b2bd 100644 --- a/src/base/AsyncCall.h +++ b/src/base/AsyncCall.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ASYNCCALL_H -#define SQUID_ASYNCCALL_H +#ifndef SQUID_SRC_BASE_ASYNCCALL_H +#define SQUID_SRC_BASE_ASYNCCALL_H #include "base/CodeContext.h" #include "base/InstanceId.h" @@ -164,5 +164,5 @@ bool ScheduleCall(const char *fileName, int fileLine, const AsyncCall::Pointer & /** Call scheduling helper. */ #define ScheduleCallHere(call) ScheduleCall(__FILE__, __LINE__, (call)) -#endif /* SQUID_ASYNCCALL_H */ +#endif /* SQUID_SRC_BASE_ASYNCCALL_H */ diff --git a/src/base/AsyncCallList.h b/src/base/AsyncCallList.h index 8c0941c630..88cd8f036e 100644 --- a/src/base/AsyncCallList.h +++ b/src/base/AsyncCallList.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_BASE_ASYNCCALLLIST_H -#define SQUID_BASE_ASYNCCALLLIST_H +#ifndef SQUID_SRC_BASE_ASYNCCALLLIST_H +#define SQUID_SRC_BASE_ASYNCCALLLIST_H #include "base/forward.h" #include "base/RefCount.h" @@ -39,5 +39,5 @@ private: size_t length = 0; ///< \copydoc size() }; -#endif /* SQUID_BASE_ASYNCCALLLIST_H */ +#endif /* SQUID_SRC_BASE_ASYNCCALLLIST_H */ diff --git a/src/base/AsyncCallQueue.h b/src/base/AsyncCallQueue.h index fd844d75b5..b6f47be205 100644 --- a/src/base/AsyncCallQueue.h +++ b/src/base/AsyncCallQueue.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ASYNCCALLQUEUE_H -#define SQUID_ASYNCCALLQUEUE_H +#ifndef SQUID_SRC_BASE_ASYNCCALLQUEUE_H +#define SQUID_SRC_BASE_ASYNCCALLQUEUE_H #include "base/AsyncCallList.h" #include "base/forward.h" @@ -34,5 +34,5 @@ private: static AsyncCallQueue *TheInstance; }; -#endif /* SQUID_ASYNCCALLQUEUE_H */ +#endif /* SQUID_SRC_BASE_ASYNCCALLQUEUE_H */ diff --git a/src/base/AsyncCallbacks.h b/src/base/AsyncCallbacks.h index 3317385446..49556b0950 100644 --- a/src/base/AsyncCallbacks.h +++ b/src/base/AsyncCallbacks.h @@ -202,5 +202,5 @@ AsyncCallback_(const RefCount &call) AsyncCallback_(asyncCall((dbgSection), (dbgLevel), #function, \ callbackDialer(&function))) -#endif // SQUID_SRC_BASE_ASYNCCALLBACKS_H +#endif /* SQUID_SRC_BASE_ASYNCCALLBACKS_H */ diff --git a/src/base/AsyncCbdataCalls.h b/src/base/AsyncCbdataCalls.h index fd761e3566..686af92c8d 100644 --- a/src/base/AsyncCbdataCalls.h +++ b/src/base/AsyncCbdataCalls.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_BASE_ASYNCCBDATACALLS_H -#define SQUID_BASE_ASYNCCBDATACALLS_H +#ifndef SQUID_SRC_BASE_ASYNCCBDATACALLS_H +#define SQUID_SRC_BASE_ASYNCCBDATACALLS_H #include "base/AsyncCall.h" #include "base/CbcPointer.h" @@ -42,5 +42,5 @@ cbdataDialer(typename UnaryCbdataDialer::Handler *handler, Argument1 return UnaryCbdataDialer(handler, arg1); } -#endif +#endif /* SQUID_SRC_BASE_ASYNCCBDATACALLS_H */ diff --git a/src/base/AsyncFunCalls.h b/src/base/AsyncFunCalls.h index 5c076856f7..3b1436c743 100644 --- a/src/base/AsyncFunCalls.h +++ b/src/base/AsyncFunCalls.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_BASE_ASYNCFUNCALLS_H -#define SQUID_BASE_ASYNCFUNCALLS_H +#ifndef SQUID_SRC_BASE_ASYNCFUNCALLS_H +#define SQUID_SRC_BASE_ASYNCFUNCALLS_H #include "base/AsyncCall.h" @@ -62,5 +62,5 @@ callDialer(void (*handler)(Argument1), Argument1 arg1) return UnaryFunDialer(handler, arg1); } -#endif /* SQUID_BASE_ASYNCFUNCALLS_H */ +#endif /* SQUID_SRC_BASE_ASYNCFUNCALLS_H */ diff --git a/src/base/AsyncJob.h b/src/base/AsyncJob.h index 32f83482f4..09c54241bf 100644 --- a/src/base/AsyncJob.h +++ b/src/base/AsyncJob.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ASYNC_JOB_H -#define SQUID_ASYNC_JOB_H +#ifndef SQUID_SRC_BASE_ASYNCJOB_H +#define SQUID_SRC_BASE_ASYNCJOB_H #include "base/AsyncCall.h" #include "base/InstanceId.h" @@ -84,5 +84,5 @@ protected: bool swanSang_ = false; ///< swanSong() was called }; -#endif /* SQUID_ASYNC_JOB_H */ +#endif /* SQUID_SRC_BASE_ASYNCJOB_H */ diff --git a/src/base/AsyncJobCalls.h b/src/base/AsyncJobCalls.h index 78c898736a..044cb2e93c 100644 --- a/src/base/AsyncJobCalls.h +++ b/src/base/AsyncJobCalls.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ASYNCJOBCALLS_H -#define SQUID_ASYNCJOBCALLS_H +#ifndef SQUID_SRC_BASE_ASYNCJOBCALLS_H +#define SQUID_SRC_BASE_ASYNCJOBCALLS_H #include "base/AsyncJob.h" #include "base/CbcPointer.h" @@ -192,5 +192,5 @@ JobDialer::dial(AsyncCall &call) job->callEnd(); // may delete job } -#endif /* SQUID_ASYNCJOBCALLS_H */ +#endif /* SQUID_SRC_BASE_ASYNCJOBCALLS_H */ diff --git a/src/base/ByteCounter.h b/src/base/ByteCounter.h index e4f15b77ae..b9a3a1cd65 100644 --- a/src/base/ByteCounter.h +++ b/src/base/ByteCounter.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_BYTECOUNTER_H -#define SQUID_SRC_BYTECOUNTER_H +#ifndef SQUID_SRC_BASE_BYTECOUNTER_H +#define SQUID_SRC_BASE_BYTECOUNTER_H /// counter for accumulating byte values class ByteCounter @@ -25,5 +25,5 @@ public: size_t kb = 0; }; -#endif /* SQUID_SRC_BYTECOUNTER_H */ +#endif /* SQUID_SRC_BASE_BYTECOUNTER_H */ diff --git a/src/base/CbDataList.h b/src/base/CbDataList.h index 37993afb5d..e4d3622c90 100644 --- a/src/base/CbDataList.h +++ b/src/base/CbDataList.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_CBDATALIST_H -#define SQUID_CBDATALIST_H +#ifndef SQUID_SRC_BASE_CBDATALIST_H +#define SQUID_SRC_BASE_CBDATALIST_H #include "cbdata.h" @@ -195,5 +195,5 @@ CbDataListContainer::empty() const return head == nullptr; } -#endif /* SQUID_CBDATALIST_H */ +#endif /* SQUID_SRC_BASE_CBDATALIST_H */ diff --git a/src/base/CbcPointer.h b/src/base/CbcPointer.h index 153279c193..543d707855 100644 --- a/src/base/CbcPointer.h +++ b/src/base/CbcPointer.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_CBC_POINTER_H -#define SQUID_CBC_POINTER_H +#ifndef SQUID_SRC_BASE_CBCPOINTER_H +#define SQUID_SRC_BASE_CBCPOINTER_H #include "base/TextException.h" #include "cbdata.h" @@ -185,5 +185,5 @@ std::ostream &CbcPointer::print(std::ostream &os) const return os << cbc << '/' << lock; } -#endif /* SQUID_CBC_POINTER_H */ +#endif /* SQUID_SRC_BASE_CBCPOINTER_H */ diff --git a/src/base/CharacterSet.h b/src/base/CharacterSet.h index e9460eebac..a2439d4803 100644 --- a/src/base/CharacterSet.h +++ b/src/base/CharacterSet.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_PARSER_CHARACTERSET_H -#define _SQUID_SRC_PARSER_CHARACTERSET_H +#ifndef SQUID_SRC_BASE_CHARACTERSET_H +#define SQUID_SRC_BASE_CHARACTERSET_H #include #include @@ -146,5 +146,5 @@ operator- (CharacterSet lhs, const CharacterSet &rhs); std::ostream& operator <<(std::ostream &, const CharacterSet &); -#endif /* _SQUID_SRC_PARSER_CHARACTERSET_H */ +#endif /* SQUID_SRC_BASE_CHARACTERSET_H */ diff --git a/src/base/ClpMap.h b/src/base/ClpMap.h index 64bf09846b..93b23060c1 100644 --- a/src/base/ClpMap.h +++ b/src/base/ClpMap.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID__SRC_BASE_CLPMAP_H -#define SQUID__SRC_BASE_CLPMAP_H +#ifndef SQUID_SRC_BASE_CLPMAP_H +#define SQUID_SRC_BASE_CLPMAP_H #include "mem/PoolingAllocator.h" #include "SquidMath.h" @@ -282,5 +282,5 @@ ClpMap::Entry::Entry(const Key &aKey, const Value &v, SetToNaturalSumOrMax(expires, squid_curtime, ttl); } -#endif /* SQUID__SRC_BASE_CLPMAP_H */ +#endif /* SQUID_SRC_BASE_CLPMAP_H */ diff --git a/src/base/CodeContext.h b/src/base/CodeContext.h index ee9094bf40..1b6943be8b 100644 --- a/src/base/CodeContext.h +++ b/src/base/CodeContext.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS code_contexts for details. */ -#ifndef SQUID_BASE_CODE_CONTEXT_H -#define SQUID_BASE_CODE_CONTEXT_H +#ifndef SQUID_SRC_BASE_CODECONTEXT_H +#define SQUID_SRC_BASE_CODECONTEXT_H #include "base/InstanceId.h" #include "base/RefCount.h" @@ -154,5 +154,5 @@ CallContextCreator(Fun &&creator) /// @} -#endif +#endif /* SQUID_SRC_BASE_CODECONTEXT_H */ diff --git a/src/base/DelayedAsyncCalls.h b/src/base/DelayedAsyncCalls.h index 23f0b28227..67b48b0bd9 100644 --- a/src/base/DelayedAsyncCalls.h +++ b/src/base/DelayedAsyncCalls.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_BASE_DELAYEDASYNCCALLS_H -#define SQUID_BASE_DELAYEDASYNCCALLS_H +#ifndef SQUID_SRC_BASE_DELAYEDASYNCCALLS_H +#define SQUID_SRC_BASE_DELAYEDASYNCCALLS_H #include "base/AsyncCallList.h" @@ -29,5 +29,5 @@ private: AsyncCallList deferredReads; }; -#endif /* SQUID_BASE_DELAYEDASYNCCALLS_H */ +#endif /* SQUID_SRC_BASE_DELAYEDASYNCCALLS_H */ diff --git a/src/base/EnumIterator.h b/src/base/EnumIterator.h index ffbf74289b..134b76f293 100644 --- a/src/base/EnumIterator.h +++ b/src/base/EnumIterator.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_BASE_ENUMITERATOR_H -#define SQUID_BASE_ENUMITERATOR_H +#ifndef SQUID_SRC_BASE_ENUMITERATOR_H +#define SQUID_SRC_BASE_ENUMITERATOR_H #include #include @@ -224,5 +224,5 @@ public: WholeEnum() : EnumRangeT(EnumType::enumBegin_, EnumType::enumEnd_) {} }; -#endif /* SQUID_BASE_ENUMITERATOR_H */ +#endif /* SQUID_SRC_BASE_ENUMITERATOR_H */ diff --git a/src/base/File.h b/src/base/File.h index 96be27ffa8..fddcf911d8 100644 --- a/src/base/File.h +++ b/src/base/File.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_BASE_FILE_H -#define SQUID_BASE_FILE_H +#ifndef SQUID_SRC_BASE_FILE_H +#define SQUID_SRC_BASE_FILE_H #include "sbuf/SBuf.h" @@ -123,5 +123,5 @@ private: Handle fd_ = InvalidHandle; ///< OS-specific file handle }; -#endif +#endif /* SQUID_SRC_BASE_FILE_H */ diff --git a/src/base/HardFun.h b/src/base/HardFun.h index d3001742d0..b1e0a4a8d3 100644 --- a/src/base/HardFun.h +++ b/src/base/HardFun.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_BASE_HARDFUN_H -#define _SQUID_SRC_BASE_HARDFUN_H +#ifndef SQUID_SRC_BASE_HARDFUN_H +#define SQUID_SRC_BASE_HARDFUN_H /** * A functor that calls a hard-coded unary function. @@ -17,5 +17,5 @@ struct HardFun { ReturnType operator()(ArgType arg) { return fun(arg); } }; -#endif /* _SQUID_SRC_BASE_HARDFUN_H */ +#endif /* SQUID_SRC_BASE_HARDFUN_H */ diff --git a/src/base/Here.h b/src/base/Here.h index 0dbc7a05ab..520f2a3411 100644 --- a/src/base/Here.h +++ b/src/base/Here.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_BASE_HERE_H -#define SQUID_BASE_HERE_H +#ifndef SQUID_SRC_BASE_HERE_H +#define SQUID_SRC_BASE_HERE_H #include @@ -73,5 +73,5 @@ UnitFileNameHashCacher(const char *fileName, FileNameHasher hasher) return cachedHash; } -#endif +#endif /* SQUID_SRC_BASE_HERE_H */ diff --git a/src/base/InstanceId.h b/src/base/InstanceId.h index b4f154051d..a48be882cc 100644 --- a/src/base/InstanceId.h +++ b/src/base/InstanceId.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_BASE_INSTANCE_ID_H -#define SQUID_BASE_INSTANCE_ID_H +#ifndef SQUID_SRC_BASE_INSTANCEID_H +#define SQUID_SRC_BASE_INSTANCEID_H #include @@ -100,5 +100,5 @@ std::ostream &operator <<(std::ostream &os, const InstanceId & return id.print(os); } -#endif /* SQUID_BASE_INSTANCE_ID_H */ +#endif /* SQUID_SRC_BASE_INSTANCEID_H */ diff --git a/src/base/IoManip.h b/src/base/IoManip.h index aaf65d3855..f2d8e08c86 100644 --- a/src/base/IoManip.h +++ b/src/base/IoManip.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_BASE_IO_MANIP_H -#define SQUID_SRC_BASE_IO_MANIP_H +#ifndef SQUID_SRC_BASE_IOMANIP_H +#define SQUID_SRC_BASE_IOMANIP_H #include "debug/Stream.h" @@ -171,5 +171,5 @@ inline AsHex asHex(const Integer n) { return AsHex(n); } /// Prints the first n data bytes using hex notation. Does nothing if n is 0. void PrintHex(std::ostream &, const char *data, size_t n); -#endif /* SQUID_SRC_BASE_IO_MANIP_H */ +#endif /* SQUID_SRC_BASE_IOMANIP_H */ diff --git a/src/base/JobWait.h b/src/base/JobWait.h index 918f118f27..396bf985cc 100644 --- a/src/base/JobWait.h +++ b/src/base/JobWait.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_BASE_JOBWAIT_H -#define SQUID_BASE_JOBWAIT_H +#ifndef SQUID_SRC_BASE_JOBWAIT_H +#define SQUID_SRC_BASE_JOBWAIT_H #include "base/AsyncJob.h" #include "base/CbcPointer.h" @@ -87,5 +87,5 @@ std::ostream &operator <<(std::ostream &os, const JobWaitBase &wait) return os; } -#endif /* SQUID_BASE_JOBWAIT_H */ +#endif /* SQUID_SRC_BASE_JOBWAIT_H */ diff --git a/src/base/LookupTable.h b/src/base/LookupTable.h index e410960915..404891fb01 100644 --- a/src/base/LookupTable.h +++ b/src/base/LookupTable.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_LOOKUPTABLE_H_ -#define SQUID_LOOKUPTABLE_H_ +#ifndef SQUID_SRC_BASE_LOOKUPTABLE_H +#define SQUID_SRC_BASE_LOOKUPTABLE_H #include "sbuf/Algorithms.h" #include "sbuf/SBuf.h" @@ -75,5 +75,5 @@ private: EnumType invalidValue; }; -#endif /* SQUID_LOOKUPTABLE_H_ */ +#endif /* SQUID_SRC_BASE_LOOKUPTABLE_H */ diff --git a/src/base/Range.h b/src/base/Range.h index f5a2a74460..6b1d997dc5 100644 --- a/src/base/Range.h +++ b/src/base/Range.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_RANGE_H -#define SQUID_RANGE_H +#ifndef SQUID_SRC_BASE_RANGE_H +#define SQUID_SRC_BASE_RANGE_H #include #include @@ -63,5 +63,5 @@ Range::size() const return (S) (end > start ? end - start : 0); } -#endif /* SQUID_RANGE_H */ +#endif /* SQUID_SRC_BASE_RANGE_H */ diff --git a/src/base/RefCount.h b/src/base/RefCount.h index 60d8c2093c..7a9be4ed0a 100644 --- a/src/base/RefCount.h +++ b/src/base/RefCount.h @@ -8,8 +8,8 @@ /* DEBUG: section -- Refcount allocator */ -#ifndef SQUID_REFCOUNT_H_ -#define SQUID_REFCOUNT_H_ +#ifndef SQUID_SRC_BASE_REFCOUNT_H +#define SQUID_SRC_BASE_REFCOUNT_H // reference counting requires the Lock API on base classes #include "base/Lock.h" @@ -130,5 +130,5 @@ inline std::ostream &operator <<(std::ostream &os, const RefCount &p) return os << "NULL"; } -#endif /* SQUID_REFCOUNT_H_ */ +#endif /* SQUID_SRC_BASE_REFCOUNT_H */ diff --git a/src/base/RunnersRegistry.h b/src/base/RunnersRegistry.h index c28696fbea..9f6b226837 100644 --- a/src/base/RunnersRegistry.h +++ b/src/base/RunnersRegistry.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_BASE_RUNNERSREGISTRY_H -#define SQUID_BASE_RUNNERSREGISTRY_H +#ifndef SQUID_SRC_BASE_RUNNERSREGISTRY_H +#define SQUID_SRC_BASE_RUNNERSREGISTRY_H /** * This API allows virtually any module to register its interest in receiving @@ -159,5 +159,5 @@ protected: #define CallRunnerRegistrator(ClassName) \ CallRunnerRegistratorIn(Global, ClassName) -#endif /* SQUID_BASE_RUNNERSREGISTRY_H */ +#endif /* SQUID_SRC_BASE_RUNNERSREGISTRY_H */ diff --git a/src/base/Subscription.h b/src/base/Subscription.h index dbaf4619a2..7eafcecaf1 100644 --- a/src/base/Subscription.h +++ b/src/base/Subscription.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_BASE_SUBSCRIPTION_H -#define _SQUID_BASE_SUBSCRIPTION_H +#ifndef SQUID_SRC_BASE_SUBSCRIPTION_H +#define SQUID_SRC_BASE_SUBSCRIPTION_H #include "base/AsyncCall.h" @@ -62,5 +62,5 @@ private: const RefCount call; ///< gets copied to create callback calls }; -#endif /* _SQUID_BASE_SUBSCRIPTION_H */ +#endif /* SQUID_SRC_BASE_SUBSCRIPTION_H */ diff --git a/src/base/TextException.h b/src/base/TextException.h index e04ee92939..46f763fdee 100644 --- a/src/base/TextException.h +++ b/src/base/TextException.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID__TEXTEXCEPTION_H -#define SQUID__TEXTEXCEPTION_H +#ifndef SQUID_SRC_BASE_TEXTEXCEPTION_H +#define SQUID_SRC_BASE_TEXTEXCEPTION_H #include "base/Assure.h" #include "base/Here.h" @@ -81,5 +81,5 @@ std::ostream &operator <<(std::ostream &, const TextException &); Debug::Extra << "ignored exception: " << CurrentException); \ } -#endif /* SQUID__TEXTEXCEPTION_H */ +#endif /* SQUID_SRC_BASE_TEXTEXCEPTION_H */ diff --git a/src/base/YesNoNone.h b/src/base/YesNoNone.h index a6f296ca13..f79f31bfcd 100644 --- a/src/base/YesNoNone.h +++ b/src/base/YesNoNone.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_YESNONONE_H_ -#define SQUID_YESNONONE_H_ +#ifndef SQUID_SRC_BASE_YESNONONE_H +#define SQUID_SRC_BASE_YESNONONE_H #include "base/TextException.h" #include "debug/Stream.h" @@ -71,5 +71,5 @@ private: bool option; ///< specified yes/no value; meaningless if optUnspecified }; -#endif /* SQUID_YESNONONE_H_ */ +#endif /* SQUID_SRC_BASE_YESNONONE_H */ diff --git a/src/cache_cf.h b/src/cache_cf.h index da5e7322dc..8985fa6050 100644 --- a/src/cache_cf.h +++ b/src/cache_cf.h @@ -8,8 +8,8 @@ /* DEBUG: section 03 Configuration File Parsing */ -#ifndef SQUID_CACHE_CF_H_ -#define SQUID_CACHE_CF_H_ +#ifndef SQUID_SRC_CACHE_CF_H +#define SQUID_SRC_CACHE_CF_H class wordlist; @@ -33,5 +33,5 @@ extern const char *cfg_filename; extern int config_lineno; extern char config_input_line[BUFSIZ]; -#endif /* SQUID_CACHE_CF_H_ */ +#endif /* SQUID_SRC_CACHE_CF_H */ diff --git a/src/carp.h b/src/carp.h index 56c4096695..35f2f28c23 100644 --- a/src/carp.h +++ b/src/carp.h @@ -8,8 +8,8 @@ /* DEBUG: section 39 Cache Array Routing Protocol */ -#ifndef SQUID_CARP_H_ -#define SQUID_CARP_H_ +#ifndef SQUID_SRC_CARP_H +#define SQUID_SRC_CARP_H class CachePeer; class PeerSelector; @@ -17,5 +17,5 @@ class PeerSelector; void carpInit(void); CachePeer *carpSelectParent(PeerSelector *); -#endif /* SQUID_CARP_H_ */ +#endif /* SQUID_SRC_CARP_H */ diff --git a/src/cbdata.h b/src/cbdata.h index d7f8fc1a59..7b67098826 100644 --- a/src/cbdata.h +++ b/src/cbdata.h @@ -394,5 +394,5 @@ private: void *data_; ///< raw callback data, maybe invalid }; -#endif /* SQUID_CBDATA_H */ +#endif /* SQUID_SRC_CBDATA_H */ diff --git a/src/clientStream.h b/src/clientStream.h index 1f1d9ecb07..49a1068385 100644 --- a/src/clientStream.h +++ b/src/clientStream.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_CLIENTSTREAM_H -#define SQUID_CLIENTSTREAM_H +#ifndef SQUID_SRC_CLIENTSTREAM_H +#define SQUID_SRC_CLIENTSTREAM_H #include "base/RefCount.h" #include "clientStreamForward.h" @@ -165,5 +165,5 @@ void clientStreamAbort(clientStreamNode *thisObject, ClientHttpRequest *http); */ clientStream_status_t clientStreamStatus(clientStreamNode *thisObject, ClientHttpRequest *http); -#endif /* SQUID_CLIENTSTREAM_H */ +#endif /* SQUID_SRC_CLIENTSTREAM_H */ diff --git a/src/clientStreamForward.h b/src/clientStreamForward.h index 75a8d0c3f6..968f862b43 100644 --- a/src/clientStreamForward.h +++ b/src/clientStreamForward.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_CLIENTSTREAM_FORWARD_H -#define SQUID_CLIENTSTREAM_FORWARD_H +#ifndef SQUID_SRC_CLIENTSTREAMFORWARD_H +#define SQUID_SRC_CLIENTSTREAMFORWARD_H #include "enums.h" /* for clientStream_status_t */ @@ -34,5 +34,5 @@ typedef void CSD(clientStreamNode *, ClientHttpRequest *); typedef clientStream_status_t CSS(clientStreamNode *, ClientHttpRequest *); -#endif /* SQUID_CLIENTSTREAM_FORWARD_H */ +#endif /* SQUID_SRC_CLIENTSTREAMFORWARD_H */ diff --git a/src/client_db.h b/src/client_db.h index a19683b771..81e8992c50 100644 --- a/src/client_db.h +++ b/src/client_db.h @@ -8,8 +8,8 @@ /* DEBUG: section 00 Client Database */ -#ifndef SQUID_CLIENT_DB_H_ -#define SQUID_CLIENT_DB_H_ +#ifndef SQUID_SRC_CLIENT_DB_H +#define SQUID_SRC_CLIENT_DB_H #include "anyp/ProtocolType.h" #include "ip/Address.h" @@ -42,5 +42,5 @@ Ip::Address *client_entry(Ip::Address *current); variable_list *snmp_meshCtblFn(variable_list *, snint *); #endif -#endif /* SQUID_CLIENT_DB_H_ */ +#endif /* SQUID_SRC_CLIENT_DB_H */ diff --git a/src/client_side.h b/src/client_side.h index 6027b318b6..291b69c76f 100644 --- a/src/client_side.h +++ b/src/client_side.h @@ -8,8 +8,8 @@ /* DEBUG: section 33 Client-side Routines */ -#ifndef SQUID_CLIENTSIDE_H -#define SQUID_CLIENTSIDE_H +#ifndef SQUID_SRC_CLIENT_SIDE_H +#define SQUID_SRC_CLIENT_SIDE_H #include "acl/ChecklistFiller.h" #include "base/RunnersRegistry.h" @@ -538,5 +538,5 @@ void clientPostHttpsAccept(ConnStateData *); std::ostream &operator <<(std::ostream &os, const ConnStateData::PinnedIdleContext &pic); std::ostream &operator <<(std::ostream &, const ConnStateData::ServerConnectionContext &); -#endif /* SQUID_CLIENTSIDE_H */ +#endif /* SQUID_SRC_CLIENT_SIDE_H */ diff --git a/src/client_side_reply.h b/src/client_side_reply.h index 488dc2a7fb..270adaac24 100644 --- a/src/client_side_reply.h +++ b/src/client_side_reply.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_CLIENTSIDEREPLY_H -#define SQUID_CLIENTSIDEREPLY_H +#ifndef SQUID_SRC_CLIENT_SIDE_REPLY_H +#define SQUID_SRC_CLIENT_SIDE_REPLY_H #include "acl/forward.h" #include "client_side_request.h" @@ -167,5 +167,5 @@ private: // TODO: move to SideAgent parent, when we have one void purgeEntriesByUrl(HttpRequest *, const char *); -#endif /* SQUID_CLIENTSIDEREPLY_H */ +#endif /* SQUID_SRC_CLIENT_SIDE_REPLY_H */ diff --git a/src/client_side_request.h b/src/client_side_request.h index 7db65d3721..d9db8cfb24 100644 --- a/src/client_side_request.h +++ b/src/client_side_request.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_CLIENTSIDEREQUEST_H -#define SQUID_CLIENTSIDEREQUEST_H +#ifndef SQUID_SRC_CLIENT_SIDE_REQUEST_H +#define SQUID_SRC_CLIENT_SIDE_REQUEST_H #include "AccessLogEntry.h" #include "client_side.h" @@ -257,4 +257,4 @@ void clientAccessCheck(ClientHttpRequest *); /* ones that should be elsewhere */ void tunnelStart(ClientHttpRequest *); -#endif /* SQUID_CLIENTSIDEREQUEST_H */ +#endif /* SQUID_SRC_CLIENT_SIDE_REQUEST_H */ diff --git a/src/clients/FtpClient.h b/src/clients/FtpClient.h index 0db3b2da04..a42e0e199a 100644 --- a/src/clients/FtpClient.h +++ b/src/clients/FtpClient.h @@ -8,8 +8,8 @@ /* DEBUG: section 09 File Transfer Protocol (FTP) */ -#ifndef SQUID_FTP_CLIENT_H -#define SQUID_FTP_CLIENT_H +#ifndef SQUID_SRC_CLIENTS_FTPCLIENT_H +#define SQUID_SRC_CLIENTS_FTPCLIENT_H #include "clients/Client.h" #include "error/Detail.h" @@ -219,5 +219,5 @@ private: } // namespace Ftp -#endif /* SQUID_FTP_CLIENT_H */ +#endif /* SQUID_SRC_CLIENTS_FTPCLIENT_H */ diff --git a/src/clients/HttpTunneler.h b/src/clients/HttpTunneler.h index f31311243a..eb8dcee685 100644 --- a/src/clients/HttpTunneler.h +++ b/src/clients/HttpTunneler.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_CLIENTS_HTTP_TUNNELER_H -#define SQUID_SRC_CLIENTS_HTTP_TUNNELER_H +#ifndef SQUID_SRC_CLIENTS_HTTPTUNNELER_H +#define SQUID_SRC_CLIENTS_HTTPTUNNELER_H #include "base/AsyncCallbacks.h" #include "base/AsyncJob.h" @@ -108,5 +108,5 @@ private: } // namespace Http -#endif /* SQUID_SRC_CLIENTS_HTTP_TUNNELER_H */ +#endif /* SQUID_SRC_CLIENTS_HTTPTUNNELER_H */ diff --git a/src/clients/HttpTunnelerAnswer.h b/src/clients/HttpTunnelerAnswer.h index 50018d690e..54c5a35c59 100644 --- a/src/clients/HttpTunnelerAnswer.h +++ b/src/clients/HttpTunnelerAnswer.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_CLIENTS_HTTP_TUNNELERANSWER_H -#define SQUID_SRC_CLIENTS_HTTP_TUNNELERANSWER_H +#ifndef SQUID_SRC_CLIENTS_HTTPTUNNELERANSWER_H +#define SQUID_SRC_CLIENTS_HTTPTUNNELERANSWER_H #include "base/CbcPointer.h" #include "comm/forward.h" @@ -51,5 +51,5 @@ std::ostream &operator <<(std::ostream &, const TunnelerAnswer &); } // namespace Http -#endif /* SQUID_SRC_CLIENTS_HTTP_TUNNELERANSWER_H */ +#endif /* SQUID_SRC_CLIENTS_HTTPTUNNELERANSWER_H */ diff --git a/src/clients/forward.h b/src/clients/forward.h index 74799268ed..622db1a3f5 100644 --- a/src/clients/forward.h +++ b/src/clients/forward.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_CLIENTS_FORWARD_H -#define SQUID_CLIENTS_FORWARD_H +#ifndef SQUID_SRC_CLIENTS_FORWARD_H +#define SQUID_SRC_CLIENTS_FORWARD_H #include "sbuf/forward.h" @@ -47,5 +47,5 @@ const SBuf &UrlWith2f(HttpRequest *); } // namespace Ftp -#endif /* SQUID_CLIENTS_FORWARD_H */ +#endif /* SQUID_SRC_CLIENTS_FORWARD_H */ diff --git a/src/comm.h b/src/comm.h index abee989033..6db1e9a425 100644 --- a/src/comm.h +++ b/src/comm.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef __COMM_H__ -#define __COMM_H__ +#ifndef SQUID_SRC_COMM_H +#define SQUID_SRC_COMM_H #include "comm/IoCallback.h" #include "CommCalls.h" @@ -103,5 +103,5 @@ public: int checkEvents(int timeout) override; }; -#endif +#endif /* SQUID_SRC_COMM_H */ diff --git a/src/comm/AcceptLimiter.h b/src/comm/AcceptLimiter.h index 04a7e643db..6f18c9a8b1 100644 --- a/src/comm/AcceptLimiter.h +++ b/src/comm/AcceptLimiter.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_COMM_ACCEPT_LIMITER_H -#define _SQUID_SRC_COMM_ACCEPT_LIMITER_H +#ifndef SQUID_SRC_COMM_ACCEPTLIMITER_H +#define SQUID_SRC_COMM_ACCEPTLIMITER_H #include "comm/TcpAcceptor.h" @@ -51,5 +51,5 @@ private: }; // namespace Comm -#endif /* _SQUID_SRC_COMM_ACCEPT_LIMITER_H */ +#endif /* SQUID_SRC_COMM_ACCEPTLIMITER_H */ diff --git a/src/comm/ConnOpener.h b/src/comm/ConnOpener.h index e4c498bb9e..2fc470e0a4 100644 --- a/src/comm/ConnOpener.h +++ b/src/comm/ConnOpener.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_COMM_OPENERSTATEDATA_H -#define _SQUID_SRC_COMM_OPENERSTATEDATA_H +#ifndef SQUID_SRC_COMM_CONNOPENER_H +#define SQUID_SRC_COMM_CONNOPENER_H #include "base/AsyncCall.h" #include "base/AsyncJob.h" @@ -88,5 +88,5 @@ private: }; // namespace Comm -#endif /* _SQUID_SRC_COMM_CONNOPENER_H */ +#endif /* SQUID_SRC_COMM_CONNOPENER_H */ diff --git a/src/comm/Connection.h b/src/comm/Connection.h index f5c2668206..96701d226d 100644 --- a/src/comm/Connection.h +++ b/src/comm/Connection.h @@ -8,8 +8,8 @@ /* DEBUG: section 05 Socket Functions */ -#ifndef _SQUIDCONNECTIONDETAIL_H_ -#define _SQUIDCONNECTIONDETAIL_H_ +#ifndef SQUID_SRC_COMM_CONNECTION_H +#define SQUID_SRC_COMM_CONNECTION_H #include "base/CodeContext.h" #include "base/InstanceId.h" @@ -205,5 +205,5 @@ operator <<(std::ostream &os, const ConnectionPointer &conn) } // namespace Comm -#endif +#endif /* SQUID_SRC_COMM_CONNECTION_H */ diff --git a/src/comm/Flag.h b/src/comm/Flag.h index 19113514a4..0eccd6d8df 100644 --- a/src/comm/Flag.h +++ b/src/comm/Flag.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_COMM_FLAG_H -#define _SQUID_SRC_COMM_FLAG_H +#ifndef SQUID_SRC_COMM_FLAG_H +#define SQUID_SRC_COMM_FLAG_H namespace Comm { @@ -29,5 +29,5 @@ typedef enum { } // namespace Comm -#endif /* _SQUID_SRC_COMM_FLAG_H */ +#endif /* SQUID_SRC_COMM_FLAG_H */ diff --git a/src/comm/IoCallback.h b/src/comm/IoCallback.h index 33681e83f4..a4268fb15c 100644 --- a/src/comm/IoCallback.h +++ b/src/comm/IoCallback.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_COMM_IOCALLBACK_H -#define _SQUID_COMM_IOCALLBACK_H +#ifndef SQUID_SRC_COMM_IOCALLBACK_H +#define SQUID_SRC_COMM_IOCALLBACK_H #include "base/AsyncCall.h" #include "comm/Flag.h" @@ -80,5 +80,5 @@ void CallbackTableDestruct(); } // namespace Comm -#endif /* _SQUID_COMM_IOCALLBACK_H */ +#endif /* SQUID_SRC_COMM_IOCALLBACK_H */ diff --git a/src/comm/Loops.h b/src/comm/Loops.h index b80cc9127a..66460c39fe 100644 --- a/src/comm/Loops.h +++ b/src/comm/Loops.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_COMM_LOOPS_H -#define _SQUID_SRC_COMM_LOOPS_H +#ifndef SQUID_SRC_COMM_LOOPS_H +#define SQUID_SRC_COMM_LOOPS_H #include "comm/Flag.h" #include "comm/forward.h" @@ -72,5 +72,5 @@ void QuickPollRequired(void); } // namespace Comm -#endif /* _SQUID_SRC_COMM_LOOPS_H */ +#endif /* SQUID_SRC_COMM_LOOPS_H */ diff --git a/src/comm/Read.h b/src/comm/Read.h index cfbdf56564..c2a473f1f7 100644 --- a/src/comm/Read.h +++ b/src/comm/Read.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_COMM_READ_H -#define _SQUID_COMM_READ_H +#ifndef SQUID_SRC_COMM_READ_H +#define SQUID_SRC_COMM_READ_H #include "base/AsyncCall.h" #include "comm/forward.h" @@ -63,5 +63,5 @@ inline void comm_read(const Comm::ConnectionPointer &conn, char *buf, int len, A } void comm_read_cancel(int fd, IOCB *callback, void *data); -#endif /* _SQUID_COMM_READ_H */ +#endif /* SQUID_SRC_COMM_READ_H */ diff --git a/src/comm/Tcp.h b/src/comm/Tcp.h index ef46c3da1f..2b63a81622 100644 --- a/src/comm/Tcp.h +++ b/src/comm/Tcp.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID__SRC_COMM_TCP_H -#define SQUID__SRC_COMM_TCP_H +#ifndef SQUID_SRC_COMM_TCP_H +#define SQUID_SRC_COMM_TCP_H namespace Comm { @@ -27,4 +27,4 @@ void ApplyTcpKeepAlive(int fd, const TcpKeepAlive &); } // namespace Comm -#endif /* SQUID__SRC_COMM_TCP_H */ +#endif /* SQUID_SRC_COMM_TCP_H */ diff --git a/src/comm/TcpAcceptor.h b/src/comm/TcpAcceptor.h index b14cac34d5..8047b3011d 100644 --- a/src/comm/TcpAcceptor.h +++ b/src/comm/TcpAcceptor.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_COMM_TCPACCEPTOR_H -#define SQUID_COMM_TCPACCEPTOR_H +#ifndef SQUID_SRC_COMM_TCPACCEPTOR_H +#define SQUID_SRC_COMM_TCPACCEPTOR_H #include "anyp/forward.h" #include "base/AsyncJob.h" @@ -110,5 +110,5 @@ private: } // namespace Comm -#endif /* SQUID_COMM_TCPACCEPTOR_H */ +#endif /* SQUID_SRC_COMM_TCPACCEPTOR_H */ diff --git a/src/comm/Write.h b/src/comm/Write.h index 2f3625c9d4..64b175f9d6 100644 --- a/src/comm/Write.h +++ b/src/comm/Write.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_COMM_IOWRITE_H -#define _SQUID_COMM_IOWRITE_H +#ifndef SQUID_SRC_COMM_WRITE_H +#define SQUID_SRC_COMM_WRITE_H #include "base/AsyncCall.h" #include "comm/forward.h" @@ -36,5 +36,5 @@ void WriteCancel(const Comm::ConnectionPointer &conn, const char *reason); } // namespace Comm -#endif /* _SQUID_COMM_IOWRITE_H */ +#endif /* SQUID_SRC_COMM_WRITE_H */ diff --git a/src/comm/comm_internal.h b/src/comm/comm_internal.h index 7497a09f9c..9d596c6f9b 100644 --- a/src/comm/comm_internal.h +++ b/src/comm/comm_internal.h @@ -6,13 +6,13 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_COMM_COMM_INTERNAL_H -#define SQUID_COMM_COMM_INTERNAL_H +#ifndef SQUID_SRC_COMM_COMM_INTERNAL_H +#define SQUID_SRC_COMM_COMM_INTERNAL_H /* misc collection of bits shared by Comm code, but not needed by the rest of Squid. */ bool isOpen(const int fd); void commStopHalfClosedMonitor(int fd); -#endif +#endif /* SQUID_SRC_COMM_COMM_INTERNAL_H */ diff --git a/src/comm/forward.h b/src/comm/forward.h index 9778f22002..a9120cdc66 100644 --- a/src/comm/forward.h +++ b/src/comm/forward.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_COMM_FORWARD_H -#define _SQUID_COMM_FORWARD_H +#ifndef SQUID_SRC_COMM_FORWARD_H +#define SQUID_SRC_COMM_FORWARD_H #include "base/RefCount.h" @@ -37,5 +37,5 @@ void SetSelect(int, unsigned int, PF *, void *, time_t); }; // namespace Comm -#endif /* _SQUID_COMM_FORWARD_H */ +#endif /* SQUID_SRC_COMM_FORWARD_H */ diff --git a/src/comm_poll.h b/src/comm_poll.h index 47859066aa..674cb12a5c 100644 --- a/src/comm_poll.h +++ b/src/comm_poll.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_COMM_POLL_H -#define SQUID_COMM_POLL_H +#ifndef SQUID_SRC_COMM_POLL_H +#define SQUID_SRC_COMM_POLL_H -#endif /* SQUID_COMM_POLL_H */ +#endif /* SQUID_SRC_COMM_POLL_H */ diff --git a/src/debug/Messages.h b/src/debug/Messages.h index 13efd7a082..8291535dca 100644 --- a/src/debug/Messages.h +++ b/src/debug/Messages.h @@ -8,8 +8,8 @@ /* DEBUG: section 00 Debug Routines */ -#ifndef SQUID_DEBUG_MESSAGES_H -#define SQUID_DEBUG_MESSAGES_H +#ifndef SQUID_SRC_DEBUG_MESSAGES_H +#define SQUID_SRC_DEBUG_MESSAGES_H #include "debug/Stream.h" @@ -93,5 +93,5 @@ DebugMessageLevel(const int defaultLevel) #define Important(id) DebugMessageLevel(DBG_IMPORTANT) #define Dbg(id, defaultLevel) DebugMessageLevel(defaultLevel) -#endif /* SQUID_DEBUG_MESSAGES_H */ +#endif /* SQUID_SRC_DEBUG_MESSAGES_H */ diff --git a/src/defines.h b/src/defines.h index ec1a668029..91bf9852dd 100644 --- a/src/defines.h +++ b/src/defines.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_DEFINES_H -#define SQUID_DEFINES_H +#ifndef SQUID_SRC_DEFINES_H +#define SQUID_SRC_DEFINES_H #ifndef TRUE #define TRUE 1 @@ -159,5 +159,5 @@ #define _WIN_SQUID_RUN_MODE_SERVICE 1 #endif -#endif /* SQUID_DEFINES_H */ +#endif /* SQUID_SRC_DEFINES_H */ diff --git a/src/dlink.h b/src/dlink.h index a77532c685..34cd477a86 100644 --- a/src/dlink.h +++ b/src/dlink.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_DLINK_H -#define SQUID_DLINK_H +#ifndef SQUID_SRC_DLINK_H +#define SQUID_SRC_DLINK_H #include "mem/forward.h" @@ -34,5 +34,5 @@ void dlinkAddAfter(void *, dlink_node *, dlink_node *, dlink_list *); void dlinkAddTail(void *data, dlink_node *, dlink_list *); void dlinkDelete(dlink_node * m, dlink_list * list); -#endif /* SQUID_DLINK_H */ +#endif /* SQUID_SRC_DLINK_H */ diff --git a/src/dns/LookupDetails.h b/src/dns/LookupDetails.h index fc7c36eb4f..44da186e8e 100644 --- a/src/dns/LookupDetails.h +++ b/src/dns/LookupDetails.h @@ -8,8 +8,8 @@ /* DEBUG: section 78 DNS lookups */ -#ifndef SQUID_DNS_LOOKUPDETAILS_H -#define SQUID_DNS_LOOKUPDETAILS_H +#ifndef SQUID_SRC_DNS_LOOKUPDETAILS_H +#define SQUID_SRC_DNS_LOOKUPDETAILS_H #include "sbuf/SBuf.h" @@ -48,5 +48,5 @@ operator <<(std::ostream &os, const LookupDetails &dns) } // namespace Dns -#endif /* SQUID_DNS_LOOKUPDETAILS_H */ +#endif /* SQUID_SRC_DNS_LOOKUPDETAILS_H */ diff --git a/src/dns/forward.h b/src/dns/forward.h index c7c93920bd..0a0f57f804 100644 --- a/src/dns/forward.h +++ b/src/dns/forward.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_DNS_FORWARD_H -#define _SQUID_SRC_DNS_FORWARD_H +#ifndef SQUID_SRC_DNS_FORWARD_H +#define SQUID_SRC_DNS_FORWARD_H #include "ip/forward.h" @@ -29,5 +29,5 @@ void Init(void); void idnsALookup(const char *, IDNSCB *, void *); void idnsPTRLookup(const Ip::Address &, IDNSCB *, void *); -#endif /* _SQUID_SRC_DNS_FORWARD_H */ +#endif /* SQUID_SRC_DNS_FORWARD_H */ diff --git a/src/dns/rfc1035.h b/src/dns/rfc1035.h index 5b696495b2..f86ac0fa07 100644 --- a/src/dns/rfc1035.h +++ b/src/dns/rfc1035.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_RFC1035_H -#define SQUID_RFC1035_H +#ifndef SQUID_SRC_DNS_RFC1035_H +#define SQUID_SRC_DNS_RFC1035_H #if HAVE_SYS_TYPES_H #include @@ -110,5 +110,5 @@ SQUIDCEXTERN int rfc1035QuestionPack(char *buf, const unsigned short _class); SQUIDCEXTERN int rfc1035RRPack(char *buf, size_t sz, const rfc1035_rr * RR); -#endif /* SQUID_RFC1035_H */ +#endif /* SQUID_SRC_DNS_RFC1035_H */ diff --git a/src/dns/rfc2671.h b/src/dns/rfc2671.h index c1e9d1619d..1c6695f912 100644 --- a/src/dns/rfc2671.h +++ b/src/dns/rfc2671.h @@ -6,13 +6,13 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_RFC2671_H -#define SQUID_RFC2671_H +#ifndef SQUID_SRC_DNS_RFC2671_H +#define SQUID_SRC_DNS_RFC2671_H /* RFC2671 section 7 defines new RR type OPT as 41 */ #define RFC1035_TYPE_OPT 41 SQUIDCEXTERN int rfc2671RROptPack(char *buf, size_t sz, ssize_t edns_sz); -#endif /* SQUID_RFC3596_H */ +#endif /* SQUID_SRC_DNS_RFC2671_H */ diff --git a/src/dns/rfc3596.h b/src/dns/rfc3596.h index fc9cce0043..20f114687e 100644 --- a/src/dns/rfc3596.h +++ b/src/dns/rfc3596.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_RFC3596_H -#define SQUID_RFC3596_H +#ifndef SQUID_SRC_DNS_RFC3596_H +#define SQUID_SRC_DNS_RFC3596_H /* RFC 3596 extends RFC 1035 */ #include "dns/rfc1035.h" @@ -52,5 +52,5 @@ SQUIDCEXTERN ssize_t rfc3596BuildHostQuery(const char *hostname, /* RFC3596 section 2.1 defines new RR type AAAA as 28 */ #define RFC1035_TYPE_AAAA 28 -#endif /* SQUID_RFC3596_H */ +#endif /* SQUID_SRC_DNS_RFC3596_H */ diff --git a/src/enums.h b/src/enums.h index 4ad4f0c943..c67b203e58 100644 --- a/src/enums.h +++ b/src/enums.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ENUMS_H -#define SQUID_ENUMS_H +#ifndef SQUID_SRC_ENUMS_H +#define SQUID_SRC_ENUMS_H enum fd_type { FD_NONE_TYPE, @@ -243,5 +243,5 @@ typedef enum { } htcp_clr_reason; #endif /* USE_HTCP */ -#endif /* SQUID_ENUMS_H */ +#endif /* SQUID_SRC_ENUMS_H */ diff --git a/src/error/Detail.h b/src/error/Detail.h index ec4df88a6d..c9a4c6d233 100644 --- a/src/error/Detail.h +++ b/src/error/Detail.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_ERROR_DETAIL_H -#define _SQUID_SRC_ERROR_DETAIL_H +#ifndef SQUID_SRC_ERROR_DETAIL_H +#define SQUID_SRC_ERROR_DETAIL_H #include "base/Here.h" #include "base/RefCount.h" @@ -46,5 +46,5 @@ std::ostream &operator <<(std::ostream &os, const ErrorDetail &); /// dump the given ErrorDetail via a possibly nil pointer (for debugging) std::ostream &operator <<(std::ostream &os, const ErrorDetail::Pointer &); -#endif /* _SQUID_SRC_ERROR_DETAIL_H */ +#endif /* SQUID_SRC_ERROR_DETAIL_H */ diff --git a/src/error/Error.h b/src/error/Error.h index fc3ed42f9d..06f19efd0c 100644 --- a/src/error/Error.h +++ b/src/error/Error.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_ERROR_ERROR_H -#define _SQUID_SRC_ERROR_ERROR_H +#ifndef SQUID_SRC_ERROR_ERROR_H +#define SQUID_SRC_ERROR_ERROR_H #include "error/Detail.h" #include "error/forward.h" @@ -59,5 +59,5 @@ errorTypeName(err_type err) std::ostream &operator <<(std::ostream &os, const Error &error); -#endif /* _SQUID_SRC_ERROR_ERROR_H */ +#endif /* SQUID_SRC_ERROR_ERROR_H */ diff --git a/src/error/ExceptionErrorDetail.h b/src/error/ExceptionErrorDetail.h index eb75c9f263..94809f2176 100644 --- a/src/error/ExceptionErrorDetail.h +++ b/src/error/ExceptionErrorDetail.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_ERROR_EXCEPTIONERRORDETAIL_H -#define _SQUID_SRC_ERROR_EXCEPTIONERRORDETAIL_H +#ifndef SQUID_SRC_ERROR_EXCEPTIONERRORDETAIL_H +#define SQUID_SRC_ERROR_EXCEPTIONERRORDETAIL_H #include "base/IoManip.h" #include "error/Detail.h" @@ -39,5 +39,5 @@ private: SourceLocationId exceptionId; ///< identifies the thrower or catcher }; -#endif /* _SQUID_SRC_ERROR_EXCEPTIONERRORDETAIL_H */ +#endif /* SQUID_SRC_ERROR_EXCEPTIONERRORDETAIL_H */ diff --git a/src/error/SysErrorDetail.h b/src/error/SysErrorDetail.h index 9f0c85cf81..8ee4b988d6 100644 --- a/src/error/SysErrorDetail.h +++ b/src/error/SysErrorDetail.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_ERROR_SYSERRORDETAIL_H -#define _SQUID_SRC_ERROR_SYSERRORDETAIL_H +#ifndef SQUID_SRC_ERROR_SYSERRORDETAIL_H +#define SQUID_SRC_ERROR_SYSERRORDETAIL_H #include "error/Detail.h" #include "sbuf/forward.h" @@ -50,5 +50,5 @@ public: /// reports a system call error (if any) on a dedicated Debug::Extra line std::ostream &operator <<(std::ostream &, ReportSysError); -#endif /* _SQUID_SRC_ERROR_SYSERRORDETAIL_H */ +#endif /* SQUID_SRC_ERROR_SYSERRORDETAIL_H */ diff --git a/src/error/forward.h b/src/error/forward.h index 03cad0f343..ca23bb95a7 100644 --- a/src/error/forward.h +++ b/src/error/forward.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_ERROR_FORWARD_H -#define _SQUID_SRC_ERROR_FORWARD_H +#ifndef SQUID_SRC_ERROR_FORWARD_H +#define SQUID_SRC_ERROR_FORWARD_H #include "base/forward.h" @@ -94,5 +94,5 @@ class ErrorState; typedef RefCount ErrorDetailPointer; -#endif /* _SQUID_SRC_ERROR_FORWARD_H */ +#endif /* SQUID_SRC_ERROR_FORWARD_H */ diff --git a/src/errorpage.h b/src/errorpage.h index 1d3b530451..00c3fc3718 100644 --- a/src/errorpage.h +++ b/src/errorpage.h @@ -8,8 +8,8 @@ /* DEBUG: section 04 Error Generation */ -#ifndef SQUID_ERRORPAGE_H -#define SQUID_ERRORPAGE_H +#ifndef SQUID_SRC_ERRORPAGE_H +#define SQUID_SRC_ERRORPAGE_H #include "cbdata.h" #include "comm/forward.h" @@ -355,5 +355,5 @@ bool strHdrAcptLangGetItem(const String &hdr, char *lang, int langLen, size_t &p std::ostream &operator <<(std::ostream &, const ErrorState *); -#endif /* SQUID_ERRORPAGE_H */ +#endif /* SQUID_SRC_ERRORPAGE_H */ diff --git a/src/esi/Assign.h b/src/esi/Assign.h index 4e6631a176..16656227c1 100644 --- a/src/esi/Assign.h +++ b/src/esi/Assign.h @@ -8,8 +8,8 @@ /* DEBUG: section 86 ESI processing */ -#ifndef SQUID_ESIASSIGN_H -#define SQUID_ESIASSIGN_H +#ifndef SQUID_SRC_ESI_ASSIGN_H +#define SQUID_SRC_ESI_ASSIGN_H #include "esi/Element.h" #include "esi/VarState.h" @@ -56,5 +56,5 @@ private: String unevaluatedVariable; }; -#endif /* SQUID_ESIASSIGN_H */ +#endif /* SQUID_SRC_ESI_ASSIGN_H */ diff --git a/src/esi/Attempt.h b/src/esi/Attempt.h index 25331e4a89..1865210f47 100644 --- a/src/esi/Attempt.h +++ b/src/esi/Attempt.h @@ -8,8 +8,8 @@ /* DEBUG: section 86 ESI processing */ -#ifndef SQUID_ESIATTEMPT_H -#define SQUID_ESIATTEMPT_H +#ifndef SQUID_SRC_ESI_ATTEMPT_H +#define SQUID_SRC_ESI_ATTEMPT_H #include "esi/Element.h" #include "esi/Sequence.h" @@ -18,5 +18,5 @@ struct esiAttempt : public esiSequence { esiAttempt(esiTreeParentPtr aParent) : esiSequence (aParent) {} }; -#endif /* SQUID_ESIATTEMPT_H */ +#endif /* SQUID_SRC_ESI_ATTEMPT_H */ diff --git a/src/esi/Context.h b/src/esi/Context.h index fd44d863c2..66f002c4d9 100644 --- a/src/esi/Context.h +++ b/src/esi/Context.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ESICONTEXT_H -#define SQUID_ESICONTEXT_H +#ifndef SQUID_SRC_ESI_CONTEXT_H +#define SQUID_SRC_ESI_CONTEXT_H #include "clientStream.h" #include "error/forward.h" @@ -160,5 +160,5 @@ private: bool processing; }; -#endif /* SQUID_ESICONTEXT_H */ +#endif /* SQUID_SRC_ESI_CONTEXT_H */ diff --git a/src/esi/Element.h b/src/esi/Element.h index 4583eea5fd..65dc8ff25a 100644 --- a/src/esi/Element.h +++ b/src/esi/Element.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ESIELEMENT_H -#define SQUID_ESIELEMENT_H +#ifndef SQUID_SRC_ESI_ELEMENT_H +#define SQUID_SRC_ESI_ELEMENT_H #include "base/RefCount.h" #include "debug/Stream.h" @@ -101,5 +101,5 @@ extern void FinishAnElement(ESIElement::Pointer &, int pos = -1); // for all elements call finish() and set Pointer to nil extern void FinishAllElements(Esi::Elements &); -#endif /* SQUID_ESIELEMENT_H */ +#endif /* SQUID_SRC_ESI_ELEMENT_H */ diff --git a/src/esi/Esi.h b/src/esi/Esi.h index ce759572e9..47a73a01b0 100644 --- a/src/esi/Esi.h +++ b/src/esi/Esi.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ESI_H -#define SQUID_ESI_H +#ifndef SQUID_SRC_ESI_ESI_H +#define SQUID_SRC_ESI_ESI_H #include "clientStream.h" #include "sbuf/SBuf.h" @@ -32,5 +32,5 @@ inline Esi::ErrorDetail Error(const char *msg) { return ErrorDetail(msg); } } // namespace Esi -#endif /* SQUID_ESI_H */ +#endif /* SQUID_SRC_ESI_ESI_H */ diff --git a/src/esi/Except.h b/src/esi/Except.h index 6e03326de0..3dfa6ccbe8 100644 --- a/src/esi/Except.h +++ b/src/esi/Except.h @@ -8,8 +8,8 @@ /* DEBUG: section 86 ESI processing */ -#ifndef SQUID_ESIEXCEPT_H -#define SQUID_ESIEXCEPT_H +#ifndef SQUID_SRC_ESI_EXCEPT_H +#define SQUID_SRC_ESI_EXCEPT_H #include "esi/Element.h" #include "esi/Sequence.h" @@ -23,5 +23,5 @@ public: esiExcept(esiTreeParentPtr aParent) : esiSequence (aParent) {} }; -#endif /* SQUID_ESIEXCEPT_H */ +#endif /* SQUID_SRC_ESI_EXCEPT_H */ diff --git a/src/esi/ExpatParser.h b/src/esi/ExpatParser.h index 24920f2ddb..a039898c9d 100644 --- a/src/esi/ExpatParser.h +++ b/src/esi/ExpatParser.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ESIEXPATPARSER_H -#define SQUID_ESIEXPATPARSER_H +#ifndef SQUID_SRC_ESI_EXPATPARSER_H +#define SQUID_SRC_ESI_EXPATPARSER_H #if USE_SQUID_ESI && HAVE_LIBEXPAT @@ -46,5 +46,5 @@ private: #endif /* USE_SQUID_ESI */ -#endif /* SQUID_ESIEXPATPARSER_H */ +#endif /* SQUID_SRC_ESI_EXPATPARSER_H */ diff --git a/src/esi/Expression.h b/src/esi/Expression.h index 7ee07c754b..409c006fb3 100644 --- a/src/esi/Expression.h +++ b/src/esi/Expression.h @@ -8,8 +8,8 @@ /* DEBUG: section 86 ESI processing */ -#ifndef SQUID_ESIEXPRESSION_H -#define SQUID_ESIEXPRESSION_H +#ifndef SQUID_SRC_ESI_EXPRESSION_H +#define SQUID_SRC_ESI_EXPRESSION_H class ESIExpression { @@ -18,5 +18,5 @@ public: static int Evaluate (char const *); }; -#endif /* SQUID_ESIEXPRESSION_H */ +#endif /* SQUID_SRC_ESI_EXPRESSION_H */ diff --git a/src/esi/Include.h b/src/esi/Include.h index d0dc527ade..c415a693a2 100644 --- a/src/esi/Include.h +++ b/src/esi/Include.h @@ -8,8 +8,8 @@ /* DEBUG: section 86 ESI processing */ -#ifndef SQUID_ESIINCLUDE_H -#define SQUID_ESIINCLUDE_H +#ifndef SQUID_SRC_ESI_INCLUDE_H +#define SQUID_SRC_ESI_INCLUDE_H #include "esi/Context.h" #include "esi/Element.h" @@ -71,5 +71,5 @@ private: void prepareRequestHeaders(HttpHeader &tempheaders, ESIVarState *vars); }; -#endif /* SQUID_ESIINCLUDE_H */ +#endif /* SQUID_SRC_ESI_INCLUDE_H */ diff --git a/src/esi/Libxml2Parser.h b/src/esi/Libxml2Parser.h index 99aab734ce..f1f9179306 100644 --- a/src/esi/Libxml2Parser.h +++ b/src/esi/Libxml2Parser.h @@ -12,8 +12,8 @@ * mail@joachim-bauch.de */ -#ifndef SQUID_ESILIBXML2PARSER_H -#define SQUID_ESILIBXML2PARSER_H +#ifndef SQUID_SRC_ESI_LIBXML2PARSER_H +#define SQUID_SRC_ESI_LIBXML2PARSER_H #if USE_SQUID_ESI && HAVE_LIBXML2 @@ -70,5 +70,5 @@ private: #endif /* USE_SQUID_ESI */ -#endif /* SQUID_ESILIBXML2PARSER_H */ +#endif /* SQUID_SRC_ESI_LIBXML2PARSER_H */ diff --git a/src/esi/Literal.h b/src/esi/Literal.h index 51968ce411..73267847ea 100644 --- a/src/esi/Literal.h +++ b/src/esi/Literal.h @@ -8,8 +8,8 @@ /* DEBUG: section 86 ESI processing */ -#ifndef SQUID_ESILITERAL_H -#define SQUID_ESILITERAL_H +#ifndef SQUID_SRC_ESI_LITERAL_H +#define SQUID_SRC_ESI_LITERAL_H #include "esi/Element.h" @@ -42,5 +42,5 @@ private: esiLiteral(esiLiteral const &); }; -#endif /* SQUID_ESILITERAL_H */ +#endif /* SQUID_SRC_ESI_LITERAL_H */ diff --git a/src/esi/Parser.h b/src/esi/Parser.h index bc25120966..515358151b 100644 --- a/src/esi/Parser.h +++ b/src/esi/Parser.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ESIPARSER_H -#define SQUID_ESIPARSER_H +#ifndef SQUID_SRC_ESI_PARSER_H +#define SQUID_SRC_ESI_PARSER_H #include "base/RefCount.h" @@ -70,5 +70,5 @@ public: #define EsiParserDeclaration \ static ESIParser::Pointer NewParser(ESIParserClient *aClient) -#endif /* SQUID_ESIPARSER_H */ +#endif /* SQUID_SRC_ESI_PARSER_H */ diff --git a/src/esi/Segment.h b/src/esi/Segment.h index f70ef9a88d..74226ba588 100644 --- a/src/esi/Segment.h +++ b/src/esi/Segment.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ESISEGMENT_H -#define SQUID_ESISEGMENT_H +#ifndef SQUID_SRC_ESI_SEGMENT_H +#define SQUID_SRC_ESI_SEGMENT_H /* TODO: Factor the store memory segment management into a reusable code block * or perhaps use membuffers here? @@ -53,5 +53,5 @@ private: void ESISegmentFreeList (ESISegment::Pointer &head); -#endif /* SQUID_ESISEGMENT_H */ +#endif /* SQUID_SRC_ESI_SEGMENT_H */ diff --git a/src/esi/Sequence.h b/src/esi/Sequence.h index eaffe7f77a..8fe4ea8c1a 100644 --- a/src/esi/Sequence.h +++ b/src/esi/Sequence.h @@ -8,8 +8,8 @@ /* DEBUG: section 86 ESI processing */ -#ifndef SQUID_ESISEQUENCE_H -#define SQUID_ESISEQUENCE_H +#ifndef SQUID_SRC_ESI_SEQUENCE_H +#define SQUID_SRC_ESI_SEQUENCE_H #include "esi/Element.h" #include "mem/forward.h" @@ -63,5 +63,5 @@ private: void processStep(int dovars); }; -#endif /* SQUID_ESISEQUENCE_H */ +#endif /* SQUID_SRC_ESI_SEQUENCE_H */ diff --git a/src/esi/Var.h b/src/esi/Var.h index 43b2a36327..aad6d2b597 100644 --- a/src/esi/Var.h +++ b/src/esi/Var.h @@ -8,8 +8,8 @@ /* DEBUG: section 86 ESI processing */ -#ifndef SQUID_ESIVAR_H -#define SQUID_ESIVAR_H +#ifndef SQUID_SRC_ESI_VAR_H +#define SQUID_SRC_ESI_VAR_H #include "esi/Element.h" #include "esi/Sequence.h" @@ -25,5 +25,5 @@ public: } }; -#endif /* SQUID_ESIVAR_H */ +#endif /* SQUID_SRC_ESI_VAR_H */ diff --git a/src/esi/VarState.h b/src/esi/VarState.h index e4ae2e9bbc..18a8e54a2a 100644 --- a/src/esi/VarState.h +++ b/src/esi/VarState.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_ESIVARSTATE_H -#define SQUID_ESIVARSTATE_H +#ifndef SQUID_SRC_ESI_VARSTATE_H +#define SQUID_SRC_ESI_VARSTATE_H #include "esi/Segment.h" #include "HttpHeader.h" @@ -168,5 +168,5 @@ private: char *browserversion; }; -#endif /* SQUID_ESIVARSTATE_H */ +#endif /* SQUID_SRC_ESI_VARSTATE_H */ diff --git a/src/eui/Config.h b/src/eui/Config.h index 8d7411c784..ae234ced7d 100644 --- a/src/eui/Config.h +++ b/src/eui/Config.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_EUI_CONFIG_H -#define SQUID_EUI_CONFIG_H +#ifndef SQUID_SRC_EUI_CONFIG_H +#define SQUID_SRC_EUI_CONFIG_H namespace Eui { @@ -22,5 +22,5 @@ extern EuiConfig TheConfig; } // namespace Eui -#endif /* SQUID_EUI_CONFIG_H */ +#endif /* SQUID_SRC_EUI_CONFIG_H */ diff --git a/src/eui/Eui48.h b/src/eui/Eui48.h index 35896b5932..e3c64b50a9 100644 --- a/src/eui/Eui48.h +++ b/src/eui/Eui48.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_EUI_EUI48_H -#define _SQUID_EUI_EUI48_H +#ifndef SQUID_SRC_EUI_EUI48_H +#define SQUID_SRC_EUI_EUI48_H #if USE_SQUID_EUI @@ -74,5 +74,5 @@ private: } // namespace Eui #endif /* USE_SQUID_EUI */ -#endif /* _SQUID_EUI_EUI48_H */ +#endif /* SQUID_SRC_EUI_EUI48_H */ diff --git a/src/eui/Eui64.h b/src/eui/Eui64.h index a2ca660c0f..40bf40a15f 100644 --- a/src/eui/Eui64.h +++ b/src/eui/Eui64.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_EUI_EUI64_H -#define _SQUID_EUI_EUI64_H +#ifndef SQUID_SRC_EUI_EUI64_H +#define SQUID_SRC_EUI_EUI64_H #if USE_SQUID_EUI @@ -88,5 +88,5 @@ private: } // namespace Eui #endif /* USE_SQUID_EUI */ -#endif /* _SQUID_EUI_EUI64_H */ +#endif /* SQUID_SRC_EUI_EUI64_H */ diff --git a/src/event.h b/src/event.h index d93e5fbee1..85d0fb72c9 100644 --- a/src/event.h +++ b/src/event.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_EVENT_H -#define SQUID_EVENT_H +#ifndef SQUID_SRC_EVENT_H +#define SQUID_SRC_EVENT_H #include "AsyncEngine.h" #include "base/Packable.h" @@ -68,5 +68,5 @@ private: ev_entry * tasks; }; -#endif /* SQUID_EVENT_H */ +#endif /* SQUID_SRC_EVENT_H */ diff --git a/src/fatal.h b/src/fatal.h index c22a3aec8f..92f645fba5 100644 --- a/src/fatal.h +++ b/src/fatal.h @@ -6,12 +6,12 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_FATAL_H -#define SQUID_FATAL_H +#ifndef SQUID_SRC_FATAL_H +#define SQUID_SRC_FATAL_H void fatal(const char *message); void fatalf(const char *fmt,...) PRINTF_FORMAT_ARG1; void fatal_dump(const char *message); -#endif /* SQUID_FATAL_H */ +#endif /* SQUID_SRC_FATAL_H */ diff --git a/src/fd.h b/src/fd.h index 918459d24d..e64469cd0c 100644 --- a/src/fd.h +++ b/src/fd.h @@ -8,8 +8,8 @@ /* DEBUG: section 51 Filedescriptor Functions */ -#ifndef SQUID_FD_H_ -#define SQUID_FD_H_ +#ifndef SQUID_SRC_FD_H +#define SQUID_SRC_FD_H void fd_close(int fd); void fd_open(int fd, unsigned int type, const char *); @@ -21,5 +21,5 @@ void fdAdjustReserved(void); int default_read_method(int, char *, int); int default_write_method(int, const char *, int); -#endif /* SQUID_FD_H_ */ +#endif /* SQUID_SRC_FD_H */ diff --git a/src/fde.h b/src/fde.h index 1b421bd084..61f77d94c2 100644 --- a/src/fde.h +++ b/src/fde.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_FDE_H -#define SQUID_FDE_H +#ifndef SQUID_SRC_FDE_H +#define SQUID_SRC_FDE_H #include "base/CodeContext.h" /* XXX: Remove by de-inlining ctor and clear() */ #include "base/forward.h" @@ -202,5 +202,5 @@ FD_WRITE_METHOD(int fd, const char *buf, int len) return fd_table[fd].write(fd, buf, len); } -#endif /* SQUID_FDE_H */ +#endif /* SQUID_SRC_FDE_H */ diff --git a/src/format/ByteCode.h b/src/format/ByteCode.h index 890abc0785..222f60d7ea 100644 --- a/src/format/ByteCode.h +++ b/src/format/ByteCode.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_FMT_BYTECODE_H -#define _SQUID_FMT_BYTECODE_H +#ifndef SQUID_SRC_FORMAT_BYTECODE_H +#define SQUID_SRC_FORMAT_BYTECODE_H /* * Squid configuration allows users to define custom formats in @@ -269,5 +269,5 @@ enum Quoting { } // namespace Format -#endif /* _SQUID_FMT_BYTECODE_H */ +#endif /* SQUID_SRC_FORMAT_BYTECODE_H */ diff --git a/src/format/Config.h b/src/format/Config.h index f80a4bf92f..df0380d204 100644 --- a/src/format/Config.h +++ b/src/format/Config.h @@ -81,5 +81,5 @@ extern FmtConfig TheConfig; #define free_format(X) do{ delete (*(X)).formats; (*(X)).formats=NULL; }while(false) #define dump_format(E,N,D) (D).dumpFormats((E),(N)) -#endif +#endif /* SQUID_SRC_FORMAT_CONFIG_H */ diff --git a/src/format/Format.h b/src/format/Format.h index 5dcbd69209..fd4eb2b67f 100644 --- a/src/format/Format.h +++ b/src/format/Format.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_FORMAT_FORMAT_H -#define _SQUID_FORMAT_FORMAT_H +#ifndef SQUID_SRC_FORMAT_FORMAT_H +#define SQUID_SRC_FORMAT_FORMAT_H #include "base/RefCount.h" #include "ConfigParser.h" @@ -69,5 +69,5 @@ size_t AssembleOne(const char *start, MemBuf &buf, const AccessLogEntryPointer & } // namespace Format -#endif /* _SQUID_FORMAT_FORMAT_H */ +#endif /* SQUID_SRC_FORMAT_FORMAT_H */ diff --git a/src/format/Quoting.h b/src/format/Quoting.h index 737bab5afc..2019bc48df 100644 --- a/src/format/Quoting.h +++ b/src/format/Quoting.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_FORMAT_QUOTING_H -#define _SQUID_FORMAT_QUOTING_H +#ifndef SQUID_SRC_FORMAT_QUOTING_H +#define SQUID_SRC_FORMAT_QUOTING_H namespace Format { @@ -24,5 +24,5 @@ char *QuoteMimeBlob(const char *header); }; // namespace Format -#endif /* _SQUID_FORMAT_QUOTING_H */ +#endif /* SQUID_SRC_FORMAT_QUOTING_H */ diff --git a/src/format/Token.h b/src/format/Token.h index d69cd46424..1197ddb235 100644 --- a/src/format/Token.h +++ b/src/format/Token.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_FORMAT_TOKEN_H -#define _SQUID_FORMAT_TOKEN_H +#ifndef SQUID_SRC_FORMAT_TOKEN_H +#define SQUID_SRC_FORMAT_TOKEN_H #include "format/ByteCode.h" #include "proxyp/Elements.h" @@ -76,5 +76,5 @@ private: } // namespace Format -#endif /* _SQUID_FORMAT_TOKEN_H */ +#endif /* SQUID_SRC_FORMAT_TOKEN_H */ diff --git a/src/format/TokenTableEntry.h b/src/format/TokenTableEntry.h index 5d508a8f9f..b9f533a49e 100644 --- a/src/format/TokenTableEntry.h +++ b/src/format/TokenTableEntry.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_FORMAT_TOKENTABLEENTRY_H -#define _SQUID_FORMAT_TOKENTABLEENTRY_H +#ifndef SQUID_SRC_FORMAT_TOKENTABLEENTRY_H +#define SQUID_SRC_FORMAT_TOKENTABLEENTRY_H #include "format/ByteCode.h" @@ -52,5 +52,5 @@ private: } // namespace Format -#endif /* _SQUID_FORMAT_TOKENTABLEENTRY_H */ +#endif /* SQUID_SRC_FORMAT_TOKENTABLEENTRY_H */ diff --git a/src/fqdncache.h b/src/fqdncache.h index 1cbb4ee322..262c8997a1 100644 --- a/src/fqdncache.h +++ b/src/fqdncache.h @@ -8,8 +8,8 @@ /* DEBUG: section 35 FQDN Cache */ -#ifndef SQUID_FQDNCACHE_H_ -#define SQUID_FQDNCACHE_H_ +#ifndef SQUID_SRC_FQDNCACHE_H +#define SQUID_SRC_FQDNCACHE_H #include "ip/Address.h" #include "sbuf/forward.h" @@ -34,5 +34,5 @@ void fqdncacheAddEntryFromHosts(char *addr, SBufList &hostnames); const char *fqdncache_gethostbyaddr(const Ip::Address &, int flags); void fqdncache_nbgethostbyaddr(const Ip::Address &, FQDNH *, void *); -#endif /* SQUID_FQDNCACHE_H_ */ +#endif /* SQUID_SRC_FQDNCACHE_H */ diff --git a/src/fs/Module.h b/src/fs/Module.h index fb39efa288..9f06b53930 100644 --- a/src/fs/Module.h +++ b/src/fs/Module.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_FS_MODULE_H -#define SQUID_FS_MODULE_H +#ifndef SQUID_SRC_FS_MODULE_H +#define SQUID_SRC_FS_MODULE_H namespace Fs { @@ -16,5 +16,5 @@ void Init(); } // namespace Fs -#endif /* SQUID_FS_MODULE_H */ +#endif /* SQUID_SRC_FS_MODULE_H */ diff --git a/src/fs/rock/RockDbCell.h b/src/fs/rock/RockDbCell.h index bbe65a5a2c..9f04d04deb 100644 --- a/src/fs/rock/RockDbCell.h +++ b/src/fs/rock/RockDbCell.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_FS_ROCK_DB_CELL_H -#define SQUID_FS_ROCK_DB_CELL_H +#ifndef SQUID_SRC_FS_ROCK_ROCKDBCELL_H +#define SQUID_SRC_FS_ROCK_ROCKDBCELL_H #include "store/forward.h" @@ -48,5 +48,5 @@ public: } // namespace Rock -#endif /* SQUID_FS_ROCK_DB_CELL_H */ +#endif /* SQUID_SRC_FS_ROCK_ROCKDBCELL_H */ diff --git a/src/fs/rock/RockHeaderUpdater.h b/src/fs/rock/RockHeaderUpdater.h index 44de05ff87..1268dfb886 100644 --- a/src/fs/rock/RockHeaderUpdater.h +++ b/src/fs/rock/RockHeaderUpdater.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_FS_ROCK_HEADER_UPDATER_H -#define SQUID_FS_ROCK_HEADER_UPDATER_H +#ifndef SQUID_SRC_FS_ROCK_ROCKHEADERUPDATER_H +#define SQUID_SRC_FS_ROCK_ROCKHEADERUPDATER_H #include "base/AsyncJob.h" #include "cbdata.h" @@ -82,5 +82,5 @@ std::ostream &operator <<(std::ostream &os, const HeaderUpdater::IoCbParams &par } // namespace Rock -#endif /* SQUID_FS_ROCK_HEADER_UPDATER_H */ +#endif /* SQUID_SRC_FS_ROCK_ROCKHEADERUPDATER_H */ diff --git a/src/fs/rock/RockIoRequests.h b/src/fs/rock/RockIoRequests.h index bf5ab37cd2..92cfeb173f 100644 --- a/src/fs/rock/RockIoRequests.h +++ b/src/fs/rock/RockIoRequests.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_FS_ROCK_IO_REQUESTS_H -#define SQUID_FS_ROCK_IO_REQUESTS_H +#ifndef SQUID_SRC_FS_ROCK_ROCKIOREQUESTS_H +#define SQUID_SRC_FS_ROCK_ROCKIOREQUESTS_H #include "DiskIO/ReadRequest.h" #include "DiskIO/WriteRequest.h" @@ -56,5 +56,5 @@ public: } // namespace Rock -#endif /* SQUID_FS_ROCK_IO_REQUESTS_H */ +#endif /* SQUID_SRC_FS_ROCK_ROCKIOREQUESTS_H */ diff --git a/src/fs/rock/RockIoState.h b/src/fs/rock/RockIoState.h index dd83edc9ca..2f03cbc585 100644 --- a/src/fs/rock/RockIoState.h +++ b/src/fs/rock/RockIoState.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_FS_ROCK_IO_STATE_H -#define SQUID_FS_ROCK_IO_STATE_H +#ifndef SQUID_SRC_FS_ROCK_ROCKIOSTATE_H +#define SQUID_SRC_FS_ROCK_ROCKIOSTATE_H #include "fs/rock/forward.h" #include "fs/rock/RockSwapDir.h" @@ -106,5 +106,5 @@ private: } // namespace Rock -#endif /* SQUID_FS_ROCK_IO_STATE_H */ +#endif /* SQUID_SRC_FS_ROCK_ROCKIOSTATE_H */ diff --git a/src/fs/rock/RockRebuild.h b/src/fs/rock/RockRebuild.h index f855cea841..76c3089f43 100644 --- a/src/fs/rock/RockRebuild.h +++ b/src/fs/rock/RockRebuild.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_FS_ROCK_REBUILD_H -#define SQUID_FS_ROCK_REBUILD_H +#ifndef SQUID_SRC_FS_ROCK_ROCKREBUILD_H +#define SQUID_SRC_FS_ROCK_ROCKREBUILD_H #include "base/AsyncJob.h" #include "base/RunnersRegistry.h" @@ -130,5 +130,5 @@ private: } // namespace Rock -#endif /* SQUID_FS_ROCK_REBUILD_H */ +#endif /* SQUID_SRC_FS_ROCK_ROCKREBUILD_H */ diff --git a/src/fs/rock/RockStoreFileSystem.h b/src/fs/rock/RockStoreFileSystem.h index 960d8ae1bc..db9ee7a9e2 100644 --- a/src/fs/rock/RockStoreFileSystem.h +++ b/src/fs/rock/RockStoreFileSystem.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_FS_ROCK_FS_H -#define SQUID_FS_ROCK_FS_H +#ifndef SQUID_SRC_FS_ROCK_ROCKSTOREFILESYSTEM_H +#define SQUID_SRC_FS_ROCK_ROCKSTOREFILESYSTEM_H #include "StoreFileSystem.h" @@ -38,5 +38,5 @@ private: } // namespace Rock -#endif /* SQUID_FS_ROCK_FS_H */ +#endif /* SQUID_SRC_FS_ROCK_ROCKSTOREFILESYSTEM_H */ diff --git a/src/fs/rock/RockSwapDir.h b/src/fs/rock/RockSwapDir.h index 786e803df8..53079a833f 100644 --- a/src/fs/rock/RockSwapDir.h +++ b/src/fs/rock/RockSwapDir.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_FS_ROCK_SWAP_DIR_H -#define SQUID_FS_ROCK_SWAP_DIR_H +#ifndef SQUID_SRC_FS_ROCK_ROCKSWAPDIR_H +#define SQUID_SRC_FS_ROCK_ROCKSWAPDIR_H #include "DiskIO/DiskFile.h" #include "DiskIO/IORequestor.h" @@ -170,5 +170,5 @@ private: } // namespace Rock -#endif /* SQUID_FS_ROCK_SWAP_DIR_H */ +#endif /* SQUID_SRC_FS_ROCK_ROCKSWAPDIR_H */ diff --git a/src/fs/rock/forward.h b/src/fs/rock/forward.h index 576e614ff3..905c38b864 100644 --- a/src/fs/rock/forward.h +++ b/src/fs/rock/forward.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_FS_ROCK_FORWARD_H -#define SQUID_FS_ROCK_FORWARD_H +#ifndef SQUID_SRC_FS_ROCK_FORWARD_H +#define SQUID_SRC_FS_ROCK_FORWARD_H #include "store/forward.h" @@ -49,5 +49,5 @@ class WriteRequest; } -#endif /* SQUID_FS_ROCK_FORWARD_H */ +#endif /* SQUID_SRC_FS_ROCK_FORWARD_H */ diff --git a/src/fs/ufs/RebuildState.h b/src/fs/ufs/RebuildState.h index 7e33fc813d..73226bcf82 100644 --- a/src/fs/ufs/RebuildState.h +++ b/src/fs/ufs/RebuildState.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_FS_UFS_REBUILDSTATE_H -#define SQUID_FS_UFS_REBUILDSTATE_H +#ifndef SQUID_SRC_FS_UFS_REBUILDSTATE_H +#define SQUID_SRC_FS_UFS_REBUILDSTATE_H #include "base/RefCount.h" #include "store_rebuild.h" @@ -83,5 +83,5 @@ private: } /* namespace Ufs */ } /* namespace Fs */ -#endif /* SQUID_FS_UFS_REBUILDSTATE_H */ +#endif /* SQUID_SRC_FS_UFS_REBUILDSTATE_H */ diff --git a/src/fs/ufs/StoreFSufs.h b/src/fs/ufs/StoreFSufs.h index 888917c647..2175b99eb0 100644 --- a/src/fs/ufs/StoreFSufs.h +++ b/src/fs/ufs/StoreFSufs.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_STOREFSUFS_H -#define SQUID_STOREFSUFS_H +#ifndef SQUID_SRC_FS_UFS_STOREFSUFS_H +#define SQUID_SRC_FS_UFS_STOREFSUFS_H /** \defgroup UFS UFS Storage Filesystem @@ -72,5 +72,5 @@ StoreFSufs::createSwapDir() } /* namespace Ufs */ } /* namespace Fs */ -#endif /* SQUID_STOREFSUFS_H */ +#endif /* SQUID_SRC_FS_UFS_STOREFSUFS_H */ diff --git a/src/fs/ufs/StoreSearchUFS.h b/src/fs/ufs/StoreSearchUFS.h index 10c7ff158b..3bbda7080e 100644 --- a/src/fs/ufs/StoreSearchUFS.h +++ b/src/fs/ufs/StoreSearchUFS.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_FS_UFS_STORESEARCHUFS_H -#define SQUID_FS_UFS_STORESEARCHUFS_H +#ifndef SQUID_SRC_FS_UFS_STORESEARCHUFS_H +#define SQUID_SRC_FS_UFS_STORESEARCHUFS_H #include "StoreSearch.h" #include "UFSSwapDir.h" @@ -59,5 +59,5 @@ private: } //namespace Ufs } //namespace Fs -#endif /* SQUID_FS_UFS_STORESEARCHUFS_H */ +#endif /* SQUID_SRC_FS_UFS_STORESEARCHUFS_H */ diff --git a/src/fs/ufs/UFSStoreState.h b/src/fs/ufs/UFSStoreState.h index b252410cda..41bf8dff88 100644 --- a/src/fs/ufs/UFSStoreState.h +++ b/src/fs/ufs/UFSStoreState.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_FS_UFS_UFSSTORESTATE_H -#define SQUID_FS_UFS_UFSSTORESTATE_H +#ifndef SQUID_SRC_FS_UFS_UFSSTORESTATE_H +#define SQUID_SRC_FS_UFS_UFSSTORESTATE_H #include "DiskIO/IORequestor.h" #include "StoreIOState.h" @@ -133,5 +133,5 @@ private: } //namespace Ufs } //namespace Fs -#endif /* SQUID_FS_UFS_UFSSTORESTATE_H */ +#endif /* SQUID_SRC_FS_UFS_UFSSTORESTATE_H */ diff --git a/src/fs/ufs/UFSStrategy.h b/src/fs/ufs/UFSStrategy.h index a84ee8e1e4..d41cc7aea0 100644 --- a/src/fs/ufs/UFSStrategy.h +++ b/src/fs/ufs/UFSStrategy.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_FS_UFS_UFSSTRATEGY_H -#define SQUID_FS_UFS_UFSSTRATEGY_H +#ifndef SQUID_SRC_FS_UFS_UFSSTRATEGY_H +#define SQUID_SRC_FS_UFS_UFSSTRATEGY_H #include "DiskIO/DiskFile.h" #include "StoreIOState.h" @@ -64,5 +64,5 @@ private: } //namespace Ufs } //namespace Fs -#endif /* SQUID_FS_UFS_UFSSTRATEGY_H */ +#endif /* SQUID_SRC_FS_UFS_UFSSTRATEGY_H */ diff --git a/src/fs/ufs/UFSSwapDir.h b/src/fs/ufs/UFSSwapDir.h index 0e23b66f09..ee47f635a2 100644 --- a/src/fs/ufs/UFSSwapDir.h +++ b/src/fs/ufs/UFSSwapDir.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_FS_UFS_UFSSWAPDIR_H -#define SQUID_FS_UFS_UFSSWAPDIR_H +#ifndef SQUID_SRC_FS_UFS_UFSSWAPDIR_H +#define SQUID_SRC_FS_UFS_UFSSWAPDIR_H #include "SquidString.h" #include "Store.h" @@ -153,5 +153,5 @@ private: } //namespace Ufs } //namespace Fs -#endif /* SQUID_FS_UFS_UFSSWAPDIR_H */ +#endif /* SQUID_SRC_FS_UFS_UFSSWAPDIR_H */ diff --git a/src/fs/ufs/UFSSwapLogParser.h b/src/fs/ufs/UFSSwapLogParser.h index 0010ab8c83..52c28746f3 100644 --- a/src/fs/ufs/UFSSwapLogParser.h +++ b/src/fs/ufs/UFSSwapLogParser.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_FS_UFS_UFSSWAPLOGPARSER_H -#define SQUID_FS_UFS_UFSSWAPLOGPARSER_H +#ifndef SQUID_SRC_FS_UFS_UFSSWAPLOGPARSER_H +#define SQUID_SRC_FS_UFS_UFSSWAPLOGPARSER_H class StoreSwapLogData; @@ -41,5 +41,5 @@ public: } //namespace Ufs } //namespace Fs -#endif /* SQUID_FS_UFS_UFSSWAPLOGPARSER_H */ +#endif /* SQUID_SRC_FS_UFS_UFSSWAPLOGPARSER_H */ diff --git a/src/fs_io.h b/src/fs_io.h index 396b444ffa..39645002da 100644 --- a/src/fs_io.h +++ b/src/fs_io.h @@ -8,8 +8,8 @@ /* DEBUG: section 06 Disk I/O Routines */ -#ifndef SQUID_FS_IO_H_ -#define SQUID_FS_IO_H_ +#ifndef SQUID_SRC_FS_IO_H +#define SQUID_SRC_FS_IO_H #include "mem/forward.h" #include "sbuf/forward.h" @@ -62,5 +62,5 @@ bool FileRename(const SBuf &from, const SBuf &to); int fsBlockSize(const char *path, int *blksize); int fsStats(const char *, int *, int *, int *, int *); -#endif /* SQUID_FS_IO_H_ */ +#endif /* SQUID_SRC_FS_IO_H */ diff --git a/src/ftp/Elements.h b/src/ftp/Elements.h index e5e748da01..41958f3e73 100644 --- a/src/ftp/Elements.h +++ b/src/ftp/Elements.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_FTP_ELEMENTS_H -#define SQUID_FTP_ELEMENTS_H +#ifndef SQUID_SRC_FTP_ELEMENTS_H +#define SQUID_SRC_FTP_ELEMENTS_H #include "http/forward.h" #include "http/StatusCode.h" @@ -54,5 +54,5 @@ inline bool Is1xx(const int sc) { return Http::scContinue <= sc && sc < Http::sc } // namespace Ftp -#endif /* SQUID_FTP_ELEMENTS_H */ +#endif /* SQUID_SRC_FTP_ELEMENTS_H */ diff --git a/src/ftp/Parsing.h b/src/ftp/Parsing.h index fbf8e3afa7..3bf18b0cb3 100644 --- a/src/ftp/Parsing.h +++ b/src/ftp/Parsing.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_FTP_PARSING_H -#define SQUID_FTP_PARSING_H +#ifndef SQUID_SRC_FTP_PARSING_H +#define SQUID_SRC_FTP_PARSING_H #include "ip/forward.h" @@ -26,5 +26,5 @@ const char *UnescapeDoubleQuoted(const char *quotedPath); } // namespace Ftp -#endif /* SQUID_FTP_PARSING_H */ +#endif /* SQUID_SRC_FTP_PARSING_H */ diff --git a/src/globals.h b/src/globals.h index 3cffecf4d5..4cc5b8b5ef 100644 --- a/src/globals.h +++ b/src/globals.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_GLOBALS_H -#define SQUID_GLOBALS_H +#ifndef SQUID_SRC_GLOBALS_H +#define SQUID_SRC_GLOBALS_H #include "CacheDigest.h" #include "defines.h" @@ -109,5 +109,5 @@ extern int opt_parse_cfg_only; /* 0 */ /// Zero for SMP-unaware code and in no-SMP mode. extern int KidIdentifier; /* 0 */ -#endif /* SQUID_GLOBALS_H */ +#endif /* SQUID_SRC_GLOBALS_H */ diff --git a/src/helper.h b/src/helper.h index 5f01ded6c2..db29a3c43d 100644 --- a/src/helper.h +++ b/src/helper.h @@ -8,8 +8,8 @@ /* DEBUG: section 84 Helper process maintenance */ -#ifndef SQUID_HELPER_H -#define SQUID_HELPER_H +#ifndef SQUID_SRC_HELPER_H +#define SQUID_SRC_HELPER_H #include "base/AsyncCall.h" #include "base/InstanceId.h" @@ -325,5 +325,5 @@ void helperStatefulSubmit(statefulhelper * hlp, const char *buf, HLPCB * callbac void helperShutdown(helper * hlp); void helperStatefulShutdown(statefulhelper * hlp); -#endif /* SQUID_HELPER_H */ +#endif /* SQUID_SRC_HELPER_H */ diff --git a/src/helper/ChildConfig.h b/src/helper/ChildConfig.h index 7db3114093..10a5130b87 100644 --- a/src/helper/ChildConfig.h +++ b/src/helper/ChildConfig.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_HELPER_CHILDCONFIG_H -#define _SQUID_SRC_HELPER_CHILDCONFIG_H +#ifndef SQUID_SRC_HELPER_CHILDCONFIG_H +#define SQUID_SRC_HELPER_CHILDCONFIG_H namespace Helper { @@ -116,5 +116,5 @@ public: #define dump_HelperChildConfig(e,n,c) storeAppendPrintf((e), "\n%s %d startup=%d idle=%d concurrency=%d\n", (n), (c).n_max, (c).n_startup, (c).n_idle, (c).concurrency) #define free_HelperChildConfig(dummy) // NO. -#endif /* _SQUID_SRC_HELPER_CHILDCONFIG_H */ +#endif /* SQUID_SRC_HELPER_CHILDCONFIG_H */ diff --git a/src/helper/Reply.h b/src/helper/Reply.h index 97f5a3b72b..5682cc2046 100644 --- a/src/helper/Reply.h +++ b/src/helper/Reply.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_HELPER_REPLY_H -#define _SQUID_SRC_HELPER_REPLY_H +#ifndef SQUID_SRC_HELPER_REPLY_H +#define SQUID_SRC_HELPER_REPLY_H #include "base/CbcPointer.h" #include "helper/forward.h" @@ -79,5 +79,5 @@ std::ostream &operator <<(std::ostream &, const Reply &); } // namespace Helper -#endif /* _SQUID_SRC_HELPER_REPLY_H */ +#endif /* SQUID_SRC_HELPER_REPLY_H */ diff --git a/src/helper/Request.h b/src/helper/Request.h index f9cea94ba7..61e2ba5b24 100644 --- a/src/helper/Request.h +++ b/src/helper/Request.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_HELPER_REQUEST_H -#define _SQUID_SRC_HELPER_REQUEST_H +#ifndef SQUID_SRC_HELPER_REQUEST_H +#define SQUID_SRC_HELPER_REQUEST_H #include "helper/forward.h" #include "time/gadgets.h" @@ -55,5 +55,5 @@ public: } // namespace Helper -#endif /* _SQUID_SRC_HELPER_REQUEST_H */ +#endif /* SQUID_SRC_HELPER_REQUEST_H */ diff --git a/src/helper/ReservationId.h b/src/helper/ReservationId.h index 4c28d1686e..7da347d807 100644 --- a/src/helper/ReservationId.h +++ b/src/helper/ReservationId.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_HELPER_RESERVATIONID_H -#define _SQUID_SRC_HELPER_RESERVATIONID_H +#ifndef SQUID_SRC_HELPER_RESERVATIONID_H +#define SQUID_SRC_HELPER_RESERVATIONID_H #include @@ -59,5 +59,5 @@ struct hash }; } -#endif +#endif /* SQUID_SRC_HELPER_RESERVATIONID_H */ diff --git a/src/helper/ResultCode.h b/src/helper/ResultCode.h index 35d6a86e2f..f496ead6e5 100644 --- a/src/helper/ResultCode.h +++ b/src/helper/ResultCode.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_HELPER_RESULTCODE_H -#define _SQUID_SRC_HELPER_RESULTCODE_H +#ifndef SQUID_SRC_HELPER_RESULTCODE_H +#define SQUID_SRC_HELPER_RESULTCODE_H namespace Helper { @@ -27,5 +27,5 @@ enum ResultCode { } // namespace Helper -#endif /* _SQUID_SRC_HELPER_RESULTCODE_H */ +#endif /* SQUID_SRC_HELPER_RESULTCODE_H */ diff --git a/src/helper/protocol_defines.h b/src/helper/protocol_defines.h index 07680de052..4bc578e5e1 100644 --- a/src/helper/protocol_defines.h +++ b/src/helper/protocol_defines.h @@ -35,8 +35,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __SQUID_HELPERS_DEFINES_H -#define __SQUID_HELPERS_DEFINES_H +#ifndef SQUID_SRC_HELPER_PROTOCOL_DEFINES_H +#define SQUID_SRC_HELPER_PROTOCOL_DEFINES_H /* * This file contains several macro definitions which are @@ -62,5 +62,5 @@ /* send TT result to Squid with a string parameter. */ #define SEND_TT(x) std::cout << "TT " << x << std::endl -#endif /* __SQUID_HELPERS_DEFINES_H */ +#endif /* SQUID_SRC_HELPER_PROTOCOL_DEFINES_H */ diff --git a/src/hier_code.h b/src/hier_code.h index c6793879df..38d2b7121c 100644 --- a/src/hier_code.h +++ b/src/hier_code.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID__HIER_CODE_H -#define SQUID__HIER_CODE_H +#ifndef SQUID_SRC_HIER_CODE_H +#define SQUID_SRC_HIER_CODE_H typedef enum { HIER_NONE, @@ -42,5 +42,5 @@ extern const char *hier_code_str[]; inline hier_code operator++(hier_code &i) { return i = (hier_code)(1+(int)i); } -#endif /* SQUID__HIER_CODE_H */ +#endif /* SQUID_SRC_HIER_CODE_H */ diff --git a/src/htcp.h b/src/htcp.h index 159a6bdd75..a354bc631b 100644 --- a/src/htcp.h +++ b/src/htcp.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_HTCP_H -#define SQUID_HTCP_H +#ifndef SQUID_SRC_HTCP_H +#define SQUID_SRC_HTCP_H #if USE_HTCP @@ -71,5 +71,5 @@ void htcpClosePorts(void); #endif /* USE_HTCP */ -#endif /* SQUID_HTCP_H */ +#endif /* SQUID_SRC_HTCP_H */ diff --git a/src/http.h b/src/http.h index 4f59af90ba..cb4ae061d4 100644 --- a/src/http.h +++ b/src/http.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_HTTP_H -#define SQUID_HTTP_H +#ifndef SQUID_SRC_HTTP_H +#define SQUID_SRC_HTTP_H #include "clients/Client.h" #include "comm.h" @@ -163,5 +163,5 @@ int httpCachable(const HttpRequestMethod&); void httpStart(FwdState *); SBuf httpMakeVaryMark(HttpRequest * request, HttpReply const * reply); -#endif /* SQUID_HTTP_H */ +#endif /* SQUID_SRC_HTTP_H */ diff --git a/src/http/ContentLengthInterpreter.h b/src/http/ContentLengthInterpreter.h index a0866ca6c4..1a5ee48099 100644 --- a/src/http/ContentLengthInterpreter.h +++ b/src/http/ContentLengthInterpreter.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_HTTP_CONTENTLENGTH_INTERPRETER_H -#define SQUID_SRC_HTTP_CONTENTLENGTH_INTERPRETER_H +#ifndef SQUID_SRC_HTTP_CONTENTLENGTHINTERPRETER_H +#define SQUID_SRC_HTTP_CONTENTLENGTHINTERPRETER_H #include "http/StatusCode.h" @@ -79,5 +79,5 @@ private: } // namespace Http -#endif /* SQUID_SRC_HTTP_CONTENTLENGTH_INTERPRETER_H */ +#endif /* SQUID_SRC_HTTP_CONTENTLENGTHINTERPRETER_H */ diff --git a/src/http/Message.h b/src/http/Message.h index b205d1c9ff..6e4f879ed7 100644 --- a/src/http/Message.h +++ b/src/http/Message.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_HTTP_MESSAGE_H -#define SQUID_HTTP_MESSAGE_H +#ifndef SQUID_SRC_HTTP_MESSAGE_H +#define SQUID_SRC_HTTP_MESSAGE_H #include "base/Lock.h" #include "BodyPipe.h" @@ -163,5 +163,5 @@ HTTPMSGLOCK(Http::Message *a) a->lock(); } -#endif /* SQUID_HTTPMSG_H */ +#endif /* SQUID_SRC_HTTP_MESSAGE_H */ diff --git a/src/http/ProtocolVersion.h b/src/http/ProtocolVersion.h index ae51a47cca..a3104b621a 100644 --- a/src/http/ProtocolVersion.h +++ b/src/http/ProtocolVersion.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_HTTP_PROTOCOLVERSION_H -#define SQUID_HTTP_PROTOCOLVERSION_H +#ifndef SQUID_SRC_HTTP_PROTOCOLVERSION_H +#define SQUID_SRC_HTTP_PROTOCOLVERSION_H #include "anyp/ProtocolVersion.h" @@ -36,5 +36,5 @@ ProtocolVersion() }; // namespace Http -#endif /* SQUID_HTTP_PROTOCOLVERSION_H */ +#endif /* SQUID_SRC_HTTP_PROTOCOLVERSION_H */ diff --git a/src/http/RegisteredHeaders.h b/src/http/RegisteredHeaders.h index 12299c4df5..376378f371 100644 --- a/src/http/RegisteredHeaders.h +++ b/src/http/RegisteredHeaders.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_HTTP_REGISTEREDHEADERS_H -#define SQUID_HTTP_REGISTEREDHEADERS_H +#ifndef SQUID_SRC_HTTP_REGISTEREDHEADERS_H +#define SQUID_SRC_HTTP_REGISTEREDHEADERS_H #include "base/LookupTable.h" @@ -226,5 +226,5 @@ std::ostream &operator <<(std::ostream &, HdrType); }; /* namespace Http */ -#endif /* SQUID_HTTP_REGISTEREDHEADERS_H */ +#endif /* SQUID_SRC_HTTP_REGISTEREDHEADERS_H */ diff --git a/src/http/RequestMethod.h b/src/http/RequestMethod.h index 1317632c7c..5bc14caa3d 100644 --- a/src/http/RequestMethod.h +++ b/src/http/RequestMethod.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_HTTPREQUESTMETHOD_H -#define SQUID_HTTPREQUESTMETHOD_H +#ifndef SQUID_SRC_HTTP_REQUESTMETHOD_H +#define SQUID_SRC_HTTP_REQUESTMETHOD_H #include "http/forward.h" #include "http/MethodType.h" @@ -119,5 +119,5 @@ operator << (std::ostream &os, HttpRequestMethod const &method) return os; } -#endif /* SQUID_HTTPREQUESTMETHOD_H */ +#endif /* SQUID_SRC_HTTP_REQUESTMETHOD_H */ diff --git a/src/http/StatusCode.h b/src/http/StatusCode.h index 0ebe87aa72..2bad7ab1b1 100644 --- a/src/http/StatusCode.h +++ b/src/http/StatusCode.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_HTTP_STATUSCODE_H -#define _SQUID_SRC_HTTP_STATUSCODE_H +#ifndef SQUID_SRC_HTTP_STATUSCODE_H +#define SQUID_SRC_HTTP_STATUSCODE_H namespace Http { @@ -99,5 +99,5 @@ bool IsReforwardableStatus(StatusCode); } // namespace Http -#endif /* _SQUID_SRC_HTTP_STATUSCODE_H */ +#endif /* SQUID_SRC_HTTP_STATUSCODE_H */ diff --git a/src/http/StatusLine.h b/src/http/StatusLine.h index 1122591777..4363a5c69a 100644 --- a/src/http/StatusLine.h +++ b/src/http/StatusLine.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_HTTP_STATUSLINE_H -#define SQUID_HTTP_STATUSLINE_H +#ifndef SQUID_SRC_HTTP_STATUSLINE_H +#define SQUID_SRC_HTTP_STATUSLINE_H #include "http/ProtocolVersion.h" #include "http/StatusCode.h" @@ -74,5 +74,5 @@ private: } // namespace Http -#endif /* SQUID_HTTP_STATUSLINE_H */ +#endif /* SQUID_SRC_HTTP_STATUSLINE_H */ diff --git a/src/http/one/Parser.h b/src/http/one/Parser.h index 503c61d3ff..d9a0ac8c27 100644 --- a/src/http/one/Parser.h +++ b/src/http/one/Parser.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_HTTP_ONE_PARSER_H -#define _SQUID_SRC_HTTP_ONE_PARSER_H +#ifndef SQUID_SRC_HTTP_ONE_PARSER_H +#define SQUID_SRC_HTTP_ONE_PARSER_H #include "anyp/ProtocolVersion.h" #include "http/one/forward.h" @@ -172,5 +172,5 @@ int ErrorLevel(); } // namespace One } // namespace Http -#endif /* _SQUID_SRC_HTTP_ONE_PARSER_H */ +#endif /* SQUID_SRC_HTTP_ONE_PARSER_H */ diff --git a/src/http/one/RequestParser.h b/src/http/one/RequestParser.h index 55d5f3b8f9..04379cbc38 100644 --- a/src/http/one/RequestParser.h +++ b/src/http/one/RequestParser.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_HTTP_ONE_REQUESTPARSER_H -#define _SQUID_SRC_HTTP_ONE_REQUESTPARSER_H +#ifndef SQUID_SRC_HTTP_ONE_REQUESTPARSER_H +#define SQUID_SRC_HTTP_ONE_REQUESTPARSER_H #include "http/one/Parser.h" #include "http/RequestMethod.h" @@ -83,5 +83,5 @@ private: } // namespace One } // namespace Http -#endif /* _SQUID_SRC_HTTP_ONE_REQUESTPARSER_H */ +#endif /* SQUID_SRC_HTTP_ONE_REQUESTPARSER_H */ diff --git a/src/http/one/ResponseParser.h b/src/http/one/ResponseParser.h index 4c0fcd65b7..37937f2b07 100644 --- a/src/http/one/ResponseParser.h +++ b/src/http/one/ResponseParser.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_HTTP_ONE_RESPONSEPARSER_H -#define _SQUID_SRC_HTTP_ONE_RESPONSEPARSER_H +#ifndef SQUID_SRC_HTTP_ONE_RESPONSEPARSER_H +#define SQUID_SRC_HTTP_ONE_RESPONSEPARSER_H #include "http/one/Parser.h" #include "http/StatusCode.h" @@ -71,5 +71,5 @@ private: } // namespace One } // namespace Http -#endif /* _SQUID_SRC_HTTP_ONE_RESPONSEPARSER_H */ +#endif /* SQUID_SRC_HTTP_ONE_RESPONSEPARSER_H */ diff --git a/src/http/one/TeChunkedParser.h b/src/http/one/TeChunkedParser.h index f6dccd1b44..02eacd1bb8 100644 --- a/src/http/one/TeChunkedParser.h +++ b/src/http/one/TeChunkedParser.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_HTTP_ONE_TeChunkedParser_H -#define SQUID_SRC_HTTP_ONE_TeChunkedParser_H +#ifndef SQUID_SRC_HTTP_ONE_TECHUNKEDPARSER_H +#define SQUID_SRC_HTTP_ONE_TECHUNKEDPARSER_H #include "http/one/Parser.h" @@ -88,5 +88,5 @@ private: } // namespace One } // namespace Http -#endif /* SQUID_SRC_HTTP_ONE_TeChunkedParser_H */ +#endif /* SQUID_SRC_HTTP_ONE_TECHUNKEDPARSER_H */ diff --git a/src/icmp/Icmp.h b/src/icmp/Icmp.h index a24de2d0cc..a9fb70c61a 100644 --- a/src/icmp/Icmp.h +++ b/src/icmp/Icmp.h @@ -8,8 +8,8 @@ /* DEBUG: section 37 ICMP Routines */ -#ifndef _INCLUDE_ICMP_H -#define _INCLUDE_ICMP_H +#ifndef SQUID_SRC_ICMP_ICMP_H +#define SQUID_SRC_ICMP_ICMP_H #include "ip/Address.h" @@ -123,5 +123,5 @@ protected: #endif /* USE_ICMP */ }; -#endif +#endif /* SQUID_SRC_ICMP_ICMP_H */ diff --git a/src/icmp/Icmp4.h b/src/icmp/Icmp4.h index e0511a5695..a8577ac441 100644 --- a/src/icmp/Icmp4.h +++ b/src/icmp/Icmp4.h @@ -8,8 +8,8 @@ /* DEBUG: section 37 ICMP Routines */ -#ifndef _INCLUDE_ICMPV4_H -#define _INCLUDE_ICMPV4_H +#ifndef SQUID_SRC_ICMP_ICMP4_H +#define SQUID_SRC_ICMP_ICMP4_H #include "Icmp.h" @@ -151,5 +151,5 @@ extern Icmp4 icmp4; #endif /* USE_ICMP && SQUID_HELPER */ -#endif +#endif /* SQUID_SRC_ICMP_ICMP4_H */ diff --git a/src/icmp/Icmp6.h b/src/icmp/Icmp6.h index f4eeaecde7..83d80c5ad9 100644 --- a/src/icmp/Icmp6.h +++ b/src/icmp/Icmp6.h @@ -8,8 +8,8 @@ /* DEBUG: section 37 ICMP Routines */ -#ifndef _INCLUDE_ICMPV6_H -#define _INCLUDE_ICMPV6_H +#ifndef SQUID_SRC_ICMP_ICMP6_H +#define SQUID_SRC_ICMP_ICMP6_H #include "Icmp.h" @@ -62,5 +62,5 @@ public: extern Icmp6 icmp6; #endif /* USE_ICMP && SQUID_HELPER */ -#endif /* _INCLUDE_ICMPV6_H */ +#endif /* SQUID_SRC_ICMP_ICMP6_H */ diff --git a/src/icmp/IcmpConfig.h b/src/icmp/IcmpConfig.h index d7e293dd16..4a22087103 100644 --- a/src/icmp/IcmpConfig.h +++ b/src/icmp/IcmpConfig.h @@ -8,8 +8,8 @@ /* DEBUG: section 03 Configuration Settings */ -#ifndef ICMPCONFIG_H -#define ICMPCONFIG_H +#ifndef SQUID_SRC_ICMP_ICMPCONFIG_H +#define SQUID_SRC_ICMP_ICMPCONFIG_H #if USE_ICMP @@ -49,5 +49,5 @@ extern IcmpConfig IcmpCfg; #define free_icmp(x) (x)->clear() #endif /* USE_ICMP */ -#endif /* ICMPCONFIG_H */ +#endif /* SQUID_SRC_ICMP_ICMPCONFIG_H */ diff --git a/src/icmp/IcmpPinger.h b/src/icmp/IcmpPinger.h index 88eefbd8ef..d25c3f6700 100644 --- a/src/icmp/IcmpPinger.h +++ b/src/icmp/IcmpPinger.h @@ -8,8 +8,8 @@ /* DEBUG: section 37 ICMP Routines */ -#ifndef _INCLUDE_ICMPPINGER_H -#define _INCLUDE_ICMPPINGER_H +#ifndef SQUID_SRC_ICMP_ICMPPINGER_H +#define SQUID_SRC_ICMP_ICMPPINGER_H #include "Icmp.h" /** @@ -55,5 +55,5 @@ extern IcmpPinger control; #endif -#endif +#endif /* SQUID_SRC_ICMP_ICMPPINGER_H */ diff --git a/src/icmp/IcmpSquid.h b/src/icmp/IcmpSquid.h index 0347183431..b21ec6c719 100644 --- a/src/icmp/IcmpSquid.h +++ b/src/icmp/IcmpSquid.h @@ -8,8 +8,8 @@ /* DEBUG: section 37 ICMP Routines */ -#ifndef _INCLUDE_ICMPSQUID_H -#define _INCLUDE_ICMPSQUID_H +#ifndef SQUID_SRC_ICMP_ICMPSQUID_H +#define SQUID_SRC_ICMP_ICMPSQUID_H #include "Icmp.h" @@ -41,5 +41,5 @@ public: // global engine within squid. extern IcmpSquid icmpEngine; -#endif /* _INCLUDE_ICMPSQUID_H */ +#endif /* SQUID_SRC_ICMP_ICMPSQUID_H */ diff --git a/src/icmp/net_db.h b/src/icmp/net_db.h index fa5925f6bb..64f4661031 100644 --- a/src/icmp/net_db.h +++ b/src/icmp/net_db.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef ICMP_NET_DB_H -#define ICMP_NET_DB_H +#ifndef SQUID_SRC_ICMP_NET_DB_H +#define SQUID_SRC_ICMP_NET_DB_H #include "anyp/forward.h" #include "hash.h" @@ -85,5 +85,5 @@ void netdbExchangeUpdatePeer(Ip::Address &, CachePeer *, double, double); CachePeer *netdbClosestParent(PeerSelector *); void netdbHostData(const char *host, int *samp, int *rtt, int *hops); -#endif /* ICMP_NET_DB_H */ +#endif /* SQUID_SRC_ICMP_NET_DB_H */ diff --git a/src/icp_opcode.h b/src/icp_opcode.h index fb917e397f..9aa2e0522b 100644 --- a/src/icp_opcode.h +++ b/src/icp_opcode.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_ICP_OPCODE_H -#define _SQUID_ICP_OPCODE_H +#ifndef SQUID_SRC_ICP_OPCODE_H +#define SQUID_SRC_ICP_OPCODE_H /// \ingroup ServerProtocolICPAPI enum icp_opcode { @@ -42,5 +42,5 @@ enum icp_opcode { extern const char *icp_opcode_str[]; -#endif /* _SQUID_ICP_OPCODE_H */ +#endif /* SQUID_SRC_ICP_OPCODE_H */ diff --git a/src/ident/AclIdent.h b/src/ident/AclIdent.h index f898aae870..721b0e6835 100644 --- a/src/ident/AclIdent.h +++ b/src/ident/AclIdent.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_IDENT_ACLIDENT_H -#define SQUID_IDENT_ACLIDENT_H +#ifndef SQUID_SRC_IDENT_ACLIDENT_H +#define SQUID_SRC_IDENT_ACLIDENT_H #if USE_IDENT @@ -55,5 +55,5 @@ private: }; #endif /* USE_IDENT */ -#endif /* SQUID_IDENT_ACLIDENT_H */ +#endif /* SQUID_SRC_IDENT_ACLIDENT_H */ diff --git a/src/ident/Config.h b/src/ident/Config.h index 477fcdc93f..1a3921c458 100644 --- a/src/ident/Config.h +++ b/src/ident/Config.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_IDENT_CONFIG_H -#define SQUID_IDENT_CONFIG_H +#ifndef SQUID_SRC_IDENT_CONFIG_H +#define SQUID_SRC_IDENT_CONFIG_H #if USE_IDENT @@ -28,5 +28,5 @@ extern IdentConfig TheConfig; } // namespace Ident #endif /* USE_IDENT */ -#endif /* SQUID_IDENT_CONFIG_H */ +#endif /* SQUID_SRC_IDENT_CONFIG_H */ diff --git a/src/ident/Ident.h b/src/ident/Ident.h index 62c2b6aefe..3a54d90d68 100644 --- a/src/ident/Ident.h +++ b/src/ident/Ident.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_IDENT_H -#define SQUID_IDENT_H +#ifndef SQUID_SRC_IDENT_IDENT_H +#define SQUID_SRC_IDENT_IDENT_H #if USE_IDENT @@ -29,5 +29,5 @@ void Start(const Comm::ConnectionPointer &conn, IDCB * callback, void *cbdata); } // namespace Ident #endif /* USE_IDENT */ -#endif /* SQUID_IDENT_H */ +#endif /* SQUID_SRC_IDENT_IDENT_H */ diff --git a/src/int.h b/src/int.h index b60eb55f0d..3b022af74c 100644 --- a/src/int.h +++ b/src/int.h @@ -8,10 +8,10 @@ /* DEBUG: section 21 Integer functions */ -#ifndef SQUID_INT_H_ -#define SQUID_INT_H_ +#ifndef SQUID_SRC_INT_H +#define SQUID_SRC_INT_H int isPowTen(int); //int.cc -#endif /* SQUID_INT_H_ */ +#endif /* SQUID_SRC_INT_H */ diff --git a/src/internal.h b/src/internal.h index 0fb2912910..0bb628f1d3 100644 --- a/src/internal.h +++ b/src/internal.h @@ -11,8 +11,8 @@ * AUTHOR: Duane, Alex, Henrik */ -#ifndef SQUID_INTERNAL_H_ -#define SQUID_INTERNAL_H_ +#ifndef SQUID_SRC_INTERNAL_H +#define SQUID_SRC_INTERNAL_H #include "comm/forward.h" #include "log/forward.h" @@ -33,5 +33,5 @@ int internalHostnameIs(const char *); /// necessarily running on this Squid instance) bool ForSomeCacheManager(const SBuf &); -#endif /* SQUID_INTERNAL_H_ */ +#endif /* SQUID_SRC_INTERNAL_H */ diff --git a/src/ip/Address.h b/src/ip/Address.h index b3ccf24322..7a574fdc7d 100644 --- a/src/ip/Address.h +++ b/src/ip/Address.h @@ -8,8 +8,8 @@ /* DEBUG: section 14 IP Storage and Handling */ -#ifndef _SQUID_SRC_IP_ADDRESS_H -#define _SQUID_SRC_IP_ADDRESS_H +#ifndef SQUID_SRC_IP_ADDRESS_H +#define SQUID_SRC_IP_ADDRESS_H #include "ip/forward.h" @@ -374,5 +374,5 @@ public: void parse_IpAddress_list_token(Ip::Address_list **, char *); -#endif /* _SQUID_SRC_IP_ADDRESS_H */ +#endif /* SQUID_SRC_IP_ADDRESS_H */ diff --git a/src/ip/Intercept.h b/src/ip/Intercept.h index 02a5129856..4d73afac48 100644 --- a/src/ip/Intercept.h +++ b/src/ip/Intercept.h @@ -8,8 +8,8 @@ /* DEBUG: section 89 NAT / IP Interception */ -#ifndef SQUID_IP_IPINTERCEPT_H -#define SQUID_IP_IPINTERCEPT_H +#ifndef SQUID_SRC_IP_INTERCEPT_H +#define SQUID_SRC_IP_INTERCEPT_H namespace Ip { @@ -129,5 +129,5 @@ extern Intercept Interceptor; } // namespace Ip -#endif /* SQUID_IP_IPINTERCEPT_H */ +#endif /* SQUID_SRC_IP_INTERCEPT_H */ diff --git a/src/ip/NfMarkConfig.h b/src/ip/NfMarkConfig.h index 6aa90610e7..cee6f2986b 100644 --- a/src/ip/NfMarkConfig.h +++ b/src/ip/NfMarkConfig.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_NFMARKCONFIG_H -#define SQUID_NFMARKCONFIG_H +#ifndef SQUID_SRC_IP_NFMARKCONFIG_H +#define SQUID_SRC_IP_NFMARKCONFIG_H #include "ip/forward.h" @@ -46,5 +46,5 @@ std::ostream &operator <<(std::ostream &, NfMarkConfig); } // namespace Ip -#endif // SQUID_NFMARKCONFIG_H +#endif /* SQUID_SRC_IP_NFMARKCONFIG_H */ diff --git a/src/ip/QosConfig.h b/src/ip/QosConfig.h index 5a30e1df59..de77e476cc 100644 --- a/src/ip/QosConfig.h +++ b/src/ip/QosConfig.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_QOSCONFIG_H -#define SQUID_QOSCONFIG_H +#ifndef SQUID_SRC_IP_QOSCONFIG_H +#define SQUID_SRC_IP_QOSCONFIG_H #include "acl/forward.h" #include "hier_code.h" @@ -251,5 +251,5 @@ extern Config TheConfig; } // namespace Ip -#endif /* SQUID_QOSCONFIG_H */ +#endif /* SQUID_SRC_IP_QOSCONFIG_H */ diff --git a/src/ip/forward.h b/src/ip/forward.h index 096ced751f..cb10b5f7db 100644 --- a/src/ip/forward.h +++ b/src/ip/forward.h @@ -8,8 +8,8 @@ /* DEBUG: section 14 IP Storage and Handling */ -#ifndef _SQUID_IP_FORWARD_H -#define _SQUID_IP_FORWARD_H +#ifndef SQUID_SRC_IP_FORWARD_H +#define SQUID_SRC_IP_FORWARD_H // Forward-declare Ip classes needed by reference in other parts of the code // for passing objects around without actually touching them @@ -26,5 +26,5 @@ class acl_nfmark; typedef uint32_t nfmark_t; typedef unsigned char tos_t; -#endif /* _SQUID_IP_FORWARD_H */ +#endif /* SQUID_SRC_IP_FORWARD_H */ diff --git a/src/ip/tools.h b/src/ip/tools.h index dca93d9a1c..d976264be2 100644 --- a/src/ip/tools.h +++ b/src/ip/tools.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_IP_TOOLS_H -#define _SQUID_SRC_IP_TOOLS_H +#ifndef SQUID_SRC_IP_TOOLS_H +#define SQUID_SRC_IP_TOOLS_H namespace Ip { @@ -26,5 +26,5 @@ extern int EnableIpv6; } // namespace Ip -#endif /* _SQUID_SRC_IP_TOOLS_H */ +#endif /* SQUID_SRC_IP_TOOLS_H */ diff --git a/src/ipc/Coordinator.h b/src/ipc/Coordinator.h index 71c9d469d3..7fc966c014 100644 --- a/src/ipc/Coordinator.h +++ b/src/ipc/Coordinator.h @@ -8,8 +8,8 @@ /* DEBUG: section 54 Interprocess Communication */ -#ifndef SQUID_IPC_COORDINATOR_H -#define SQUID_IPC_COORDINATOR_H +#ifndef SQUID_SRC_IPC_COORDINATOR_H +#define SQUID_SRC_IPC_COORDINATOR_H #include "ipc/Messages.h" #include "ipc/Port.h" @@ -83,5 +83,5 @@ private: } // namespace Ipc -#endif /* SQUID_IPC_COORDINATOR_H */ +#endif /* SQUID_SRC_IPC_COORDINATOR_H */ diff --git a/src/ipc/FdNotes.h b/src/ipc/FdNotes.h index 5a77e79692..95a4d16640 100644 --- a/src/ipc/FdNotes.h +++ b/src/ipc/FdNotes.h @@ -8,8 +8,8 @@ /* DEBUG: section 54 Interprocess Communication */ -#ifndef SQUID_IPC_FD_NOTES_H -#define SQUID_IPC_FD_NOTES_H +#ifndef SQUID_SRC_IPC_FDNOTES_H +#define SQUID_SRC_IPC_FDNOTES_H namespace Ipc { @@ -28,5 +28,5 @@ const char *FdNote(int fdNodeId); ///< converts FdNoteId into a string } // namespace Ipc; -#endif /* SQUID_IPC_FD_NOTES_H */ +#endif /* SQUID_SRC_IPC_FDNOTES_H */ diff --git a/src/ipc/Forwarder.h b/src/ipc/Forwarder.h index d12c59126a..e8d4c06ddb 100644 --- a/src/ipc/Forwarder.h +++ b/src/ipc/Forwarder.h @@ -8,8 +8,8 @@ /* DEBUG: section 54 Interprocess Communication */ -#ifndef SQUID_IPC_FORWARDER_H -#define SQUID_IPC_FORWARDER_H +#ifndef SQUID_SRC_IPC_FORWARDER_H +#define SQUID_SRC_IPC_FORWARDER_H #include "base/AsyncJob.h" #include "base/forward.h" @@ -74,5 +74,5 @@ protected: } // namespace Ipc -#endif /* SQUID_IPC_FORWARDER_H */ +#endif /* SQUID_SRC_IPC_FORWARDER_H */ diff --git a/src/ipc/Inquirer.h b/src/ipc/Inquirer.h index 56ef3c8c5c..691fc9df2d 100644 --- a/src/ipc/Inquirer.h +++ b/src/ipc/Inquirer.h @@ -8,8 +8,8 @@ /* DEBUG: section 54 Interprocess Communication */ -#ifndef SQUID_IPC_INQUIRER_H -#define SQUID_IPC_INQUIRER_H +#ifndef SQUID_SRC_IPC_INQUIRER_H +#define SQUID_SRC_IPC_INQUIRER_H #include "base/AsyncJob.h" #include "base/AsyncJobCalls.h" @@ -78,5 +78,5 @@ protected: } // namespace Ipc -#endif /* SQUID_IPC_INQUIRER_H */ +#endif /* SQUID_SRC_IPC_INQUIRER_H */ diff --git a/src/ipc/Kid.h b/src/ipc/Kid.h index 8bd9a26331..9ffe49e2a9 100644 --- a/src/ipc/Kid.h +++ b/src/ipc/Kid.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_IPC_KID_H -#define SQUID_IPC_KID_H +#ifndef SQUID_SRC_IPC_KID_H +#define SQUID_SRC_IPC_KID_H #include "SquidString.h" #include "tools.h" @@ -110,5 +110,5 @@ typedef enum { /// ProcessKind for the current process extern int TheProcessKind; -#endif /* SQUID_IPC_KID_H */ +#endif /* SQUID_SRC_IPC_KID_H */ diff --git a/src/ipc/Kids.h b/src/ipc/Kids.h index 21b29618fe..d95a2ba62a 100644 --- a/src/ipc/Kids.h +++ b/src/ipc/Kids.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_IPC_KIDS_H -#define SQUID_IPC_KIDS_H +#ifndef SQUID_SRC_IPC_KIDS_H +#define SQUID_SRC_IPC_KIDS_H #include "ipc/Kid.h" @@ -66,5 +66,5 @@ extern Kids TheKids; ///< All kids being maintained extern SBuf TheKidName; ///< current Squid process name (e.g., "squid-coord") -#endif /* SQUID_IPC_KIDS_H */ +#endif /* SQUID_SRC_IPC_KIDS_H */ diff --git a/src/ipc/MemMap.h b/src/ipc/MemMap.h index cc35f42d7e..c31028be75 100644 --- a/src/ipc/MemMap.h +++ b/src/ipc/MemMap.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_IPC_STORE_MAP_H -#define SQUID_IPC_STORE_MAP_H +#ifndef SQUID_SRC_IPC_MEMMAP_H +#define SQUID_SRC_IPC_MEMMAP_H #include "debug/Stream.h" #include "ipc/mem/FlexibleArray.h" @@ -150,5 +150,5 @@ public: } // namespace Ipc -#endif /* SQUID_IPC_STORE_MAP_H */ +#endif /* SQUID_SRC_IPC_MEMMAP_H */ diff --git a/src/ipc/Messages.h b/src/ipc/Messages.h index 5516a4d983..e0bcbbb258 100644 --- a/src/ipc/Messages.h +++ b/src/ipc/Messages.h @@ -8,8 +8,8 @@ /* DEBUG: section 54 Interprocess Communication */ -#ifndef SQUID_IPC_MESSAGES_H -#define SQUID_IPC_MESSAGES_H +#ifndef SQUID_SRC_IPC_MESSAGES_H +#define SQUID_SRC_IPC_MESSAGES_H /** Declarations used by various IPC messages */ @@ -45,5 +45,5 @@ typedef enum { mtNone = 0, ///< unspecified or unknown message kind; unused on t } // namespace Ipc; -#endif /* SQUID_IPC_MESSAGES_H */ +#endif /* SQUID_SRC_IPC_MESSAGES_H */ diff --git a/src/ipc/Port.h b/src/ipc/Port.h index 833c7bcade..959d4277ec 100644 --- a/src/ipc/Port.h +++ b/src/ipc/Port.h @@ -8,8 +8,8 @@ /* DEBUG: section 54 Interprocess Communication */ -#ifndef SQUID_IPC_PORT_H -#define SQUID_IPC_PORT_H +#ifndef SQUID_SRC_IPC_PORT_H +#define SQUID_SRC_IPC_PORT_H #include "ipc/UdsOp.h" #include "SquidString.h" @@ -51,5 +51,5 @@ extern const char strandAddrLabel[]; ///< strand's listening address unique labe } // namespace Ipc -#endif /* SQUID_IPC_PORT_H */ +#endif /* SQUID_SRC_IPC_PORT_H */ diff --git a/src/ipc/Queue.h b/src/ipc/Queue.h index 51cd45ed6f..77db333aa0 100644 --- a/src/ipc/Queue.h +++ b/src/ipc/Queue.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_IPC_QUEUE_H -#define SQUID_IPC_QUEUE_H +#ifndef SQUID_SRC_IPC_QUEUE_H +#define SQUID_SRC_IPC_QUEUE_H #include "base/InstanceId.h" #include "debug/Stream.h" @@ -630,5 +630,5 @@ FewToFewBiQueue::findOldest(const int remoteProcessId, Value &value) const } // namespace Ipc -#endif // SQUID_IPC_QUEUE_H +#endif /* SQUID_SRC_IPC_QUEUE_H */ diff --git a/src/ipc/ReadWriteLock.h b/src/ipc/ReadWriteLock.h index 187d72163a..c660f16d18 100644 --- a/src/ipc/ReadWriteLock.h +++ b/src/ipc/ReadWriteLock.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_IPC_READ_WRITE_LOCK_H -#define SQUID_IPC_READ_WRITE_LOCK_H +#ifndef SQUID_SRC_IPC_READWRITELOCK_H +#define SQUID_SRC_IPC_READWRITELOCK_H #include #include @@ -90,5 +90,5 @@ void AssertFlagIsSet(std::atomic_flag &flag); } // namespace Ipc -#endif /* SQUID_IPC_READ_WRITE_LOCK_H */ +#endif /* SQUID_SRC_IPC_READWRITELOCK_H */ diff --git a/src/ipc/Request.h b/src/ipc/Request.h index 95d6dc2aa3..ced77c0b7b 100644 --- a/src/ipc/Request.h +++ b/src/ipc/Request.h @@ -8,8 +8,8 @@ /* DEBUG: section 54 Interprocess Communication */ -#ifndef SQUID_IPC_REQUEST_H -#define SQUID_IPC_REQUEST_H +#ifndef SQUID_SRC_IPC_REQUEST_H +#define SQUID_SRC_IPC_REQUEST_H #include "base/RefCount.h" #include "base/TypeTraits.h" @@ -51,5 +51,5 @@ protected: } // namespace Ipc -#endif /* SQUID_IPC_REQUEST_H */ +#endif /* SQUID_SRC_IPC_REQUEST_H */ diff --git a/src/ipc/RequestId.h b/src/ipc/RequestId.h index ddc1571f7b..df50053dbe 100644 --- a/src/ipc/RequestId.h +++ b/src/ipc/RequestId.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_IPC_REQUESTID_H -#define SQUID_IPC_REQUESTID_H +#ifndef SQUID_SRC_IPC_REQUESTID_H +#define SQUID_SRC_IPC_REQUESTID_H #include "ipc/forward.h" #include "ipc/QuestionerId.h" @@ -60,5 +60,5 @@ std::ostream &operator <<(std::ostream &, const RequestId &); } // namespace Ipc; -#endif /* SQUID_IPC_REQUESTID_H */ +#endif /* SQUID_SRC_IPC_REQUESTID_H */ diff --git a/src/ipc/Response.h b/src/ipc/Response.h index 51562d96c1..f41dc1fd61 100644 --- a/src/ipc/Response.h +++ b/src/ipc/Response.h @@ -8,8 +8,8 @@ /* DEBUG: section 54 Interprocess Communication */ -#ifndef SQUID_IPC_RESPONSE_H -#define SQUID_IPC_RESPONSE_H +#ifndef SQUID_SRC_IPC_RESPONSE_H +#define SQUID_SRC_IPC_RESPONSE_H #include "base/RefCount.h" #include "base/TypeTraits.h" @@ -45,5 +45,5 @@ protected: } // namespace Ipc -#endif /* SQUID_IPC_RESPONSE_H */ +#endif /* SQUID_SRC_IPC_RESPONSE_H */ diff --git a/src/ipc/SharedListen.h b/src/ipc/SharedListen.h index 3f1ac05449..cc9e279730 100644 --- a/src/ipc/SharedListen.h +++ b/src/ipc/SharedListen.h @@ -8,8 +8,8 @@ /* DEBUG: section 54 Interprocess Communication */ -#ifndef SQUID_IPC_SHARED_LISTEN_H -#define SQUID_IPC_SHARED_LISTEN_H +#ifndef SQUID_SRC_IPC_SHAREDLISTEN_H +#define SQUID_SRC_IPC_SHAREDLISTEN_H #include "base/AsyncCall.h" #include "base/Subscription.h" @@ -82,5 +82,5 @@ void SharedListenJoined(const SharedListenResponse &response); } // namespace Ipc; -#endif /* SQUID_IPC_SHARED_LISTEN_H */ +#endif /* SQUID_SRC_IPC_SHAREDLISTEN_H */ diff --git a/src/ipc/StartListening.h b/src/ipc/StartListening.h index e4d5df7edb..2a71cdbe3a 100644 --- a/src/ipc/StartListening.h +++ b/src/ipc/StartListening.h @@ -8,8 +8,8 @@ /* DEBUG: section 54 Interprocess Communication */ -#ifndef SQUID_IPC_START_LISTENING_H -#define SQUID_IPC_START_LISTENING_H +#ifndef SQUID_SRC_IPC_STARTLISTENING_H +#define SQUID_SRC_IPC_STARTLISTENING_H #include "base/AsyncCall.h" #include "base/forward.h" @@ -42,5 +42,5 @@ std::ostream &operator <<(std::ostream &, const StartListeningAnswer &); } // namespace Ipc; -#endif /* SQUID_IPC_START_LISTENING_H */ +#endif /* SQUID_SRC_IPC_STARTLISTENING_H */ diff --git a/src/ipc/StoreMap.h b/src/ipc/StoreMap.h index 255c713ec5..b3eb59b051 100644 --- a/src/ipc/StoreMap.h +++ b/src/ipc/StoreMap.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_IPC_STORE_MAP_H -#define SQUID_IPC_STORE_MAP_H +#ifndef SQUID_SRC_IPC_STOREMAP_H +#define SQUID_SRC_IPC_STOREMAP_H #include "ipc/mem/FlexibleArray.h" #include "ipc/mem/Pointer.h" @@ -408,5 +408,5 @@ public: // We do not reuse FileMap because we cannot control its size, // resulting in sfilenos that are pointing beyond the database. -#endif /* SQUID_IPC_STORE_MAP_H */ +#endif /* SQUID_SRC_IPC_STOREMAP_H */ diff --git a/src/ipc/Strand.h b/src/ipc/Strand.h index f2902a326a..ba50157e27 100644 --- a/src/ipc/Strand.h +++ b/src/ipc/Strand.h @@ -8,8 +8,8 @@ /* DEBUG: section 54 Interprocess Communication */ -#ifndef SQUID_IPC_STRAND_H -#define SQUID_IPC_STRAND_H +#ifndef SQUID_SRC_IPC_STRAND_H +#define SQUID_SRC_IPC_STRAND_H #include "ipc/forward.h" #include "ipc/Port.h" @@ -57,5 +57,5 @@ private: } -#endif /* SQUID_IPC_STRAND_H */ +#endif /* SQUID_SRC_IPC_STRAND_H */ diff --git a/src/ipc/StrandCoord.h b/src/ipc/StrandCoord.h index ff78d32ee3..a2d1f8bbb7 100644 --- a/src/ipc/StrandCoord.h +++ b/src/ipc/StrandCoord.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_IPC_STRAND_COORD_H -#define SQUID_IPC_STRAND_COORD_H +#ifndef SQUID_SRC_IPC_STRANDCOORD_H +#define SQUID_SRC_IPC_STRANDCOORD_H #include "ipc/forward.h" #include "ipc/Messages.h" @@ -58,5 +58,5 @@ public: } // namespace Ipc; -#endif /* SQUID_IPC_STRAND_COORD_H */ +#endif /* SQUID_SRC_IPC_STRANDCOORD_H */ diff --git a/src/ipc/StrandCoords.h b/src/ipc/StrandCoords.h index 1c84ba92b1..baad63e8c1 100644 --- a/src/ipc/StrandCoords.h +++ b/src/ipc/StrandCoords.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_IPC_STRAND_COORDS_H -#define SQUID_IPC_STRAND_COORDS_H +#ifndef SQUID_SRC_IPC_STRANDCOORDS_H +#define SQUID_SRC_IPC_STRANDCOORDS_H #include "ipc/StrandCoord.h" #include @@ -20,5 +20,5 @@ typedef std::vector StrandCoords; } // namespace Ipc -#endif /* SQUID_IPC_STRAND_COORDS_H */ +#endif /* SQUID_SRC_IPC_STRANDCOORDS_H */ diff --git a/src/ipc/StrandSearch.h b/src/ipc/StrandSearch.h index c6f989337d..8b96890208 100644 --- a/src/ipc/StrandSearch.h +++ b/src/ipc/StrandSearch.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_IPC_STRAND_SEARCH_H -#define SQUID_IPC_STRAND_SEARCH_H +#ifndef SQUID_SRC_IPC_STRANDSEARCH_H +#define SQUID_SRC_IPC_STRANDSEARCH_H #include "ipc/forward.h" #include "ipc/QuestionerId.h" @@ -33,5 +33,5 @@ public: } // namespace Ipc; -#endif /* SQUID_IPC_STRAND_SEARCH_H */ +#endif /* SQUID_SRC_IPC_STRANDSEARCH_H */ diff --git a/src/ipc/TypedMsgHdr.h b/src/ipc/TypedMsgHdr.h index 2c0b18305b..0941ef8fbf 100644 --- a/src/ipc/TypedMsgHdr.h +++ b/src/ipc/TypedMsgHdr.h @@ -8,8 +8,8 @@ /* DEBUG: section 54 Interprocess Communication */ -#ifndef SQUID_IPC_TYPED_MSG_HDR_H -#define SQUID_IPC_TYPED_MSG_HDR_H +#ifndef SQUID_SRC_IPC_TYPEDMSGHDR_H +#define SQUID_SRC_IPC_TYPEDMSGHDR_H #include "compat/cmsg.h" #include "ipc/Messages.h" @@ -129,5 +129,5 @@ Ipc::TypedMsgHdr::putPod(const Pod &pod) putFixed(&pod, sizeof(pod)); } -#endif /* SQUID_IPC_TYPED_MSG_HDR_H */ +#endif /* SQUID_SRC_IPC_TYPEDMSGHDR_H */ diff --git a/src/ipc/UdsOp.h b/src/ipc/UdsOp.h index 27a548017f..d3addca5d7 100644 --- a/src/ipc/UdsOp.h +++ b/src/ipc/UdsOp.h @@ -8,8 +8,8 @@ /* DEBUG: section 54 Interprocess Communication */ -#ifndef SQUID_IPC_ASYNCUDSOP_H -#define SQUID_IPC_ASYNCUDSOP_H +#ifndef SQUID_SRC_IPC_UDSOP_H +#define SQUID_SRC_IPC_UDSOP_H #include "base/AsyncJob.h" #include "base/forward.h" @@ -107,5 +107,5 @@ const Comm::ConnectionPointer & ImportFdIntoComm(const Comm::ConnectionPointer & } -#endif /* SQUID_IPC_ASYNCUDSOP_H */ +#endif /* SQUID_SRC_IPC_UDSOP_H */ diff --git a/src/ipc/forward.h b/src/ipc/forward.h index 40a77b9d20..6f87f8ff4f 100644 --- a/src/ipc/forward.h +++ b/src/ipc/forward.h @@ -8,8 +8,8 @@ /* DEBUG: section 54 Interprocess Communication */ -#ifndef SQUID_IPC_FORWARD_H -#define SQUID_IPC_FORWARD_H +#ifndef SQUID_SRC_IPC_FORWARD_H +#define SQUID_SRC_IPC_FORWARD_H namespace Ipc { @@ -26,5 +26,5 @@ class TypedMsgHdr; } // namespace Ipc -#endif /* SQUID_IPC_FORWARD_H */ +#endif /* SQUID_SRC_IPC_FORWARD_H */ diff --git a/src/ipc/mem/FlexibleArray.h b/src/ipc/mem/FlexibleArray.h index 53ecd39a74..678185375e 100644 --- a/src/ipc/mem/FlexibleArray.h +++ b/src/ipc/mem/FlexibleArray.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_IPC_MEM_FLEXIBLE_ARRAY_H -#define SQUID_IPC_MEM_FLEXIBLE_ARRAY_H +#ifndef SQUID_SRC_IPC_MEM_FLEXIBLEARRAY_H +#define SQUID_SRC_IPC_MEM_FLEXIBLEARRAY_H #include #include @@ -42,5 +42,5 @@ private: } // namespace Ipc -#endif /* SQUID_IPC_MEM_FLEXIBLE_ARRAY_H */ +#endif /* SQUID_SRC_IPC_MEM_FLEXIBLEARRAY_H */ diff --git a/src/ipc/mem/Page.h b/src/ipc/mem/Page.h index e4f3b2c28e..a220587f8c 100644 --- a/src/ipc/mem/Page.h +++ b/src/ipc/mem/Page.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_IPC_MEM_PAGE_H -#define SQUID_IPC_MEM_PAGE_H +#ifndef SQUID_SRC_IPC_MEM_PAGE_H +#define SQUID_SRC_IPC_MEM_PAGE_H #include "ipc/mem/forward.h" @@ -52,5 +52,5 @@ std::ostream &operator <<(std::ostream &os, const PageId &page); } // namespace Ipc -#endif // SQUID_IPC_MEM_PAGE_H +#endif /* SQUID_SRC_IPC_MEM_PAGE_H */ diff --git a/src/ipc/mem/PagePool.h b/src/ipc/mem/PagePool.h index 5b676727a2..cff92f483c 100644 --- a/src/ipc/mem/PagePool.h +++ b/src/ipc/mem/PagePool.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_IPC_MEM_PAGE_POOL_H -#define SQUID_IPC_MEM_PAGE_POOL_H +#ifndef SQUID_SRC_IPC_MEM_PAGEPOOL_H +#define SQUID_SRC_IPC_MEM_PAGEPOOL_H #include "ipc/mem/Page.h" #include "ipc/mem/PageStack.h" @@ -60,5 +60,5 @@ private: } // namespace Ipc -#endif // SQUID_IPC_MEM_PAGE_POOL_H +#endif /* SQUID_SRC_IPC_MEM_PAGEPOOL_H */ diff --git a/src/ipc/mem/PageStack.h b/src/ipc/mem/PageStack.h index 7bbcb043a3..ca04c31936 100644 --- a/src/ipc/mem/PageStack.h +++ b/src/ipc/mem/PageStack.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_IPC_MEM_PAGE_STACK_H -#define SQUID_IPC_MEM_PAGE_STACK_H +#ifndef SQUID_SRC_IPC_MEM_PAGESTACK_H +#define SQUID_SRC_IPC_MEM_PAGESTACK_H #include "ipc/mem/FlexibleArray.h" #include "ipc/mem/forward.h" @@ -183,5 +183,5 @@ private: } // namespace Ipc -#endif // SQUID_IPC_MEM_PAGE_STACK_H +#endif /* SQUID_SRC_IPC_MEM_PAGESTACK_H */ diff --git a/src/ipc/mem/Pages.h b/src/ipc/mem/Pages.h index df622e08f0..bee1caa281 100644 --- a/src/ipc/mem/Pages.h +++ b/src/ipc/mem/Pages.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_IPC_MEM_PAGES_H -#define SQUID_IPC_MEM_PAGES_H +#ifndef SQUID_SRC_IPC_MEM_PAGES_H +#define SQUID_SRC_IPC_MEM_PAGES_H #include "ipc/mem/Page.h" @@ -60,5 +60,5 @@ void NotePageNeed(const int purpose, const int count); } // namespace Ipc -#endif // SQUID_IPC_MEM_PAGES_H +#endif /* SQUID_SRC_IPC_MEM_PAGES_H */ diff --git a/src/ipc/mem/Pointer.h b/src/ipc/mem/Pointer.h index c9ed70679e..a199a9591e 100644 --- a/src/ipc/mem/Pointer.h +++ b/src/ipc/mem/Pointer.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_IPC_MEM_POINTER_H -#define SQUID_IPC_MEM_POINTER_H +#ifndef SQUID_SRC_IPC_MEM_POINTER_H +#define SQUID_SRC_IPC_MEM_POINTER_H #include "base/RefCount.h" #include "base/TextException.h" @@ -204,5 +204,5 @@ Object::Old(const char *const id) } // namespace Ipc -#endif /* SQUID_IPC_MEM_POINTER_H */ +#endif /* SQUID_SRC_IPC_MEM_POINTER_H */ diff --git a/src/ipc/mem/Segment.h b/src/ipc/mem/Segment.h index b8cb7a23b8..39edeb3a70 100644 --- a/src/ipc/mem/Segment.h +++ b/src/ipc/mem/Segment.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_IPC_MEM_SEGMENT_H -#define SQUID_IPC_MEM_SEGMENT_H +#ifndef SQUID_SRC_IPC_MEM_SEGMENT_H +#define SQUID_SRC_IPC_MEM_SEGMENT_H #include "base/RunnersRegistry.h" #include "sbuf/forward.h" @@ -99,5 +99,5 @@ protected: } // namespace Ipc -#endif /* SQUID_IPC_MEM_SEGMENT_H */ +#endif /* SQUID_SRC_IPC_MEM_SEGMENT_H */ diff --git a/src/ipc/mem/forward.h b/src/ipc/mem/forward.h index 36fba20cb2..77afdaf649 100644 --- a/src/ipc/mem/forward.h +++ b/src/ipc/mem/forward.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_IPC_MEM_FORWARD_H -#define SQUID_IPC_MEM_FORWARD_H +#ifndef SQUID_SRC_IPC_MEM_FORWARD_H +#define SQUID_SRC_IPC_MEM_FORWARD_H namespace Ipc { @@ -19,5 +19,5 @@ typedef uint32_t PoolId; } // namespace Ipc -#endif /* SQUID_IPC_MEM_FORWARD_H */ +#endif /* SQUID_SRC_IPC_MEM_FORWARD_H */ diff --git a/src/ipcache.h b/src/ipcache.h index b4eb20b394..4e5d969d29 100644 --- a/src/ipcache.h +++ b/src/ipcache.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_IPCACHE_H -#define _SQUID_IPCACHE_H +#ifndef SQUID_SRC_IPCACHE_H +#define SQUID_SRC_IPCACHE_H #include "base/CbcPointer.h" #include "dns/forward.h" @@ -251,5 +251,5 @@ Dns::CachedIps::goodAndBad() const return IpsSelector(*this); } -#endif /* _SQUID_IPCACHE_H */ +#endif /* SQUID_SRC_IPCACHE_H */ diff --git a/src/log/Config.h b/src/log/Config.h index 0e9c1238c5..06c6b8242a 100644 --- a/src/log/Config.h +++ b/src/log/Config.h @@ -63,5 +63,5 @@ extern LogConfig TheConfig; #define free_logformat(X) do{ delete (*X).logformats; (*X).logformats=NULL; }while(false) #define dump_logformat(E,N,D) (D).dumpFormats((E),(N)) -#endif +#endif /* SQUID_SRC_LOG_CONFIG_H */ diff --git a/src/log/CustomLog.h b/src/log/CustomLog.h index 3621e13f92..9bbe014226 100644 --- a/src/log/CustomLog.h +++ b/src/log/CustomLog.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_CUSTOMLOG_H_ -#define SQUID_CUSTOMLOG_H_ +#ifndef SQUID_SRC_LOG_CUSTOMLOG_H +#define SQUID_SRC_LOG_CUSTOMLOG_H #include "log/FormattedLog.h" @@ -21,5 +21,5 @@ public: CustomLog *next = nullptr; }; -#endif /* SQUID_CUSTOMLOG_H_ */ +#endif /* SQUID_SRC_LOG_CUSTOMLOG_H */ diff --git a/src/log/Formats.h b/src/log/Formats.h index 6128881a1e..186d33cff8 100644 --- a/src/log/Formats.h +++ b/src/log/Formats.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_LOG_FORMATS_H -#define _SQUID_LOG_FORMATS_H +#ifndef SQUID_SRC_LOG_FORMATS_H +#define SQUID_SRC_LOG_FORMATS_H #include "AccessLogEntry.h" #include "base/RefCount.h" @@ -61,5 +61,5 @@ void HttpdCombined(const AccessLogEntryPointer &al, Logfile * logfile); }; // namespace Format }; // namespace Log -#endif /* _SQUID_LOG_FORMATS_H */ +#endif /* SQUID_SRC_LOG_FORMATS_H */ diff --git a/src/log/FormattedLog.h b/src/log/FormattedLog.h index 1568c9d20b..01263a0304 100644 --- a/src/log/FormattedLog.h +++ b/src/log/FormattedLog.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_LOG_FORMATTEDLOG_H_ -#define SQUID_LOG_FORMATTEDLOG_H_ +#ifndef SQUID_SRC_LOG_FORMATTEDLOG_H +#define SQUID_SRC_LOG_FORMATTEDLOG_H #include "acl/forward.h" #include "log/Formats.h" @@ -76,5 +76,5 @@ public: bool fatal = true; }; -#endif /* SQUID_LOG_FORMATTEDLOG_H_ */ +#endif /* SQUID_SRC_LOG_FORMATTEDLOG_H */ diff --git a/src/log/ModDaemon.h b/src/log/ModDaemon.h index 17df1f12a5..03d40b8eab 100644 --- a/src/log/ModDaemon.h +++ b/src/log/ModDaemon.h @@ -8,12 +8,12 @@ /* DEBUG: section 50 Log file handling */ -#ifndef _SQUID_SRC_LOG_MODDAEMON_H -#define _SQUID_SRC_LOG_MODDAEMON_H +#ifndef SQUID_SRC_LOG_MODDAEMON_H +#define SQUID_SRC_LOG_MODDAEMON_H class Logfile; int logfile_mod_daemon_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag); -#endif /* _SQUID_SRC_LOG_MODDAEMON_H */ +#endif /* SQUID_SRC_LOG_MODDAEMON_H */ diff --git a/src/log/ModStdio.h b/src/log/ModStdio.h index 5f6a250763..d49fbb291c 100644 --- a/src/log/ModStdio.h +++ b/src/log/ModStdio.h @@ -8,12 +8,12 @@ /* DEBUG: section 50 Log file handling */ -#ifndef _SQUID_SRC_LOG_MODSTDIO_H -#define _SQUID_SRC_LOG_MODSTDIO_H +#ifndef SQUID_SRC_LOG_MODSTDIO_H +#define SQUID_SRC_LOG_MODSTDIO_H class Logfile; int logfile_mod_stdio_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag); -#endif /* _SQUID_SRC_LOG_MODSTDIO_H */ +#endif /* SQUID_SRC_LOG_MODSTDIO_H */ diff --git a/src/log/ModSyslog.h b/src/log/ModSyslog.h index 547982a9b3..6882f8b44b 100644 --- a/src/log/ModSyslog.h +++ b/src/log/ModSyslog.h @@ -8,12 +8,12 @@ /* DEBUG: section 50 Log file handling */ -#ifndef _SQUID_SRC_LOG_MODSYSLOG_H -#define _SQUID_SRC_LOG_MODSYSLOG_H +#ifndef SQUID_SRC_LOG_MODSYSLOG_H +#define SQUID_SRC_LOG_MODSYSLOG_H class Logfile; int logfile_mod_syslog_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag); -#endif /* _SQUID_SRC_LOG_MODSYSLOG_H */ +#endif /* SQUID_SRC_LOG_MODSYSLOG_H */ diff --git a/src/log/ModUdp.h b/src/log/ModUdp.h index b6b31e4db3..5e95f46a1f 100644 --- a/src/log/ModUdp.h +++ b/src/log/ModUdp.h @@ -8,12 +8,12 @@ /* DEBUG: section 50 Log file handling */ -#ifndef _SQUID_SRC_LOG_MODUDP_H -#define _SQUID_SRC_LOG_MODUDP_H +#ifndef SQUID_SRC_LOG_MODUDP_H +#define SQUID_SRC_LOG_MODUDP_H class Logfile; int logfile_mod_udp_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag); -#endif /* _SQUID_SRC_LOG_MODUDP_H */ +#endif /* SQUID_SRC_LOG_MODUDP_H */ diff --git a/src/log/TcpLogger.h b/src/log/TcpLogger.h index abd4a235e2..eadb6bdb70 100644 --- a/src/log/TcpLogger.h +++ b/src/log/TcpLogger.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_LOG_TCPLOGGER_H -#define _SQUID_SRC_LOG_TCPLOGGER_H +#ifndef SQUID_SRC_LOG_TCPLOGGER_H +#define SQUID_SRC_LOG_TCPLOGGER_H #include "base/AsyncJob.h" #include "base/JobWait.h" @@ -114,5 +114,5 @@ private: } // namespace Log -#endif /* _SQUID_SRC_LOG_TCPLOGGER_H */ +#endif /* SQUID_SRC_LOG_TCPLOGGER_H */ diff --git a/src/log/access_log.h b/src/log/access_log.h index b5648dcb0c..909dd3f11a 100644 --- a/src/log/access_log.h +++ b/src/log/access_log.h @@ -8,8 +8,8 @@ /* DEBUG: section 46 Access Log */ -#ifndef SQUID_LOG_ACCESS_LOG_H_ -#define SQUID_LOG_ACCESS_LOG_H_ +#ifndef SQUID_SRC_LOG_ACCESS_LOG_H +#define SQUID_SRC_LOG_ACCESS_LOG_H #include "LogTags.h" #include "sbuf/forward.h" @@ -25,5 +25,5 @@ class HttpRequestMethod; void headersLog(int cs, int pq, const HttpRequestMethod& m, void *data); #endif -#endif /* SQUID_LOG_ACCESS_LOG_H_ */ +#endif /* SQUID_SRC_LOG_ACCESS_LOG_H */ diff --git a/src/log/forward.h b/src/log/forward.h index e4f77ce56b..607df2db1a 100644 --- a/src/log/forward.h +++ b/src/log/forward.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_FORMAT_FORWARD_H -#define SQUID_FORMAT_FORWARD_H +#ifndef SQUID_SRC_LOG_FORWARD_H +#define SQUID_SRC_LOG_FORWARD_H #include "base/RefCount.h" @@ -18,5 +18,5 @@ class Logfile; class LogTags; class LogTagsErrors; -#endif /* SQUID_FORMAT_FORWARD_H */ +#endif /* SQUID_SRC_LOG_FORWARD_H */ diff --git a/src/lookup_t.h b/src/lookup_t.h index 4bbfd15bfa..c7f46c7d96 100644 --- a/src/lookup_t.h +++ b/src/lookup_t.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_LOOKUP_T_H -#define _SQUID_LOOKUP_T_H +#ifndef SQUID_SRC_LOOKUP_T_H +#define SQUID_SRC_LOOKUP_T_H typedef enum { LOOKUP_NONE, @@ -17,5 +17,5 @@ typedef enum { extern const char *lookup_t_str[]; -#endif /* _SQUID_LOOKUP_T_H */ +#endif /* SQUID_SRC_LOOKUP_T_H */ diff --git a/src/mem/AllocatorProxy.h b/src/mem/AllocatorProxy.h index 9c906ced30..578ee374ed 100644 --- a/src/mem/AllocatorProxy.h +++ b/src/mem/AllocatorProxy.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_MEM_ALLOCATORPROXY_H -#define _SQUID_SRC_MEM_ALLOCATORPROXY_H +#ifndef SQUID_SRC_MEM_ALLOCATORPROXY_H +#define SQUID_SRC_MEM_ALLOCATORPROXY_H // XXX: remove AllocatorProxy.h include from mem/forward.h namespace Mem { @@ -93,5 +93,5 @@ private: } // namespace Mem -#endif /* _SQUID_SRC_MEM_ALLOCATORPROXY_H */ +#endif /* SQUID_SRC_MEM_ALLOCATORPROXY_H */ diff --git a/src/mem/Pool.h b/src/mem/Pool.h index 970eb88ddb..6e119fa06f 100644 --- a/src/mem/Pool.h +++ b/src/mem/Pool.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _MEM_POOL_H_ -#define _MEM_POOL_H_ +#ifndef SQUID_SRC_MEM_POOL_H +#define SQUID_SRC_MEM_POOL_H /** \defgroup MemPoolsAPI Memory Management (Memory Pool Allocator) @@ -122,5 +122,5 @@ private: /// Creates a named MemPool of elements with the given size #define memPoolCreate MemPools::GetInstance().create -#endif /* _MEM_POOL_H_ */ +#endif /* SQUID_SRC_MEM_POOL_H */ diff --git a/src/mem/PoolChunked.h b/src/mem/PoolChunked.h index 71592806bc..61bba5ffa3 100644 --- a/src/mem/PoolChunked.h +++ b/src/mem/PoolChunked.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _MEM_POOL_CHUNKED_H_ -#define _MEM_POOL_CHUNKED_H_ +#ifndef SQUID_SRC_MEM_POOLCHUNKED_H +#define SQUID_SRC_MEM_POOLCHUNKED_H #include "mem/Allocator.h" #include "splay.h" @@ -65,5 +65,5 @@ public: MemPoolChunked *pool; }; -#endif /* _MEM_POOL_CHUNKED_H_ */ +#endif /* SQUID_SRC_MEM_POOLCHUNKED_H */ diff --git a/src/mem/PoolMalloc.h b/src/mem/PoolMalloc.h index 9a8d764c3b..a7c4a0ab68 100644 --- a/src/mem/PoolMalloc.h +++ b/src/mem/PoolMalloc.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _MEM_POOL_MALLOC_H_ -#define _MEM_POOL_MALLOC_H_ +#ifndef SQUID_SRC_MEM_POOLMALLOC_H +#define SQUID_SRC_MEM_POOLMALLOC_H /** \defgroup MemPoolsAPI Memory Management (Memory Pool Allocator) @@ -53,5 +53,5 @@ private: std::stack freelist; }; -#endif /* _MEM_POOL_MALLOC_H_ */ +#endif /* SQUID_SRC_MEM_POOLMALLOC_H */ diff --git a/src/mem/PoolingAllocator.h b/src/mem/PoolingAllocator.h index 59a76f886b..a713aadaa3 100644 --- a/src/mem/PoolingAllocator.h +++ b/src/mem/PoolingAllocator.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_MEM_POOLINGALLOCATOR_H -#define SQUID_MEM_POOLINGALLOCATOR_H +#ifndef SQUID_SRC_MEM_POOLINGALLOCATOR_H +#define SQUID_SRC_MEM_POOLINGALLOCATOR_H #include "mem/forward.h" @@ -46,5 +46,5 @@ operator !=(const PoolingAllocator &l, const PoolingAllocator &r) noexcept return !(l == r); } -#endif /* SQUID_MEM_POOLINGALLOCATOR_H */ +#endif /* SQUID_SRC_MEM_POOLINGALLOCATOR_H */ diff --git a/src/mem/Stats.h b/src/mem/Stats.h index 56fc29593c..a0af35e222 100644 --- a/src/mem/Stats.h +++ b/src/mem/Stats.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID__SRC_MEM_STATS_H -#define SQUID__SRC_MEM_STATS_H +#ifndef SQUID_SRC_MEM_STATS_H +#define SQUID_SRC_MEM_STATS_H #include "mem/forward.h" @@ -47,4 +47,4 @@ extern size_t GlobalStats(PoolStats &); } // namespace Mem -#endif /* SQUID__SRC_MEM_STATS_H */ +#endif /* SQUID_SRC_MEM_STATS_H */ diff --git a/src/mem/forward.h b/src/mem/forward.h index fb68173a9d..dc1c0eaff0 100644 --- a/src/mem/forward.h +++ b/src/mem/forward.h @@ -8,8 +8,8 @@ /* DEBUG: section 13 High Level Memory Pool Management */ -#ifndef _SQUID_SRC_MEM_FORWARD_H -#define _SQUID_SRC_MEM_FORWARD_H +#ifndef SQUID_SRC_MEM_FORWARD_H +#define SQUID_SRC_MEM_FORWARD_H #include "mem/AllocatorProxy.h" @@ -73,5 +73,5 @@ void memDataInit(mem_type, const char *, size_t, int, bool doZero = true); void memCheckInit(void); size_t memStringCount(); -#endif /* _SQUID_SRC_MEM_FORWARD_H */ +#endif /* SQUID_SRC_MEM_FORWARD_H */ diff --git a/src/mem_node.h b/src/mem_node.h index 439957531a..ef81b80762 100644 --- a/src/mem_node.h +++ b/src/mem_node.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_MEM_NODE_H -#define SQUID_MEM_NODE_H +#ifndef SQUID_SRC_MEM_NODE_H +#define SQUID_SRC_MEM_NODE_H #include "base/Range.h" #include "defines.h" @@ -47,5 +47,5 @@ operator << (std::ostream &os, mem_node &aNode) void memNodeWriteComplete(void *); -#endif /* SQUID_MEM_NODE_H */ +#endif /* SQUID_SRC_MEM_NODE_H */ diff --git a/src/mgr/Action.h b/src/mgr/Action.h index 811b9a7a5f..bf09b0e151 100644 --- a/src/mgr/Action.h +++ b/src/mgr/Action.h @@ -8,8 +8,8 @@ /* DEBUG: section 16 Cache Manager API */ -#ifndef SQUID_MGR_ACTION_H -#define SQUID_MGR_ACTION_H +#ifndef SQUID_SRC_MGR_ACTION_H +#define SQUID_SRC_MGR_ACTION_H #include "ipc/forward.h" #include "mgr/forward.h" @@ -92,5 +92,5 @@ private: } // namespace Mgr -#endif /* SQUID_MGR_ACTION_H */ +#endif /* SQUID_SRC_MGR_ACTION_H */ diff --git a/src/mgr/ActionCreator.h b/src/mgr/ActionCreator.h index 14e0b428ae..38b6ad97fe 100644 --- a/src/mgr/ActionCreator.h +++ b/src/mgr/ActionCreator.h @@ -8,8 +8,8 @@ /* DEBUG: section 16 Cache Manager API */ -#ifndef SQUID_MGR_ACTION_CREATOR_H -#define SQUID_MGR_ACTION_CREATOR_H +#ifndef SQUID_SRC_MGR_ACTIONCREATOR_H +#define SQUID_SRC_MGR_ACTIONCREATOR_H #include "mgr/forward.h" @@ -33,5 +33,5 @@ public: } // namespace Mgr -#endif /* SQUID_MGR_ACTION_CREATOR_H */ +#endif /* SQUID_SRC_MGR_ACTIONCREATOR_H */ diff --git a/src/mgr/ActionParams.h b/src/mgr/ActionParams.h index a7e8b70ead..12e209e6e9 100644 --- a/src/mgr/ActionParams.h +++ b/src/mgr/ActionParams.h @@ -8,8 +8,8 @@ /* DEBUG: section 16 Cache Manager API */ -#ifndef SQUID_MGR_ACTION_PARAMS_H -#define SQUID_MGR_ACTION_PARAMS_H +#ifndef SQUID_SRC_MGR_ACTIONPARAMS_H +#define SQUID_SRC_MGR_ACTIONPARAMS_H #include "http/RequestMethod.h" #include "ipc/forward.h" @@ -44,5 +44,5 @@ public: } // namespace Mgr -#endif /* SQUID_MGR_ACTION_PARAMS_H */ +#endif /* SQUID_SRC_MGR_ACTIONPARAMS_H */ diff --git a/src/mgr/ActionPasswordList.h b/src/mgr/ActionPasswordList.h index 54b6036b0d..77d730dd77 100644 --- a/src/mgr/ActionPasswordList.h +++ b/src/mgr/ActionPasswordList.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_MGR_CACHEMGRPASSWD_H_ -#define SQUID_MGR_CACHEMGRPASSWD_H_ +#ifndef SQUID_SRC_MGR_ACTIONPASSWORDLIST_H +#define SQUID_SRC_MGR_ACTIONPASSWORDLIST_H #include "sbuf/forward.h" @@ -27,5 +27,5 @@ public: } //namespace Mgr -#endif /* SQUID_MGR_CACHEMGRPASSWD_H_ */ +#endif /* SQUID_SRC_MGR_ACTIONPASSWORDLIST_H */ diff --git a/src/mgr/ActionProfile.h b/src/mgr/ActionProfile.h index 9819f10c07..349fba6e94 100644 --- a/src/mgr/ActionProfile.h +++ b/src/mgr/ActionProfile.h @@ -8,8 +8,8 @@ /* DEBUG: section 16 Cache Manager API */ -#ifndef SQUID_MGR_ACTION_PROFILE_H -#define SQUID_MGR_ACTION_PROFILE_H +#ifndef SQUID_SRC_MGR_ACTIONPROFILE_H +#define SQUID_SRC_MGR_ACTIONPROFILE_H #include "mgr/ActionCreator.h" #include "mgr/forward.h" @@ -46,5 +46,5 @@ operator <<(std::ostream &os, const ActionProfile &profile) } // namespace Mgr -#endif /* SQUID_MGR_ACTION_PROFILE_H */ +#endif /* SQUID_SRC_MGR_ACTIONPROFILE_H */ diff --git a/src/mgr/ActionWriter.h b/src/mgr/ActionWriter.h index aaff8a502f..f509931679 100644 --- a/src/mgr/ActionWriter.h +++ b/src/mgr/ActionWriter.h @@ -8,8 +8,8 @@ /* DEBUG: section 16 Cache Manager API */ -#ifndef SQUID_MGR_ACTION_WRITER_H -#define SQUID_MGR_ACTION_WRITER_H +#ifndef SQUID_SRC_MGR_ACTIONWRITER_H +#define SQUID_SRC_MGR_ACTIONWRITER_H #include "comm/forward.h" #include "mgr/StoreToCommWriter.h" @@ -36,5 +36,5 @@ private: } // namespace Mgr -#endif /* SQUID_MGR_ACTION_WRITER_H */ +#endif /* SQUID_SRC_MGR_ACTIONWRITER_H */ diff --git a/src/mgr/BasicActions.h b/src/mgr/BasicActions.h index c796ff1e14..08ba3ebb02 100644 --- a/src/mgr/BasicActions.h +++ b/src/mgr/BasicActions.h @@ -8,8 +8,8 @@ /* DEBUG: section 16 Cache Manager API */ -#ifndef SQUID_MGR_BASIC_ACTIONS_H -#define SQUID_MGR_BASIC_ACTIONS_H +#ifndef SQUID_SRC_MGR_BASICACTIONS_H +#define SQUID_SRC_MGR_BASICACTIONS_H #include "mgr/Action.h" @@ -98,5 +98,5 @@ void RegisterBasics(); } // namespace Mgr -#endif /* SQUID_MGR_BASIC_ACTIONS_H */ +#endif /* SQUID_SRC_MGR_BASICACTIONS_H */ diff --git a/src/mgr/Command.h b/src/mgr/Command.h index f5d7973d6f..44c67f0214 100644 --- a/src/mgr/Command.h +++ b/src/mgr/Command.h @@ -8,8 +8,8 @@ /* DEBUG: section 16 Cache Manager API */ -#ifndef SQUID_MGR_COMMAND_H -#define SQUID_MGR_COMMAND_H +#ifndef SQUID_SRC_MGR_COMMAND_H +#define SQUID_SRC_MGR_COMMAND_H #include "mgr/ActionParams.h" #include "mgr/forward.h" @@ -32,5 +32,5 @@ std::ostream &operator <<(std::ostream &, const Command &); } // namespace Mgr -#endif /* SQUID_MGR_COMMAND_H */ +#endif /* SQUID_SRC_MGR_COMMAND_H */ diff --git a/src/mgr/CountersAction.h b/src/mgr/CountersAction.h index 95da65d3e0..e3c5199d35 100644 --- a/src/mgr/CountersAction.h +++ b/src/mgr/CountersAction.h @@ -8,8 +8,8 @@ /* DEBUG: section 16 Cache Manager API */ -#ifndef SQUID_MGR_COUNTERS_ACTION_H -#define SQUID_MGR_COUNTERS_ACTION_H +#ifndef SQUID_SRC_MGR_COUNTERSACTION_H +#define SQUID_SRC_MGR_COUNTERSACTION_H #include "mgr/Action.h" @@ -111,5 +111,5 @@ private: } // namespace Mgr -#endif /* SQUID_MGR_COUNTERS_ACTION_H */ +#endif /* SQUID_SRC_MGR_COUNTERSACTION_H */ diff --git a/src/mgr/Filler.h b/src/mgr/Filler.h index 490d294c4f..c5df695fe5 100644 --- a/src/mgr/Filler.h +++ b/src/mgr/Filler.h @@ -8,8 +8,8 @@ /* DEBUG: section 16 Cache Manager API */ -#ifndef SQUID_MGR_FILLER_H -#define SQUID_MGR_FILLER_H +#ifndef SQUID_SRC_MGR_FILLER_H +#define SQUID_SRC_MGR_FILLER_H #include "comm/forward.h" #include "ipc/forward.h" @@ -39,5 +39,5 @@ private: } // namespace Mgr -#endif /* SQUID_MGR_FILLER_H */ +#endif /* SQUID_SRC_MGR_FILLER_H */ diff --git a/src/mgr/Forwarder.h b/src/mgr/Forwarder.h index cbe157abce..cbfc0ad7ee 100644 --- a/src/mgr/Forwarder.h +++ b/src/mgr/Forwarder.h @@ -8,8 +8,8 @@ /* DEBUG: section 16 Cache Manager API */ -#ifndef SQUID_MGR_FORWARDER_H -#define SQUID_MGR_FORWARDER_H +#ifndef SQUID_SRC_MGR_FORWARDER_H +#define SQUID_SRC_MGR_FORWARDER_H #include "comm/forward.h" #include "ipc/Forwarder.h" @@ -58,5 +58,5 @@ private: } // namespace Mgr -#endif /* SQUID_MGR_FORWARDER_H */ +#endif /* SQUID_SRC_MGR_FORWARDER_H */ diff --git a/src/mgr/FunAction.h b/src/mgr/FunAction.h index 2938d6b83e..1ea9aa7d9a 100644 --- a/src/mgr/FunAction.h +++ b/src/mgr/FunAction.h @@ -8,8 +8,8 @@ /* DEBUG: section 16 Cache Manager API */ -#ifndef SQUID_MGR_FUN_ACTION_H -#define SQUID_MGR_FUN_ACTION_H +#ifndef SQUID_SRC_MGR_FUNACTION_H +#define SQUID_SRC_MGR_FUNACTION_H #include "mgr/Action.h" #include "mgr/ActionCreator.h" @@ -57,5 +57,5 @@ private: } // namespace Mgr -#endif /* SQUID_MGR_FUN_ACTION_H */ +#endif /* SQUID_SRC_MGR_FUNACTION_H */ diff --git a/src/mgr/InfoAction.h b/src/mgr/InfoAction.h index ffbc27f66e..b96171e8e0 100644 --- a/src/mgr/InfoAction.h +++ b/src/mgr/InfoAction.h @@ -8,8 +8,8 @@ /* DEBUG: section 16 Cache Manager API */ -#ifndef SQUID_MGR_INFO_ACTION_H -#define SQUID_MGR_INFO_ACTION_H +#ifndef SQUID_SRC_MGR_INFOACTION_H +#define SQUID_SRC_MGR_INFOACTION_H #include "mgr/Action.h" #include "StoreStats.h" @@ -115,5 +115,5 @@ private: } // namespace Mgr -#endif /* SQUID_MGR_INFO_ACTION_H */ +#endif /* SQUID_SRC_MGR_INFOACTION_H */ diff --git a/src/mgr/Inquirer.h b/src/mgr/Inquirer.h index 88c08df0a8..e8dccba540 100644 --- a/src/mgr/Inquirer.h +++ b/src/mgr/Inquirer.h @@ -8,8 +8,8 @@ /* DEBUG: section 16 Cache Manager API */ -#ifndef SQUID_MGR_INQUIRER_H -#define SQUID_MGR_INQUIRER_H +#ifndef SQUID_SRC_MGR_INQUIRER_H +#define SQUID_SRC_MGR_INQUIRER_H #include "comm/forward.h" #include "ipc/Inquirer.h" @@ -58,5 +58,5 @@ private: } // namespace Mgr -#endif /* SQUID_MGR_INQUIRER_H */ +#endif /* SQUID_SRC_MGR_INQUIRER_H */ diff --git a/src/mgr/IntParam.h b/src/mgr/IntParam.h index 83255eaa53..78bf33eb1e 100644 --- a/src/mgr/IntParam.h +++ b/src/mgr/IntParam.h @@ -8,8 +8,8 @@ /* DEBUG: section 16 Cache Manager API */ -#ifndef SQUID_MGR_INT_PARAM_H -#define SQUID_MGR_INT_PARAM_H +#ifndef SQUID_SRC_MGR_INTPARAM_H +#define SQUID_SRC_MGR_INTPARAM_H #include "ipc/forward.h" #include "mgr/forward.h" @@ -34,5 +34,5 @@ private: } // namespace Mgr -#endif /* SQUID_MGR_INT_PARAM_H */ +#endif /* SQUID_SRC_MGR_INTPARAM_H */ diff --git a/src/mgr/IntervalAction.h b/src/mgr/IntervalAction.h index 641ab52db5..a99f73b3d6 100644 --- a/src/mgr/IntervalAction.h +++ b/src/mgr/IntervalAction.h @@ -8,8 +8,8 @@ /* DEBUG: section 16 Cache Manager API */ -#ifndef SQUID_MGR_INTERVAL_ACTION_H -#define SQUID_MGR_INTERVAL_ACTION_H +#ifndef SQUID_SRC_MGR_INTERVALACTION_H +#define SQUID_SRC_MGR_INTERVALACTION_H #include "mgr/Action.h" @@ -133,5 +133,5 @@ private: } // namespace Mgr -#endif /* SQUID_MGR_INTERVAL_ACTION_H */ +#endif /* SQUID_SRC_MGR_INTERVALACTION_H */ diff --git a/src/mgr/IoAction.h b/src/mgr/IoAction.h index e88ef80347..387a190cce 100644 --- a/src/mgr/IoAction.h +++ b/src/mgr/IoAction.h @@ -8,8 +8,8 @@ /* DEBUG: section 16 Cache Manager API */ -#ifndef SQUID_MGR_IO_ACTION_H -#define SQUID_MGR_IO_ACTION_H +#ifndef SQUID_SRC_MGR_IOACTION_H +#define SQUID_SRC_MGR_IOACTION_H #include "IoStats.h" #include "mgr/Action.h" @@ -55,5 +55,5 @@ private: } // namespace Mgr -#endif /* SQUID_MGR_IO_ACTION_H */ +#endif /* SQUID_SRC_MGR_IOACTION_H */ diff --git a/src/mgr/QueryParam.h b/src/mgr/QueryParam.h index 9e2491cb53..743339a991 100644 --- a/src/mgr/QueryParam.h +++ b/src/mgr/QueryParam.h @@ -8,8 +8,8 @@ /* DEBUG: section 16 Cache Manager API */ -#ifndef SQUID_MGR_QUERY_PARAM_H -#define SQUID_MGR_QUERY_PARAM_H +#ifndef SQUID_SRC_MGR_QUERYPARAM_H +#define SQUID_SRC_MGR_QUERYPARAM_H #include "base/RefCount.h" #include "ipc/forward.h" @@ -39,5 +39,5 @@ public: } // namespace Mgr -#endif /* SQUID_MGR_QUERY_PARAM_H */ +#endif /* SQUID_SRC_MGR_QUERYPARAM_H */ diff --git a/src/mgr/QueryParams.h b/src/mgr/QueryParams.h index 5834648ee6..5e10277672 100644 --- a/src/mgr/QueryParams.h +++ b/src/mgr/QueryParams.h @@ -8,8 +8,8 @@ /* DEBUG: section 16 Cache Manager API */ -#ifndef SQUID_MGR_QUERY_PARAMS_H -#define SQUID_MGR_QUERY_PARAMS_H +#ifndef SQUID_SRC_MGR_QUERYPARAMS_H +#define SQUID_SRC_MGR_QUERYPARAMS_H #include "ipc/forward.h" #include "mgr/QueryParam.h" @@ -48,5 +48,5 @@ private: } // namespace Mgr -#endif /* SQUID_MGR_QUERY_PARAMS_H */ +#endif /* SQUID_SRC_MGR_QUERYPARAMS_H */ diff --git a/src/mgr/Registration.h b/src/mgr/Registration.h index ae7bacb5e1..027c21d309 100644 --- a/src/mgr/Registration.h +++ b/src/mgr/Registration.h @@ -8,8 +8,8 @@ /* DEBUG: section 16 Cache Manager API */ -#ifndef SQUID_MGR_REGISTRATION_H -#define SQUID_MGR_REGISTRATION_H +#ifndef SQUID_SRC_MGR_REGISTRATION_H +#define SQUID_SRC_MGR_REGISTRATION_H #include "mgr/forward.h" @@ -26,5 +26,5 @@ void RegisterAction(char const * action, char const * desc, } // namespace Mgr -#endif /* SQUID_MGR_REGISTRATION_H */ +#endif /* SQUID_SRC_MGR_REGISTRATION_H */ diff --git a/src/mgr/Request.h b/src/mgr/Request.h index 21a89fce7b..2313301c69 100644 --- a/src/mgr/Request.h +++ b/src/mgr/Request.h @@ -8,8 +8,8 @@ /* DEBUG: section 16 Cache Manager API */ -#ifndef SQUID_MGR_REQUEST_H -#define SQUID_MGR_REQUEST_H +#ifndef SQUID_SRC_MGR_REQUEST_H +#define SQUID_SRC_MGR_REQUEST_H #include "ipc/forward.h" #include "ipc/Request.h" @@ -38,5 +38,5 @@ public: } // namespace Mgr -#endif /* SQUID_MGR_REQUEST_H */ +#endif /* SQUID_SRC_MGR_REQUEST_H */ diff --git a/src/mgr/Response.h b/src/mgr/Response.h index 26438c3ede..cb9d292e3f 100644 --- a/src/mgr/Response.h +++ b/src/mgr/Response.h @@ -8,8 +8,8 @@ /* DEBUG: section 16 Cache Manager API */ -#ifndef SQUID_MGR_RESPONSE_H -#define SQUID_MGR_RESPONSE_H +#ifndef SQUID_SRC_MGR_RESPONSE_H +#define SQUID_SRC_MGR_RESPONSE_H #include "ipc/forward.h" #include "ipc/Response.h" @@ -41,5 +41,5 @@ public: } // namespace Mgr -#endif /* SQUID_MGR_RESPONSE_H */ +#endif /* SQUID_SRC_MGR_RESPONSE_H */ diff --git a/src/mgr/ServiceTimesAction.h b/src/mgr/ServiceTimesAction.h index 1742844868..03ec5c2c18 100644 --- a/src/mgr/ServiceTimesAction.h +++ b/src/mgr/ServiceTimesAction.h @@ -8,8 +8,8 @@ /* DEBUG: section 16 Cache Manager API */ -#ifndef SQUID_MGR_SERVICE_TIMES_ACTION_H -#define SQUID_MGR_SERVICE_TIMES_ACTION_H +#ifndef SQUID_SRC_MGR_SERVICETIMESACTION_H +#define SQUID_SRC_MGR_SERVICETIMESACTION_H #include "mgr/Action.h" @@ -68,5 +68,5 @@ private: } // namespace Mgr -#endif /* SQUID_MGR_SERVICE_TIMES_ACTION_H */ +#endif /* SQUID_SRC_MGR_SERVICETIMESACTION_H */ diff --git a/src/mgr/StoreIoAction.h b/src/mgr/StoreIoAction.h index b803ea48c8..5282e1ad7d 100644 --- a/src/mgr/StoreIoAction.h +++ b/src/mgr/StoreIoAction.h @@ -8,8 +8,8 @@ /* DEBUG: section 16 Cache Manager API */ -#ifndef SQUID_MGR_STORE_IO_ACTION_H -#define SQUID_MGR_STORE_IO_ACTION_H +#ifndef SQUID_SRC_MGR_STOREIOACTION_H +#define SQUID_SRC_MGR_STOREIOACTION_H #include "mgr/Action.h" @@ -54,5 +54,5 @@ private: } // namespace Mgr -#endif /* SQUID_MGR_STORE_IO_ACTION_H */ +#endif /* SQUID_SRC_MGR_STOREIOACTION_H */ diff --git a/src/mgr/StoreToCommWriter.h b/src/mgr/StoreToCommWriter.h index d3d584d217..b6ee3a6c84 100644 --- a/src/mgr/StoreToCommWriter.h +++ b/src/mgr/StoreToCommWriter.h @@ -8,8 +8,8 @@ /* DEBUG: section 16 Cache Manager API */ -#ifndef SQUID_MGR_STORE_TO_COMM_WRITER_H -#define SQUID_MGR_STORE_TO_COMM_WRITER_H +#ifndef SQUID_SRC_MGR_STORETOCOMMWRITER_H +#define SQUID_SRC_MGR_STORETOCOMMWRITER_H #include "base/AsyncJob.h" #include "comm/forward.h" @@ -71,5 +71,5 @@ protected: } // namespace Mgr -#endif /* SQUID_MGR_STORE_TO_COMM_WRITER_H */ +#endif /* SQUID_SRC_MGR_STORETOCOMMWRITER_H */ diff --git a/src/mgr/StringParam.h b/src/mgr/StringParam.h index 1a07ee9b21..8b07f26183 100644 --- a/src/mgr/StringParam.h +++ b/src/mgr/StringParam.h @@ -8,8 +8,8 @@ /* DEBUG: section 16 Cache Manager API */ -#ifndef SQUID_MGR_STRING_PARAM_H -#define SQUID_MGR_STRING_PARAM_H +#ifndef SQUID_SRC_MGR_STRINGPARAM_H +#define SQUID_SRC_MGR_STRINGPARAM_H #include "ipc/forward.h" #include "mgr/forward.h" @@ -34,5 +34,5 @@ private: } // namespace Mgr -#endif /* SQUID_MGR_STRING_PARAM_H */ +#endif /* SQUID_SRC_MGR_STRINGPARAM_H */ diff --git a/src/mgr/forward.h b/src/mgr/forward.h index 96f4615c0c..5e1f5b9bdd 100644 --- a/src/mgr/forward.h +++ b/src/mgr/forward.h @@ -8,8 +8,8 @@ /* DEBUG: section 16 Cache Manager API */ -#ifndef SQUID_MGR_FORWARD_H -#define SQUID_MGR_FORWARD_H +#ifndef SQUID_SRC_MGR_FORWARD_H +#define SQUID_SRC_MGR_FORWARD_H #include "base/RefCount.h" @@ -43,5 +43,5 @@ class StoreEntry; */ typedef void OBJH(StoreEntry *); -#endif /* SQUID_MGR_FORWARD_H */ +#endif /* SQUID_SRC_MGR_FORWARD_H */ diff --git a/src/mime.h b/src/mime.h index 2c9af7180a..d7ba479725 100644 --- a/src/mime.h +++ b/src/mime.h @@ -8,8 +8,8 @@ /* DEBUG: section 25 MIME Parsing and Internal Icons */ -#ifndef SQUID_MIME_H_ -#define SQUID_MIME_H_ +#ifndef SQUID_SRC_MIME_H +#define SQUID_SRC_MIME_H void mimeInit(char *filename); const char *mimeGetContentEncoding(const char *fn); @@ -19,5 +19,5 @@ char mimeGetTransferMode(const char *fn); bool mimeGetDownloadOption(const char *fn); bool mimeGetViewOption(const char *fn); -#endif /* SQUID_MIME_H_ */ +#endif /* SQUID_SRC_MIME_H */ diff --git a/src/mime_header.h b/src/mime_header.h index fc67de3458..f013b1c674 100644 --- a/src/mime_header.h +++ b/src/mime_header.h @@ -8,8 +8,8 @@ /* DEBUG: section 25 MiME Header Parsing */ -#ifndef SQUID_MIME_HEADER_H_ -#define SQUID_MIME_HEADER_H_ +#ifndef SQUID_SRC_MIME_HEADER_H +#define SQUID_SRC_MIME_HEADER_H #include "sbuf/forward.h" @@ -44,5 +44,5 @@ headersEnd(const char *buf, size_t sz) return headersEnd(buf, sz, ignored); } -#endif /* SQUID_MIME_HEADER_H_ */ +#endif /* SQUID_SRC_MIME_HEADER_H */ diff --git a/src/multicast.h b/src/multicast.h index b52650f559..a5f1e7d28a 100644 --- a/src/multicast.h +++ b/src/multicast.h @@ -8,13 +8,13 @@ /* DEBUG: section 07 Multicast */ -#ifndef SQUID_MULTICAST_H_ -#define SQUID_MULTICAST_H_ +#ifndef SQUID_SRC_MULTICAST_H +#define SQUID_SRC_MULTICAST_H #include "ipcache.h" int mcastSetTtl(int, int); extern IPH mcastJoinGroups; -#endif /* SQUID_MULTICAST_H_ */ +#endif /* SQUID_SRC_MULTICAST_H */ diff --git a/src/neighbors.h b/src/neighbors.h index 9bff223529..d5d224c19b 100644 --- a/src/neighbors.h +++ b/src/neighbors.h @@ -8,8 +8,8 @@ /* DEBUG: section 15 Neighbor Routines */ -#ifndef SQUID_NEIGHBORS_H_ -#define SQUID_NEIGHBORS_H_ +#ifndef SQUID_SRC_NEIGHBORS_H +#define SQUID_SRC_NEIGHBORS_H #include "anyp/forward.h" #include "enums.h" @@ -79,5 +79,5 @@ void peerConnClosed(CachePeer *p); CachePeer *whichPeer(const Ip::Address &from); -#endif /* SQUID_NEIGHBORS_H_ */ +#endif /* SQUID_SRC_NEIGHBORS_H */ diff --git a/src/parser/BinaryTokenizer.h b/src/parser/BinaryTokenizer.h index a5faa44e24..a67a01b2e7 100644 --- a/src/parser/BinaryTokenizer.h +++ b/src/parser/BinaryTokenizer.h @@ -157,5 +157,5 @@ BinaryTokenizerContext::success() { } /* namespace Parser */ -#endif // SQUID_SRC_PARSER_BINARYTOKENIZER_H +#endif /* SQUID_SRC_PARSER_BINARYTOKENIZER_H */ diff --git a/src/parser/Tokenizer.h b/src/parser/Tokenizer.h index 3cfa7dd6c0..ffa3076a51 100644 --- a/src/parser/Tokenizer.h +++ b/src/parser/Tokenizer.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_PARSER_TOKENIZER_H_ -#define SQUID_PARSER_TOKENIZER_H_ +#ifndef SQUID_SRC_PARSER_TOKENIZER_H +#define SQUID_SRC_PARSER_TOKENIZER_H #include "base/CharacterSet.h" #include "sbuf/SBuf.h" @@ -179,5 +179,5 @@ private: } /* namespace Parser */ -#endif /* SQUID_PARSER_TOKENIZER_H_ */ +#endif /* SQUID_SRC_PARSER_TOKENIZER_H */ diff --git a/src/parser/forward.h b/src/parser/forward.h index 091212ae87..1aed43923b 100644 --- a/src/parser/forward.h +++ b/src/parser/forward.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_PARSER_FORWARD_H -#define SQUID_PARSER_FORWARD_H +#ifndef SQUID_SRC_PARSER_FORWARD_H +#define SQUID_SRC_PARSER_FORWARD_H namespace Parser { class Tokenizer; @@ -18,5 +18,5 @@ class BinaryTokenizer; class InsufficientInput {}; } // namespace Parser -#endif /* SQUID_PARSER_FORWARD_H */ +#endif /* SQUID_SRC_PARSER_FORWARD_H */ diff --git a/src/pconn.h b/src/pconn.h index d0851e3da0..7cd052b9c9 100644 --- a/src/pconn.h +++ b/src/pconn.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_PCONN_H -#define SQUID_PCONN_H +#ifndef SQUID_SRC_PCONN_H +#define SQUID_SRC_PCONN_H #include "base/CbcPointer.h" #include "base/RunnersRegistry.h" @@ -191,5 +191,5 @@ private: static PconnModule * instance; }; -#endif /* SQUID_PCONN_H */ +#endif /* SQUID_SRC_PCONN_H */ diff --git a/src/peer_proxy_negotiate_auth.h b/src/peer_proxy_negotiate_auth.h index 0fec7b466b..a7a4b78c5f 100644 --- a/src/peer_proxy_negotiate_auth.h +++ b/src/peer_proxy_negotiate_auth.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_PEER_PROXY_NEGOTIATE_AUTH_H_ -#define SQUID_PEER_PROXY_NEGOTIATE_AUTH_H_ +#ifndef SQUID_SRC_PEER_PROXY_NEGOTIATE_AUTH_H +#define SQUID_SRC_PEER_PROXY_NEGOTIATE_AUTH_H #define PEER_PROXY_NEGOTIATE_NOKEYTAB 1 @@ -17,5 +17,5 @@ SQUIDCEXTERN char *peer_proxy_negotiate_auth(char *principal_name, char *proxy, int flags); #endif -#endif /* SQUID_PEER_PROXY_NEGOTIATE_AUTH_H_ */ +#endif /* SQUID_SRC_PEER_PROXY_NEGOTIATE_AUTH_H */ diff --git a/src/peer_sourcehash.h b/src/peer_sourcehash.h index cfbe2ec204..dbffd28a4d 100644 --- a/src/peer_sourcehash.h +++ b/src/peer_sourcehash.h @@ -8,8 +8,8 @@ /* DEBUG: section 39 Peer source hash based selection */ -#ifndef SQUID_PEER_SOURCEHASH_H_ -#define SQUID_PEER_SOURCEHASH_H_ +#ifndef SQUID_SRC_PEER_SOURCEHASH_H +#define SQUID_SRC_PEER_SOURCEHASH_H class CachePeer; class PeerSelector; @@ -17,5 +17,5 @@ class PeerSelector; void peerSourceHashInit(void); CachePeer * peerSourceHashSelectParent(PeerSelector*); -#endif /* SQUID_PEER_SOURCEHASH_H_ */ +#endif /* SQUID_SRC_PEER_SOURCEHASH_H */ diff --git a/src/peer_userhash.h b/src/peer_userhash.h index c2f167cff2..82908b8378 100644 --- a/src/peer_userhash.h +++ b/src/peer_userhash.h @@ -8,8 +8,8 @@ /* DEBUG: section 39 Peer user hash based selection */ -#ifndef SQUID_PEER_USERHASH_H_ -#define SQUID_PEER_USERHASH_H_ +#ifndef SQUID_SRC_PEER_USERHASH_H +#define SQUID_SRC_PEER_USERHASH_H class CachePeer; class HttpRequest; @@ -18,5 +18,5 @@ class PeerSelector; void peerUserHashInit(void); CachePeer * peerUserHashSelectParent(PeerSelector *); -#endif /* SQUID_PEER_USERHASH_H_ */ +#endif /* SQUID_SRC_PEER_USERHASH_H */ diff --git a/src/protos.h b/src/protos.h index 8ad2a0b568..441e40c608 100644 --- a/src/protos.h +++ b/src/protos.h @@ -6,12 +6,12 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_PROTOS_H -#define SQUID_PROTOS_H +#ifndef SQUID_SRC_PROTOS_H +#define SQUID_SRC_PROTOS_H void shut_down(int); void rotate_logs(int); void reconfigure(int); -#endif /* SQUID_PROTOS_H */ +#endif /* SQUID_SRC_PROTOS_H */ diff --git a/src/proxyp/Elements.h b/src/proxyp/Elements.h index d0748b90ae..6fe246d161 100644 --- a/src/proxyp/Elements.h +++ b/src/proxyp/Elements.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_PROXYP_ELEMENTS_H -#define SQUID_PROXYP_ELEMENTS_H +#ifndef SQUID_SRC_PROXYP_ELEMENTS_H +#define SQUID_SRC_PROXYP_ELEMENTS_H #include "sbuf/SBuf.h" @@ -88,5 +88,5 @@ Two::FieldType FieldNameToFieldType(const SBuf &nameOrId); } // namespace ProxyProtocol -#endif +#endif /* SQUID_SRC_PROXYP_ELEMENTS_H */ diff --git a/src/proxyp/Header.h b/src/proxyp/Header.h index bb7ed77ff6..bcdf7fc083 100644 --- a/src/proxyp/Header.h +++ b/src/proxyp/Header.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_PROXYP_HEADER_H -#define SQUID_PROXYP_HEADER_H +#ifndef SQUID_SRC_PROXYP_HEADER_H +#define SQUID_SRC_PROXYP_HEADER_H #include "base/RefCount.h" #include "ip/Address.h" @@ -83,5 +83,5 @@ private: } // namespace ProxyProtocol -#endif +#endif /* SQUID_SRC_PROXYP_HEADER_H */ diff --git a/src/proxyp/Parser.h b/src/proxyp/Parser.h index 28650c091a..4940917310 100644 --- a/src/proxyp/Parser.h +++ b/src/proxyp/Parser.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_PROXYP_PARSER_H -#define SQUID_PROXYP_PARSER_H +#ifndef SQUID_SRC_PROXYP_PARSER_H +#define SQUID_SRC_PROXYP_PARSER_H #include "proxyp/forward.h" #include "sbuf/forward.h" @@ -32,5 +32,5 @@ Parsed Parse(const SBuf &); } // namespace ProxyProtocol -#endif +#endif /* SQUID_SRC_PROXYP_PARSER_H */ diff --git a/src/proxyp/forward.h b/src/proxyp/forward.h index 7628a8e92b..20e2290b56 100644 --- a/src/proxyp/forward.h +++ b/src/proxyp/forward.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SRC_PROXYP_FORWARD_H -#define _SQUID_SRC_PROXYP_FORWARD_H +#ifndef SQUID_SRC_PROXYP_FORWARD_H +#define SQUID_SRC_PROXYP_FORWARD_H #include "base/RefCount.h" @@ -20,5 +20,5 @@ typedef RefCount
HeaderPointer; } -#endif /* _SQUID_SRC_PROXYP_FORWARD_H */ +#endif /* SQUID_SRC_PROXYP_FORWARD_H */ diff --git a/src/redirect.h b/src/redirect.h index 440384381e..d7f5ae921f 100644 --- a/src/redirect.h +++ b/src/redirect.h @@ -8,8 +8,8 @@ /* DEBUG: section 61 Redirector */ -#ifndef SQUID_REDIRECT_H_ -#define SQUID_REDIRECT_H_ +#ifndef SQUID_SRC_REDIRECT_H +#define SQUID_SRC_REDIRECT_H #include "helper.h" @@ -23,5 +23,5 @@ void redirectReconfigure(); void redirectStart(ClientHttpRequest *, HLPCB *, void *); void storeIdStart(ClientHttpRequest *, HLPCB *, void *); -#endif /* SQUID_REDIRECT_H_ */ +#endif /* SQUID_SRC_REDIRECT_H */ diff --git a/src/refresh.h b/src/refresh.h index 46832a1bd2..1adb70e0e5 100644 --- a/src/refresh.h +++ b/src/refresh.h @@ -8,8 +8,8 @@ /* DEBUG: section 22 Refresh Calculation */ -#ifndef SQUID_REFRESH_H_ -#define SQUID_REFRESH_H_ +#ifndef SQUID_SRC_REFRESH_H +#define SQUID_SRC_REFRESH_H class RefreshPattern; @@ -23,5 +23,5 @@ time_t getMaxAge(const char *url); void refreshInit(void); const RefreshPattern *refreshLimits(const char *url); -#endif /* SQUID_REFRESH_H_ */ +#endif /* SQUID_SRC_REFRESH_H */ diff --git a/src/repl/heap/store_heap_replacement.h b/src/repl/heap/store_heap_replacement.h index a52f7b6f7e..447b03819e 100644 --- a/src/repl/heap/store_heap_replacement.h +++ b/src/repl/heap/store_heap_replacement.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUIDINC_STORE_HEAP_REPLACEMENT_H -#define _SQUIDINC_STORE_HEAP_REPLACEMENT_H +#ifndef SQUID_SRC_REPL_HEAP_STORE_HEAP_REPLACEMENT_H +#define SQUID_SRC_REPL_HEAP_STORE_HEAP_REPLACEMENT_H #include "heap.h" @@ -15,5 +15,5 @@ heap_key HeapKeyGen_StoreEntry_LFUDA(void *entry, double age); heap_key HeapKeyGen_StoreEntry_GDSF(void *entry, double age); heap_key HeapKeyGen_StoreEntry_LRU(void *entry, double age); -#endif /* _SQUIDINC_STORE_HEAP_REPLACEMENT_H */ +#endif /* SQUID_SRC_REPL_HEAP_STORE_HEAP_REPLACEMENT_H */ diff --git a/src/repl_modules.h b/src/repl_modules.h index d4880776e8..4125f6ca19 100644 --- a/src/repl_modules.h +++ b/src/repl_modules.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_REPL_MODULES_H_ -#define SQUID_REPL_MODULES_H_ +#ifndef SQUID_SRC_REPL_MODULES_H +#define SQUID_SRC_REPL_MODULES_H /* * Note: repl_modules.cc will be autogenerated. @@ -15,5 +15,5 @@ void storeReplSetup(void); -#endif /* SQUID_REPL_MODULES_H_ */ +#endif /* SQUID_SRC_REPL_MODULES_H */ diff --git a/src/sbuf/Algorithms.h b/src/sbuf/Algorithms.h index 866c522994..fb1e38669f 100644 --- a/src/sbuf/Algorithms.h +++ b/src/sbuf/Algorithms.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SBUFALGOS_H_ -#define SQUID_SBUFALGOS_H_ +#ifndef SQUID_SRC_SBUF_ALGORITHMS_H +#define SQUID_SRC_SBUF_ALGORITHMS_H #include "sbuf/SBuf.h" @@ -132,5 +132,5 @@ public: } }; -#endif /* SQUID_SBUFALGOS_H_ */ +#endif /* SQUID_SRC_SBUF_ALGORITHMS_H */ diff --git a/src/sbuf/List.h b/src/sbuf/List.h index adf5093628..eee588b248 100644 --- a/src/sbuf/List.h +++ b/src/sbuf/List.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SBUFLIST_H -#define SQUID_SBUFLIST_H +#ifndef SQUID_SRC_SBUF_LIST_H +#define SQUID_SRC_SBUF_LIST_H #include "sbuf/SBuf.h" @@ -22,5 +22,5 @@ typedef std::list SBufList; */ bool IsMember(const SBufList &, const SBuf &, const SBufCaseSensitive isCaseSensitive = caseSensitive); -#endif /* SQUID_SBUFLIST_H */ +#endif /* SQUID_SRC_SBUF_LIST_H */ diff --git a/src/sbuf/MemBlob.h b/src/sbuf/MemBlob.h index 7cdae1b50e..1932118f15 100644 --- a/src/sbuf/MemBlob.h +++ b/src/sbuf/MemBlob.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_MEMBLOB_H_ -#define SQUID_MEMBLOB_H_ +#ifndef SQUID_SRC_SBUF_MEMBLOB_H +#define SQUID_SRC_SBUF_MEMBLOB_H #define MEMBLOB_DEBUGSECTION 24 @@ -130,5 +130,5 @@ private: MemBlob& operator =(const MemBlob &); }; -#endif /* SQUID_MEMBLOB_H_ */ +#endif /* SQUID_SRC_SBUF_MEMBLOB_H */ diff --git a/src/sbuf/SBuf.h b/src/sbuf/SBuf.h index 2844c37011..c6e90a1e9c 100644 --- a/src/sbuf/SBuf.h +++ b/src/sbuf/SBuf.h @@ -8,8 +8,8 @@ /* DEBUG: section 24 SBuf */ -#ifndef SQUID_SBUF_H -#define SQUID_SBUF_H +#ifndef SQUID_SRC_SBUF_SBUF_H +#define SQUID_SRC_SBUF_SBUF_H #include "base/InstanceId.h" #include "base/TextException.h" @@ -791,5 +791,5 @@ SBufIterator::operator!=(const SBufIterator &s) const return iter != s.iter; } -#endif /* SQUID_SBUF_H */ +#endif /* SQUID_SRC_SBUF_SBUF_H */ diff --git a/src/sbuf/Stats.h b/src/sbuf/Stats.h index 0b0a81089d..e016971403 100644 --- a/src/sbuf/Stats.h +++ b/src/sbuf/Stats.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SBUF_STATS_H -#define SQUID_SBUF_STATS_H +#ifndef SQUID_SRC_SBUF_STATS_H +#define SQUID_SRC_SBUF_STATS_H #include @@ -66,5 +66,5 @@ public: static SizeRecorder MemBlobSizeAtDestructRecorder; }; -#endif /* SQUID_SBUF_STATS_H */ +#endif /* SQUID_SRC_SBUF_STATS_H */ diff --git a/src/sbuf/Stream.h b/src/sbuf/Stream.h index 244ae3a92b..40075a7163 100644 --- a/src/sbuf/Stream.h +++ b/src/sbuf/Stream.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SBUFSTREAM_H -#define SQUID_SBUFSTREAM_H +#ifndef SQUID_SRC_SBUF_STREAM_H +#define SQUID_SRC_SBUF_STREAM_H #include "base/PackableStream.h" #include "sbuf/SBuf.h" @@ -67,5 +67,5 @@ SBuf ToSBuf(Args&&... args) return out.buf(); } -#endif /* SQUID_SBUFSTREAM_H */ +#endif /* SQUID_SRC_SBUF_STREAM_H */ diff --git a/src/sbuf/StringConvert.h b/src/sbuf/StringConvert.h index 41e81bebf9..a7ead8ab05 100644 --- a/src/sbuf/StringConvert.h +++ b/src/sbuf/StringConvert.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_SBUF_SBUFSTRING_H_ -#define SQUID_SRC_SBUF_SBUFSTRING_H_ +#ifndef SQUID_SRC_SBUF_STRINGCONVERT_H +#define SQUID_SRC_SBUF_STRINGCONVERT_H #include "sbuf/SBuf.h" #include "SquidString.h" @@ -30,5 +30,5 @@ SBufToString(const SBuf &s) return rv; } -#endif /* SQUID_SRC_SBUF_SBUFSTRING_H_ */ +#endif /* SQUID_SRC_SBUF_STRINGCONVERT_H */ diff --git a/src/security/CommunicationSecrets.h b/src/security/CommunicationSecrets.h index e802c81ada..5a2a8bf9ea 100644 --- a/src/security/CommunicationSecrets.h +++ b/src/security/CommunicationSecrets.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_SECURITY_COMMUNICATION_SECRETS_H -#define SQUID_SRC_SECURITY_COMMUNICATION_SECRETS_H +#ifndef SQUID_SRC_SECURITY_COMMUNICATIONSECRETS_H +#define SQUID_SRC_SECURITY_COMMUNICATIONSECRETS_H #include "sbuf/SBuf.h" #include "security/forward.h" @@ -52,5 +52,5 @@ private: } // namespace Security -#endif /* SQUID_SRC_SECURITY_COMMUNICATION_SECRETS_H */ +#endif /* SQUID_SRC_SECURITY_COMMUNICATIONSECRETS_H */ diff --git a/src/security/EncryptorAnswer.h b/src/security/EncryptorAnswer.h index 3ba646dc6f..6580d73081 100644 --- a/src/security/EncryptorAnswer.h +++ b/src/security/EncryptorAnswer.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SECURITY_ENCRYPTORANSWER_H -#define SQUID_SECURITY_ENCRYPTORANSWER_H +#ifndef SQUID_SRC_SECURITY_ENCRYPTORANSWER_H +#define SQUID_SRC_SECURITY_ENCRYPTORANSWER_H #include "base/CbcPointer.h" #include "comm/forward.h" @@ -37,5 +37,5 @@ std::ostream &operator <<(std::ostream &, const EncryptorAnswer &); } // namespace Security -#endif /* SQUID_SECURITY_ENCRYPTORANSWER_H */ +#endif /* SQUID_SRC_SECURITY_ENCRYPTORANSWER_H */ diff --git a/src/security/ErrorDetail.h b/src/security/ErrorDetail.h index a400be4bd9..c428c0d8dd 100644 --- a/src/security/ErrorDetail.h +++ b/src/security/ErrorDetail.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_SECURITY_DETAIL_H -#define SQUID_SRC_SECURITY_DETAIL_H +#ifndef SQUID_SRC_SECURITY_ERRORDETAIL_H +#define SQUID_SRC_SECURITY_ERRORDETAIL_H #include "base/RefCount.h" #include "error/Detail.h" @@ -138,5 +138,5 @@ operator <<(std::ostream &os, const ErrorDetail::Pointer &p) } // namespace Security -#endif +#endif /* SQUID_SRC_SECURITY_ERRORDETAIL_H */ diff --git a/src/security/Handshake.h b/src/security/Handshake.h index fe21ccda08..260ca36df1 100644 --- a/src/security/Handshake.h +++ b/src/security/Handshake.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SECURITY_HANDSHAKE_H -#define SQUID_SECURITY_HANDSHAKE_H +#ifndef SQUID_SRC_SECURITY_HANDSHAKE_H +#define SQUID_SRC_SECURITY_HANDSHAKE_H #include "anyp/ProtocolVersion.h" #include "base/YesNoNone.h" @@ -164,5 +164,5 @@ Tls1p3orLater(const AnyP::ProtocolVersion &p) } -#endif // SQUID_SECURITY_HANDSHAKE_H +#endif /* SQUID_SRC_SECURITY_HANDSHAKE_H */ diff --git a/src/security/KeyLogger.h b/src/security/KeyLogger.h index 732dae7490..97255b2fde 100644 --- a/src/security/KeyLogger.h +++ b/src/security/KeyLogger.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_SECURITY_KEY_LOGGER_H -#define SQUID_SRC_SECURITY_KEY_LOGGER_H +#ifndef SQUID_SRC_SECURITY_KEYLOGGER_H +#define SQUID_SRC_SECURITY_KEYLOGGER_H #include "acl/forward.h" #include "security/CommunicationSecrets.h" @@ -53,5 +53,5 @@ Security::KeyLogger::checkpoint(const Connection &sconn, const Acl::ChecklistFil maybeLog(sconn, caller); } -#endif /* SQUID_SRC_SECURITY_KEY_LOGGER_H */ +#endif /* SQUID_SRC_SECURITY_KEYLOGGER_H */ diff --git a/src/security/cert_generators/file/certificate_db.h b/src/security/cert_generators/file/certificate_db.h index 743a76a97c..aa6061b2f2 100644 --- a/src/security/cert_generators/file/certificate_db.h +++ b/src/security/cert_generators/file/certificate_db.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SSL_CERTIFICATE_DB_H -#define SQUID_SSL_CERTIFICATE_DB_H +#ifndef SQUID_SRC_SECURITY_CERT_GENERATORS_FILE_CERTIFICATE_DB_H +#define SQUID_SRC_SECURITY_CERT_GENERATORS_FILE_CERTIFICATE_DB_H #include "base/Here.h" #include "ssl/gadgets.h" @@ -184,5 +184,5 @@ private: }; } // namespace Ssl -#endif // SQUID_SSL_CERTIFICATE_DB_H +#endif /* SQUID_SRC_SECURITY_CERT_GENERATORS_FILE_CERTIFICATE_DB_H */ diff --git a/src/servers/FtpServer.h b/src/servers/FtpServer.h index 084d0d4323..bbabe65ed8 100644 --- a/src/servers/FtpServer.h +++ b/src/servers/FtpServer.h @@ -8,8 +8,8 @@ /* DEBUG: section 33 Client-side Routines */ -#ifndef SQUID_SERVERS_FTP_SERVER_H -#define SQUID_SERVERS_FTP_SERVER_H +#ifndef SQUID_SRC_SERVERS_FTPSERVER_H +#define SQUID_SRC_SERVERS_FTPSERVER_H #include "base/JobWait.h" #include "base/Lock.h" @@ -208,5 +208,5 @@ private: } // namespace Ftp -#endif /* SQUID_SERVERS_FTP_SERVER_H */ +#endif /* SQUID_SRC_SERVERS_FTPSERVER_H */ diff --git a/src/servers/Server.h b/src/servers/Server.h index f890584477..13bd67e1c5 100644 --- a/src/servers/Server.h +++ b/src/servers/Server.h @@ -8,8 +8,8 @@ /* DEBUG: section 33 Client-side Routines */ -#ifndef SQUID_SERVERS_SERVER_H -#define SQUID_SERVERS_SERVER_H +#ifndef SQUID_SRC_SERVERS_SERVER_H +#define SQUID_SRC_SERVERS_SERVER_H #include "anyp/forward.h" #include "anyp/ProtocolVersion.h" @@ -126,5 +126,5 @@ protected: AsyncCall::Pointer writer; ///< set when we are writing }; -#endif /* SQUID_SERVERS_SERVER_H */ +#endif /* SQUID_SRC_SERVERS_SERVER_H */ diff --git a/src/servers/forward.h b/src/servers/forward.h index 3961b89f3c..8bce9e1caf 100644 --- a/src/servers/forward.h +++ b/src/servers/forward.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SERVERS_FORWARD_H -#define SQUID_SERVERS_FORWARD_H +#ifndef SQUID_SRC_SERVERS_FORWARD_H +#define SQUID_SRC_SERVERS_FORWARD_H class MasterXaction; template class RefCount; @@ -46,5 +46,5 @@ void StopListening(); } // namespace Ftp -#endif /* SQUID_SERVERS_FORWARD_H */ +#endif /* SQUID_SRC_SERVERS_FORWARD_H */ diff --git a/src/snmp/Forwarder.h b/src/snmp/Forwarder.h index 2932c44971..96f3d708dc 100644 --- a/src/snmp/Forwarder.h +++ b/src/snmp/Forwarder.h @@ -8,8 +8,8 @@ /* DEBUG: section 49 SNMP Interface */ -#ifndef SQUID_SNMPX_FORWARDER_H -#define SQUID_SNMPX_FORWARDER_H +#ifndef SQUID_SRC_SNMP_FORWARDER_H +#define SQUID_SRC_SNMP_FORWARDER_H #include "ipc/Forwarder.h" #include "snmp/Pdu.h" @@ -51,5 +51,5 @@ void SendResponse(Ipc::RequestId, const Pdu &); } // namespace Snmp -#endif /* SQUID_SNMPX_FORWARDER_H */ +#endif /* SQUID_SRC_SNMP_FORWARDER_H */ diff --git a/src/snmp/Inquirer.h b/src/snmp/Inquirer.h index 0f08a02c96..2a1f770c9d 100644 --- a/src/snmp/Inquirer.h +++ b/src/snmp/Inquirer.h @@ -8,8 +8,8 @@ /* DEBUG: section 49 SNMP Interface */ -#ifndef SQUID_SNMPX_INQUIRER_H -#define SQUID_SNMPX_INQUIRER_H +#ifndef SQUID_SRC_SNMP_INQUIRER_H +#define SQUID_SRC_SNMP_INQUIRER_H #include "comm/forward.h" #include "ipc/Inquirer.h" @@ -54,5 +54,5 @@ private: } // namespace Snmp -#endif /* SQUID_SNMPX_INQUIRER_H */ +#endif /* SQUID_SRC_SNMP_INQUIRER_H */ diff --git a/src/snmp/Pdu.h b/src/snmp/Pdu.h index 3ffc98cb0b..23640afd5c 100644 --- a/src/snmp/Pdu.h +++ b/src/snmp/Pdu.h @@ -8,8 +8,8 @@ /* DEBUG: section 49 SNMP Interface */ -#ifndef SQUID_SNMPX_PDU_H -#define SQUID_SNMPX_PDU_H +#ifndef SQUID_SRC_SNMP_PDU_H +#define SQUID_SRC_SNMP_PDU_H #include "base/Range.h" #include "ipc/forward.h" @@ -48,5 +48,5 @@ private: } // namespace Snmp -#endif /* SQUID_SNMPX_PDU_H */ +#endif /* SQUID_SRC_SNMP_PDU_H */ diff --git a/src/snmp/Request.h b/src/snmp/Request.h index 4c21d773d1..c2e8b38cc0 100644 --- a/src/snmp/Request.h +++ b/src/snmp/Request.h @@ -8,8 +8,8 @@ /* DEBUG: section 49 SNMP Interface */ -#ifndef SQUID_SNMPX_REQUEST_H -#define SQUID_SNMPX_REQUEST_H +#ifndef SQUID_SRC_SNMP_REQUEST_H +#define SQUID_SRC_SNMP_REQUEST_H #include "ip/Address.h" #include "ipc/forward.h" @@ -41,5 +41,5 @@ public: } // namespace Snmp -#endif /* SQUID_SNMPX_REQUEST_H */ +#endif /* SQUID_SRC_SNMP_REQUEST_H */ diff --git a/src/snmp/Response.h b/src/snmp/Response.h index 3af95f0334..0847e98f49 100644 --- a/src/snmp/Response.h +++ b/src/snmp/Response.h @@ -8,8 +8,8 @@ /* DEBUG: section 49 SNMP Interface */ -#ifndef SQUID_SNMPX_RESPONSE_H -#define SQUID_SNMPX_RESPONSE_H +#ifndef SQUID_SRC_SNMP_RESPONSE_H +#define SQUID_SRC_SNMP_RESPONSE_H #include "ipc/forward.h" #include "ipc/Response.h" @@ -35,5 +35,5 @@ public: } // namespace Snmp -#endif /* SQUID_SNMPX_RESPONSE_H */ +#endif /* SQUID_SRC_SNMP_RESPONSE_H */ diff --git a/src/snmp/Session.h b/src/snmp/Session.h index 4bcfad55aa..deb33b7cb0 100644 --- a/src/snmp/Session.h +++ b/src/snmp/Session.h @@ -8,8 +8,8 @@ /* DEBUG: section 49 SNMP Interface */ -#ifndef SQUID_SNMPX_SESSION_H -#define SQUID_SNMPX_SESSION_H +#ifndef SQUID_SRC_SNMP_SESSION_H +#define SQUID_SRC_SNMP_SESSION_H #include "ipc/forward.h" #include "snmp.h" @@ -36,5 +36,5 @@ private: } // namespace Snmp -#endif /* SQUID_SNMPX_SESSION_H */ +#endif /* SQUID_SRC_SNMP_SESSION_H */ diff --git a/src/snmp/Var.h b/src/snmp/Var.h index c845a0a92d..5d19cc5929 100644 --- a/src/snmp/Var.h +++ b/src/snmp/Var.h @@ -8,8 +8,8 @@ /* DEBUG: section 49 SNMP Interface */ -#ifndef SQUID_SNMPX_VAR_H -#define SQUID_SNMPX_VAR_H +#ifndef SQUID_SRC_SNMP_VAR_H +#define SQUID_SRC_SNMP_VAR_H #include "base/Range.h" #include "ipc/forward.h" @@ -70,5 +70,5 @@ private: } // namespace Snmp -#endif /* SQUID_SNMPX_VAR_H */ +#endif /* SQUID_SRC_SNMP_VAR_H */ diff --git a/src/snmp/forward.h b/src/snmp/forward.h index 502eef9e34..7d69085fc0 100644 --- a/src/snmp/forward.h +++ b/src/snmp/forward.h @@ -8,8 +8,8 @@ /* DEBUG: section 49 SNMP Interface */ -#ifndef SQUID_SNMPX_FORWARD_H -#define SQUID_SNMPX_FORWARD_H +#ifndef SQUID_SRC_SNMP_FORWARD_H +#define SQUID_SRC_SNMP_FORWARD_H namespace Snmp { @@ -22,5 +22,5 @@ class Var; } // namespace Snmp -#endif /* SQUID_SNMPX_FORWARD_H */ +#endif /* SQUID_SRC_SNMP_FORWARD_H */ diff --git a/src/snmp_agent.h b/src/snmp_agent.h index 069a0271a1..bbaeaece23 100644 --- a/src/snmp_agent.h +++ b/src/snmp_agent.h @@ -8,8 +8,8 @@ /* DEBUG: section 49 SNMP Interface */ -#ifndef SQUID_SNMP_AGENT_H_ -#define SQUID_SNMP_AGENT_H_ +#ifndef SQUID_SRC_SNMP_AGENT_H +#define SQUID_SRC_SNMP_AGENT_H #if SQUID_SNMP @@ -26,5 +26,5 @@ variable_list *snmp_netDnsFn(variable_list *, snint *); variable_list *snmp_meshPtblFn(variable_list *, snint *); #endif /* SQUID_SNMP */ -#endif /* SQUID_SNMP_AGENT_H_ */ +#endif /* SQUID_SRC_SNMP_AGENT_H */ diff --git a/src/snmp_core.h b/src/snmp_core.h index dfc715db87..1951903869 100644 --- a/src/snmp_core.h +++ b/src/snmp_core.h @@ -8,8 +8,8 @@ /* DEBUG: section 49 SNMP Interface */ -#ifndef SQUID_SNMP_CORE_H -#define SQUID_SNMP_CORE_H +#ifndef SQUID_SRC_SNMP_CORE_H +#define SQUID_SRC_SNMP_CORE_H #include "acl/Strategy.h" #include "cache_snmp.h" @@ -58,5 +58,5 @@ public: int match (ACLData *&data, ACLFilledChecklist *checklist) override; }; -#endif /* SQUID_SNMP_CORE_H */ +#endif /* SQUID_SRC_SNMP_CORE_H */ diff --git a/src/ssl/Config.h b/src/ssl/Config.h index 8e861fc4d6..80909ca078 100644 --- a/src/ssl/Config.h +++ b/src/ssl/Config.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SSL_CONFIG_H -#define SQUID_SSL_CONFIG_H +#ifndef SQUID_SRC_SSL_CONFIG_H +#define SQUID_SRC_SSL_CONFIG_H #include "helper/ChildConfig.h" @@ -34,5 +34,5 @@ private: extern Config TheConfig; } // namespace Ssl -#endif +#endif /* SQUID_SRC_SSL_CONFIG_H */ diff --git a/src/ssl/ErrorDetail.h b/src/ssl/ErrorDetail.h index 994846ad2b..6232f8cc13 100644 --- a/src/ssl/ErrorDetail.h +++ b/src/ssl/ErrorDetail.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SSL_ERROR_DETAIL_H -#define _SQUID_SSL_ERROR_DETAIL_H +#ifndef SQUID_SRC_SSL_ERRORDETAIL_H +#define SQUID_SRC_SSL_ERRORDETAIL_H #include "security/ErrorDetail.h" @@ -45,5 +45,5 @@ const char *GetErrorDescr(Security::ErrorCode value); bool ErrorIsOptional(const char *name); }//namespace Ssl -#endif +#endif /* SQUID_SRC_SSL_ERRORDETAIL_H */ diff --git a/src/ssl/ErrorDetailManager.h b/src/ssl/ErrorDetailManager.h index a712858728..aa68b865e8 100644 --- a/src/ssl/ErrorDetailManager.h +++ b/src/ssl/ErrorDetailManager.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SSL_ERRORDETAILMANAGER_H -#define _SQUID_SSL_ERRORDETAILMANAGER_H +#ifndef SQUID_SRC_SSL_ERRORDETAILMANAGER_H +#define SQUID_SRC_SSL_ERRORDETAILMANAGER_H #include "base/RefCount.h" #include "HttpRequest.h" @@ -94,5 +94,5 @@ private: void errorDetailInitialize(); void errorDetailClean(); } //namespace Ssl -#endif +#endif /* SQUID_SRC_SSL_ERRORDETAILMANAGER_H */ diff --git a/src/ssl/ProxyCerts.h b/src/ssl/ProxyCerts.h index 8bbf049420..4b8a2574d1 100644 --- a/src/ssl/ProxyCerts.h +++ b/src/ssl/ProxyCerts.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SSLPROXYCERTS_H_ -#define SQUID_SSLPROXYCERTS_H_ +#ifndef SQUID_SRC_SSL_PROXYCERTS_H +#define SQUID_SRC_SSL_PROXYCERTS_H #if USE_OPENSSL #include "acl/forward.h" @@ -59,5 +59,5 @@ public: }; #endif -#endif /* SQUID_SSLPROXYCERTS_H_ */ +#endif /* SQUID_SRC_SSL_PROXYCERTS_H */ diff --git a/src/ssl/ServerBump.h b/src/ssl/ServerBump.h index c8af4d0208..7cf858d88e 100644 --- a/src/ssl/ServerBump.h +++ b/src/ssl/ServerBump.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SSL_PEEKER_H -#define _SQUID_SSL_PEEKER_H +#ifndef SQUID_SRC_SSL_SERVERBUMP_H +#define SQUID_SRC_SSL_SERVERBUMP_H #include "base/AsyncJob.h" #include "base/CbcPointer.h" @@ -69,5 +69,5 @@ private: } // namespace Ssl -#endif +#endif /* SQUID_SRC_SSL_SERVERBUMP_H */ diff --git a/src/ssl/bio.h b/src/ssl/bio.h index 47f4a1e43f..951293caba 100644 --- a/src/ssl/bio.h +++ b/src/ssl/bio.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SSL_BIO_H -#define SQUID_SSL_BIO_H +#ifndef SQUID_SRC_SSL_BIO_H +#define SQUID_SRC_SSL_BIO_H #if USE_OPENSSL @@ -201,5 +201,5 @@ void applyTlsDetailsToSSL(SSL *ssl, Security::TlsDetails::Pointer const &details, Ssl::BumpMode bumpMode); #endif /* USE_OPENSSL */ -#endif /* SQUID_SSL_BIO_H */ +#endif /* SQUID_SRC_SSL_BIO_H */ diff --git a/src/ssl/cert_validate_message.h b/src/ssl/cert_validate_message.h index 4e2b7dfda3..ee14c58fc7 100644 --- a/src/ssl/cert_validate_message.h +++ b/src/ssl/cert_validate_message.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SSL_CERT_VALIDATE_MESSAGE_H -#define SQUID_SSL_CERT_VALIDATE_MESSAGE_H +#ifndef SQUID_SRC_SSL_CERT_VALIDATE_MESSAGE_H +#define SQUID_SRC_SSL_CERT_VALIDATE_MESSAGE_H #include "base/RefCount.h" #include "helper/ResultCode.h" @@ -130,5 +130,5 @@ private: }//namespace Ssl -#endif // SQUID_SSL_CERT_VALIDATE_MESSAGE_H +#endif /* SQUID_SRC_SSL_CERT_VALIDATE_MESSAGE_H */ diff --git a/src/ssl/context_storage.h b/src/ssl/context_storage.h index bfc5ce408b..594591ed8f 100644 --- a/src/ssl/context_storage.h +++ b/src/ssl/context_storage.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SSL_CONTEXT_STORAGE_H -#define SQUID_SSL_CONTEXT_STORAGE_H +#ifndef SQUID_SRC_SSL_CONTEXT_STORAGE_H +#define SQUID_SRC_SSL_CONTEXT_STORAGE_H #if USE_OPENSSL @@ -78,5 +78,5 @@ extern GlobalContextStorage TheGlobalContextStorage; } //namespace Ssl #endif // USE_OPENSSL -#endif // SQUID_SSL_CONTEXT_STORAGE_H +#endif /* SQUID_SRC_SSL_CONTEXT_STORAGE_H */ diff --git a/src/ssl/crtd_message.h b/src/ssl/crtd_message.h index bd0da57a82..228e96aff6 100644 --- a/src/ssl/crtd_message.h +++ b/src/ssl/crtd_message.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SSL_CRTD_MESSAGE_H -#define SQUID_SSL_CRTD_MESSAGE_H +#ifndef SQUID_SRC_SSL_CRTD_MESSAGE_H +#define SQUID_SRC_SSL_CRTD_MESSAGE_H #include #include @@ -105,5 +105,5 @@ protected: } //namespace Ssl -#endif // SQUID_SSL_CRTD_MESSAGE_H +#endif /* SQUID_SRC_SSL_CRTD_MESSAGE_H */ diff --git a/src/ssl/gadgets.h b/src/ssl/gadgets.h index be1e6c6320..c8d245c5e5 100644 --- a/src/ssl/gadgets.h +++ b/src/ssl/gadgets.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SSL_GADGETS_H -#define SQUID_SSL_GADGETS_H +#ifndef SQUID_SRC_SSL_GADGETS_H +#define SQUID_SRC_SSL_GADGETS_H #if USE_OPENSSL @@ -293,5 +293,5 @@ const ASN1_BIT_STRING *X509_get_signature(const Security::CertPointer &); } // namespace Ssl #endif // USE_OPENSSL -#endif // SQUID_SSL_GADGETS_H +#endif /* SQUID_SRC_SSL_GADGETS_H */ diff --git a/src/ssl/helper.h b/src/ssl/helper.h index 220088258b..4f1323fdc2 100644 --- a/src/ssl/helper.h +++ b/src/ssl/helper.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SSL_HELPER_H -#define SQUID_SSL_HELPER_H +#ifndef SQUID_SRC_SSL_HELPER_H +#define SQUID_SRC_SSL_HELPER_H #if USE_OPENSSL @@ -62,5 +62,5 @@ public: } //namespace Ssl #endif /* USE_OPENSSL */ -#endif // SQUID_SSL_HELPER_H +#endif /* SQUID_SRC_SSL_HELPER_H */ diff --git a/src/ssl/support.h b/src/ssl/support.h index 3e134510c9..1c3ec7b132 100644 --- a/src/ssl/support.h +++ b/src/ssl/support.h @@ -8,8 +8,8 @@ /* DEBUG: section 83 SSL accelerator support */ -#ifndef SQUID_SSL_SUPPORT_H -#define SQUID_SSL_SUPPORT_H +#ifndef SQUID_SRC_SSL_SUPPORT_H +#define SQUID_SRC_SSL_SUPPORT_H #if USE_OPENSSL @@ -397,5 +397,5 @@ int SSL_set_fd(SSL *ssl, int fd) #endif /* _SQUID_WINDOWS_ */ #endif /* USE_OPENSSL */ -#endif /* SQUID_SSL_SUPPORT_H */ +#endif /* SQUID_SRC_SSL_SUPPORT_H */ diff --git a/src/stat.h b/src/stat.h index d57ba6a62c..b8008cf64a 100644 --- a/src/stat.h +++ b/src/stat.h @@ -8,8 +8,8 @@ /* DEBUG: section 18 Cache Manager Statistics */ -#ifndef SQUID_STAT_H_ -#define SQUID_STAT_H_ +#ifndef SQUID_SRC_STAT_H +#define SQUID_SRC_STAT_H void statInit(void); double median_svc_get(int, int); @@ -24,5 +24,5 @@ double statByteHitRatio(int minutes); class StatCounters; StatCounters *snmpStatGet(int); -#endif /* SQUID_STAT_H_ */ +#endif /* SQUID_SRC_STAT_H */ diff --git a/src/stmem.h b/src/stmem.h index d5e82d18df..fd6c4b6020 100644 --- a/src/stmem.h +++ b/src/stmem.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_STMEM_H -#define SQUID_STMEM_H +#ifndef SQUID_SRC_STMEM_H +#define SQUID_SRC_STMEM_H #include "base/Range.h" #include "splay.h" @@ -60,5 +60,5 @@ private: Splay nodes; }; -#endif /* SQUID_STMEM_H */ +#endif /* SQUID_SRC_STMEM_H */ diff --git a/src/store/Controlled.h b/src/store/Controlled.h index 6202b00a6c..0018375bac 100644 --- a/src/store/Controlled.h +++ b/src/store/Controlled.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_STORE_CONTROLLED_H -#define SQUID_STORE_CONTROLLED_H +#ifndef SQUID_SRC_STORE_CONTROLLED_H +#define SQUID_SRC_STORE_CONTROLLED_H #include "store/Storage.h" @@ -46,5 +46,5 @@ public: } // namespace Store -#endif /* SQUID_STORE_CONTROLLED_H */ +#endif /* SQUID_SRC_STORE_CONTROLLED_H */ diff --git a/src/store/Controller.h b/src/store/Controller.h index dbac1ced61..ab54d7cd59 100644 --- a/src/store/Controller.h +++ b/src/store/Controller.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_STORE_CONTROLLER_H -#define SQUID_STORE_CONTROLLER_H +#ifndef SQUID_SRC_STORE_CONTROLLER_H +#define SQUID_SRC_STORE_CONTROLLER_H #include "store/Storage.h" @@ -173,5 +173,5 @@ extern void FreeMemory(); } // namespace Store -#endif /* SQUID_STORE_CONTROLLER_H */ +#endif /* SQUID_SRC_STORE_CONTROLLER_H */ diff --git a/src/store/Disk.h b/src/store/Disk.h index 45c629cba6..0960c7a42e 100644 --- a/src/store/Disk.h +++ b/src/store/Disk.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_STORE_DISK_H -#define SQUID_STORE_DISK_H +#ifndef SQUID_SRC_STORE_DISK_H +#define SQUID_SRC_STORE_DISK_H #include "store/Controlled.h" #include "StoreIOState.h" @@ -149,5 +149,5 @@ public: } // namespace Store -#endif /* SQUID_STORE_DISK_H */ +#endif /* SQUID_SRC_STORE_DISK_H */ diff --git a/src/store/Disks.h b/src/store/Disks.h index ef096376da..9e9849d675 100644 --- a/src/store/Disks.h +++ b/src/store/Disks.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_STORE_DISKS_H -#define SQUID_STORE_DISKS_H +#ifndef SQUID_SRC_STORE_DISKS_H +#define SQUID_SRC_STORE_DISKS_H #include "store/Controlled.h" #include "store/forward.h" @@ -82,5 +82,5 @@ void free_cachedir(Store::DiskConfig *swap); /* Globals that should be moved to some Store::UFS-specific logging module */ void storeDirSwapLog(const StoreEntry *e, int op); -#endif /* SQUID_STORE_DISKS_H */ +#endif /* SQUID_SRC_STORE_DISKS_H */ diff --git a/src/store/LocalSearch.h b/src/store/LocalSearch.h index 72aaefd088..b6c70eeeaa 100644 --- a/src/store/LocalSearch.h +++ b/src/store/LocalSearch.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_STORE_LOCAL_SEARCH_H -#define SQUID_STORE_LOCAL_SEARCH_H +#ifndef SQUID_SRC_STORE_LOCALSEARCH_H +#define SQUID_SRC_STORE_LOCALSEARCH_H #include "store/forward.h" @@ -15,5 +15,5 @@ namespace Store { StoreSearch *NewLocalSearch(); } // namespace Store -#endif /* SQUID_STORE_LOCAL_SEARCH_H */ +#endif /* SQUID_SRC_STORE_LOCALSEARCH_H */ diff --git a/src/store/Storage.h b/src/store/Storage.h index 909f7f03ec..39c0353979 100644 --- a/src/store/Storage.h +++ b/src/store/Storage.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_STORE_STORAGE_H -#define SQUID_STORE_STORAGE_H +#ifndef SQUID_SRC_STORE_STORAGE_H +#define SQUID_SRC_STORE_STORAGE_H #include "base/RefCount.h" #include "http/RequestMethod.h" @@ -80,5 +80,5 @@ public: } // namespace Store -#endif /* SQUID_STORE_STORAGE_H */ +#endif /* SQUID_SRC_STORE_STORAGE_H */ diff --git a/src/store/forward.h b/src/store/forward.h index a89689b66c..e7725128bf 100644 --- a/src/store/forward.h +++ b/src/store/forward.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_STORE_FORWARD_H -#define SQUID_STORE_FORWARD_H +#ifndef SQUID_SRC_STORE_FORWARD_H +#define SQUID_SRC_STORE_FORWARD_H // bug 4610 see comments 22-38 // Nasty hack, but it turns out C++ allows int32_t to be @@ -60,5 +60,5 @@ typedef Store::Disk SwapDir; template class RefCount; typedef RefCount SwapDirPointer; -#endif /* SQUID_STORE_FORWARD_H */ +#endif /* SQUID_SRC_STORE_FORWARD_H */ diff --git a/src/store_digest.h b/src/store_digest.h index 87822e413d..8482c3a473 100644 --- a/src/store_digest.h +++ b/src/store_digest.h @@ -8,8 +8,8 @@ /* DEBUG: section 71 Store Digest Manager */ -#ifndef SQUID_STORE_DIGEST_H_ -#define SQUID_STORE_DIGEST_H_ +#ifndef SQUID_SRC_STORE_DIGEST_H +#define SQUID_SRC_STORE_DIGEST_H class StoreEntry; @@ -18,5 +18,5 @@ void storeDigestNoteStoreReady(void); void storeDigestDel(const StoreEntry * entry); void storeDigestReport(StoreEntry *); -#endif /* SQUID_STORE_DIGEST_H_ */ +#endif /* SQUID_SRC_STORE_DIGEST_H */ diff --git a/src/store_key_md5.h b/src/store_key_md5.h index d0fb1f05b3..85702169c8 100644 --- a/src/store_key_md5.h +++ b/src/store_key_md5.h @@ -8,8 +8,8 @@ /* DEBUG: section 20 Storage Manager MD5 Cache Keys */ -#ifndef SQUID_STORE_KEY_MD5_H_ -#define SQUID_STORE_KEY_MD5_H_ +#ifndef SQUID_SRC_STORE_KEY_MD5_H +#define SQUID_SRC_STORE_KEY_MD5_H #include "hash.h" #include "http/forward.h" @@ -34,5 +34,5 @@ int storeKeyHashBuckets(int); extern HASHHASH storeKeyHashHash; extern HASHCMP storeKeyHashCmp; -#endif /* SQUID_STORE_KEY_MD5_H_ */ +#endif /* SQUID_SRC_STORE_KEY_MD5_H */ diff --git a/src/store_log.h b/src/store_log.h index 240acd9fc5..fd75e58ba3 100644 --- a/src/store_log.h +++ b/src/store_log.h @@ -8,8 +8,8 @@ /* DEBUG: section 20 Storage Manager Logging Functions */ -#ifndef SQUID_STORE_LOG_H_ -#define SQUID_STORE_LOG_H_ +#ifndef SQUID_SRC_STORE_LOG_H +#define SQUID_SRC_STORE_LOG_H class StoreEntry; @@ -18,5 +18,5 @@ void storeLogRotate(void); void storeLogClose(void); void storeLogOpen(void); -#endif /* SQUID_STORE_LOG_H_ */ +#endif /* SQUID_SRC_STORE_LOG_H */ diff --git a/src/store_rebuild.h b/src/store_rebuild.h index c832b00250..8d9e647ba8 100644 --- a/src/store_rebuild.h +++ b/src/store_rebuild.h @@ -8,8 +8,8 @@ /* DEBUG: section 20 Store Rebuild Routines */ -#ifndef SQUID_STORE_REBUILD_H_ -#define SQUID_STORE_REBUILD_H_ +#ifndef SQUID_SRC_STORE_REBUILD_H +#define SQUID_SRC_STORE_REBUILD_H #include "store_key_md5.h" @@ -84,5 +84,5 @@ bool storeRebuildLoadEntry(int fd, int diskIndex, MemBuf &buf, StoreRebuildData */ bool storeRebuildParseEntry(MemBuf &buf, StoreEntry &e, cache_key *key, StoreRebuildData &counts, uint64_t expectedSize); -#endif /* SQUID_STORE_REBUILD_H_ */ +#endif /* SQUID_SRC_STORE_REBUILD_H */ diff --git a/src/store_swapin.h b/src/store_swapin.h index e001284ae2..840e78c18d 100644 --- a/src/store_swapin.h +++ b/src/store_swapin.h @@ -8,11 +8,11 @@ /* DEBUG: section 20 Storage Manager Swapin Functions */ -#ifndef SQUID_STORE_SWAPIN_H_ -#define SQUID_STORE_SWAPIN_H_ +#ifndef SQUID_SRC_STORE_SWAPIN_H +#define SQUID_SRC_STORE_SWAPIN_H class store_client; void storeSwapInStart(store_client *); -#endif /* SQUID_STORE_SWAPIN_H_ */ +#endif /* SQUID_SRC_STORE_SWAPIN_H */ diff --git a/src/swap_log_op.h b/src/swap_log_op.h index 26cbef84e7..d4fc382f82 100644 --- a/src/swap_log_op.h +++ b/src/swap_log_op.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_SWAP_LOG_OP_H -#define _SQUID_SWAP_LOG_OP_H +#ifndef SQUID_SRC_SWAP_LOG_OP_H +#define SQUID_SRC_SWAP_LOG_OP_H typedef enum { SWAP_LOG_NOP, @@ -19,5 +19,5 @@ typedef enum { extern const char *swap_log_op_str[]; -#endif /* _SQUID_SWAP_LOG_OP_H */ +#endif /* SQUID_SRC_SWAP_LOG_OP_H */ diff --git a/src/tests/CapturingStoreEntry.h b/src/tests/CapturingStoreEntry.h index 31fa0e22db..fdbcfab9e4 100644 --- a/src/tests/CapturingStoreEntry.h +++ b/src/tests/CapturingStoreEntry.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_TESTS_CAPTURINGSTORE_ENTRY_H -#define SQUID_TESTS_CAPTURINGSTORE_ENTRY_H +#ifndef SQUID_SRC_TESTS_CAPTURINGSTOREENTRY_H +#define SQUID_SRC_TESTS_CAPTURINGSTOREENTRY_H #include "Store.h" @@ -39,5 +39,5 @@ public: } }; -#endif +#endif /* SQUID_SRC_TESTS_CAPTURINGSTOREENTRY_H */ diff --git a/src/tests/SBufFindTest.h b/src/tests/SBufFindTest.h index 9cba230044..f339283b2c 100644 --- a/src/tests/SBufFindTest.h +++ b/src/tests/SBufFindTest.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_TEST_SBUFFINDTEST_H -#define SQUID_SRC_TEST_SBUFFINDTEST_H +#ifndef SQUID_SRC_TESTS_SBUFFINDTEST_H +#define SQUID_SRC_TESTS_SBUFFINDTEST_H #include "sbuf/SBuf.h" @@ -88,5 +88,5 @@ private: typedef SBufFindTest::Placement Placement; -#endif +#endif /* SQUID_SRC_TESTS_SBUFFINDTEST_H */ diff --git a/src/tests/testACLMaxUserIP.h b/src/tests/testACLMaxUserIP.h index 103abe7ea1..40e6d25c56 100644 --- a/src/tests/testACLMaxUserIP.h +++ b/src/tests/testACLMaxUserIP.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_TEST_ACLMAXUSERIP_H -#define SQUID_SRC_TEST_ACLMAXUSERIP_H +#ifndef SQUID_SRC_TESTS_TESTACLMAXUSERIP_H +#define SQUID_SRC_TESTS_TESTACLMAXUSERIP_H #if USE_AUTH @@ -35,5 +35,5 @@ protected: }; #endif /* USE_AUTH */ -#endif /* SQUID_SRC_TEST_ACLMAXUSERIP_H */ +#endif /* SQUID_SRC_TESTS_TESTACLMAXUSERIP_H */ diff --git a/src/tests/testAuth.h b/src/tests/testAuth.h index cab3ba889f..f0688cb66d 100644 --- a/src/tests/testAuth.h +++ b/src/tests/testAuth.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_TEST_AUTH_H -#define SQUID_SRC_TEST_AUTH_H +#ifndef SQUID_SRC_TESTS_TESTAUTH_H +#define SQUID_SRC_TESTS_TESTAUTH_H #if USE_AUTH @@ -123,5 +123,5 @@ protected: #endif #endif /* USE_AUTH */ -#endif /* SQUID_SRC_TEST_AUTH_H */ +#endif /* SQUID_SRC_TESTS_TESTAUTH_H */ diff --git a/src/tests/testBoilerplate.h b/src/tests/testBoilerplate.h index a7aa8d52f1..3de19a49d2 100644 --- a/src/tests/testBoilerplate.h +++ b/src/tests/testBoilerplate.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_TEST_BOILDERPLATE_H -#define SQUID_SRC_TEST_BOILDERPLATE_H +#ifndef SQUID_SRC_TESTS_TESTBOILERPLATE_H +#define SQUID_SRC_TESTS_TESTBOILERPLATE_H #include "compat/cppunit.h" @@ -29,5 +29,5 @@ protected: void testDemonstration(); }; -#endif /* SQUID_SRC_TEST_BOILDERPLATE_H */ +#endif /* SQUID_SRC_TESTS_TESTBOILERPLATE_H */ diff --git a/src/tests/testCacheManager.h b/src/tests/testCacheManager.h index 490f46ed05..e56fc33b2d 100644 --- a/src/tests/testCacheManager.h +++ b/src/tests/testCacheManager.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_TEST_CACHEMANAGER_H -#define SQUID_SRC_TEST_CACHEMANAGER_H +#ifndef SQUID_SRC_TESTS_TESTCACHEMANAGER_H +#define SQUID_SRC_TESTS_TESTCACHEMANAGER_H #include "compat/cppunit.h" @@ -32,5 +32,5 @@ protected: void testParseUrl(); }; -#endif +#endif /* SQUID_SRC_TESTS_TESTCACHEMANAGER_H */ diff --git a/src/tests/testCharacterSet.h b/src/tests/testCharacterSet.h index 4033e43544..4350f8adf9 100644 --- a/src/tests/testCharacterSet.h +++ b/src/tests/testCharacterSet.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_BASE_TESTCHARACTERSET_H -#define SQUID_BASE_TESTCHARACTERSET_H +#ifndef SQUID_SRC_TESTS_TESTCHARACTERSET_H +#define SQUID_SRC_TESTS_TESTCHARACTERSET_H #include "compat/cppunit.h" @@ -33,5 +33,5 @@ protected: void CharacterSetSubtract(); }; -#endif /* SQUID_BASE_TESTCHARACTERSET_H */ +#endif /* SQUID_SRC_TESTS_TESTCHARACTERSET_H */ diff --git a/src/tests/testConfigParser.h b/src/tests/testConfigParser.h index c3a18a4c79..69803498a1 100644 --- a/src/tests/testConfigParser.h +++ b/src/tests/testConfigParser.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_TEST_CONFIG_PARSER_H -#define SQUID_SRC_TEST_CONFIG_PARSER_H +#ifndef SQUID_SRC_TESTS_TESTCONFIGPARSER_H +#define SQUID_SRC_TESTS_TESTCONFIGPARSER_H #include "compat/cppunit.h" @@ -29,5 +29,5 @@ protected: void testParseQuoted(); }; -#endif +#endif /* SQUID_SRC_TESTS_TESTCONFIGPARSER_H */ diff --git a/src/tests/testDiskIO.h b/src/tests/testDiskIO.h index 34cd6b545b..0b96ec7a89 100644 --- a/src/tests/testDiskIO.h +++ b/src/tests/testDiskIO.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_TEST_DISKIO_H -#define SQUID_SRC_TEST_DISKIO_H +#ifndef SQUID_SRC_TESTS_TESTDISKIO_H +#define SQUID_SRC_TESTS_TESTDISKIO_H #include "compat/cppunit.h" @@ -28,5 +28,5 @@ protected: void testFindDefault(); }; -#endif +#endif /* SQUID_SRC_TESTS_TESTDISKIO_H */ diff --git a/src/tests/testEnumIterator.h b/src/tests/testEnumIterator.h index e77d5190a7..b9dab78e6f 100644 --- a/src/tests/testEnumIterator.h +++ b/src/tests/testEnumIterator.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_TESTENUMITERATOR_H_ -#define SQUID_TESTENUMITERATOR_H_ +#ifndef SQUID_SRC_TESTS_TESTENUMITERATOR_H +#define SQUID_SRC_TESTS_TESTENUMITERATOR_H #include "base/EnumIterator.h" @@ -33,5 +33,5 @@ protected: void testUnsignedEnum(); }; -#endif /* SQUID_TESTENUMITERATOR_H_ */ +#endif /* SQUID_SRC_TESTS_TESTENUMITERATOR_H */ diff --git a/src/tests/testEvent.h b/src/tests/testEvent.h index c3147238cc..15a31c6bac 100644 --- a/src/tests/testEvent.h +++ b/src/tests/testEvent.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_TEST_EVENT_H -#define SQUID_SRC_TEST_EVENT_H +#ifndef SQUID_SRC_TESTS_TESTEVENT_H +#define SQUID_SRC_TESTS_TESTEVENT_H #include "compat/cppunit.h" @@ -38,5 +38,5 @@ protected: void testCancel(); }; -#endif +#endif /* SQUID_SRC_TESTS_TESTEVENT_H */ diff --git a/src/tests/testEventLoop.h b/src/tests/testEventLoop.h index 939a7b9d6c..6e8e918245 100644 --- a/src/tests/testEventLoop.h +++ b/src/tests/testEventLoop.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_TEST_EVENTLOOP_H -#define SQUID_SRC_TEST_EVENTLOOP_H +#ifndef SQUID_SRC_TESTS_TESTEVENTLOOP_H +#define SQUID_SRC_TESTS_TESTEVENTLOOP_H #include "compat/cppunit.h" @@ -39,5 +39,5 @@ protected: */ }; -#endif +#endif /* SQUID_SRC_TESTS_TESTEVENTLOOP_H */ diff --git a/src/tests/testHttp1Parser.h b/src/tests/testHttp1Parser.h index c7b67b4ea0..5eeca93791 100644 --- a/src/tests/testHttp1Parser.h +++ b/src/tests/testHttp1Parser.h @@ -39,5 +39,5 @@ protected: void testDripFeed(); // test incremental parse works }; -#endif +#endif /* SQUID_SRC_TESTS_TESTHTTP1PARSER_H */ diff --git a/src/tests/testHttpReply.h b/src/tests/testHttpReply.h index 3d01f38ab4..24c5e4c872 100644 --- a/src/tests/testHttpReply.h +++ b/src/tests/testHttpReply.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_TEST_HTTP_REPLY_H -#define SQUID_SRC_TEST_HTTP_REPLY_H +#ifndef SQUID_SRC_TESTS_TESTHTTPREPLY_H +#define SQUID_SRC_TESTS_TESTHTTPREPLY_H #include "compat/cppunit.h" @@ -28,5 +28,5 @@ protected: void testSanityCheckFirstLine(); }; -#endif +#endif /* SQUID_SRC_TESTS_TESTHTTPREPLY_H */ diff --git a/src/tests/testHttpRequest.h b/src/tests/testHttpRequest.h index 3605edebb4..cf47b13cf3 100644 --- a/src/tests/testHttpRequest.h +++ b/src/tests/testHttpRequest.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_TEST_HTTP_REQUEST_H -#define SQUID_SRC_TEST_HTTP_REQUEST_H +#ifndef SQUID_SRC_TESTS_TESTHTTPREQUEST_H +#define SQUID_SRC_TESTS_TESTHTTPREQUEST_H #include "compat/cppunit.h" @@ -32,5 +32,5 @@ protected: void testSanityCheckStartLine(); }; -#endif +#endif /* SQUID_SRC_TESTS_TESTHTTPREQUEST_H */ diff --git a/src/tests/testHttpRequestMethod.h b/src/tests/testHttpRequestMethod.h index 691657c36f..2a20e5ae01 100644 --- a/src/tests/testHttpRequestMethod.h +++ b/src/tests/testHttpRequestMethod.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_TEST_HTTP_REQUEST_METHOD_H -#define SQUID_SRC_TEST_HTTP_REQUEST_METHOD_H +#ifndef SQUID_SRC_TESTS_TESTHTTPREQUESTMETHOD_H +#define SQUID_SRC_TESTS_TESTHTTPREQUESTMETHOD_H #include "compat/cppunit.h" @@ -43,5 +43,5 @@ protected: void testStream(); }; -#endif +#endif /* SQUID_SRC_TESTS_TESTHTTPREQUESTMETHOD_H */ diff --git a/src/tests/testIpAddress.h b/src/tests/testIpAddress.h index f2320710d1..c4d4aee985 100644 --- a/src/tests/testIpAddress.h +++ b/src/tests/testIpAddress.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_TEST_IPADDRESS_H -#define SQUID_SRC_TEST_IPADDRESS_H +#ifndef SQUID_SRC_TESTS_TESTIPADDRESS_H +#define SQUID_SRC_TESTS_TESTIPADDRESS_H #include "compat/cppunit.h" @@ -67,5 +67,5 @@ protected: }; -#endif /* SQUID_SRC_TEST_IPADDRESS_H */ +#endif /* SQUID_SRC_TESTS_TESTIPADDRESS_H */ diff --git a/src/tests/testLookupTable.h b/src/tests/testLookupTable.h index f944a50c0d..d9327744a3 100644 --- a/src/tests/testLookupTable.h +++ b/src/tests/testLookupTable.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_TESTLOOKUPTABLE_H_ -#define SQUID_TESTLOOKUPTABLE_H_ +#ifndef SQUID_SRC_TESTS_TESTLOOKUPTABLE_H +#define SQUID_SRC_TESTS_TESTLOOKUPTABLE_H #include "compat/cppunit.h" @@ -20,5 +20,5 @@ public: void testLookupTableLookup(); }; -#endif /* SQUID_TESTLOOKUPTABLE_H_ */ +#endif /* SQUID_SRC_TESTS_TESTLOOKUPTABLE_H */ diff --git a/src/tests/testRFC1035.h b/src/tests/testRFC1035.h index 5fa1fd7a71..21ba3c69f0 100644 --- a/src/tests/testRFC1035.h +++ b/src/tests/testRFC1035.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_TEST_RFC1035_H -#define SQUID_SRC_TEST_RFC1035_H +#ifndef SQUID_SRC_TESTS_TESTRFC1035_H +#define SQUID_SRC_TESTS_TESTRFC1035_H #include "compat/cppunit.h" @@ -36,5 +36,5 @@ protected: void testBugPacketHeadersOnly(); }; -#endif /* SQUID_SRC_TEST_IPADDRESS_H */ +#endif /* SQUID_SRC_TESTS_TESTRFC1035_H */ diff --git a/src/tests/testRefCount.h b/src/tests/testRefCount.h index c62fd37da3..03e3812151 100644 --- a/src/tests/testRefCount.h +++ b/src/tests/testRefCount.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_TEST_REFCOUNT_H -#define SQUID_SRC_TEST_REFCOUNT_H +#ifndef SQUID_SRC_TESTS_TESTREFCOUNT_H +#define SQUID_SRC_TESTS_TESTREFCOUNT_H #include "compat/cppunit.h" @@ -35,5 +35,5 @@ protected: void testDoubleInheritToSingleInherit(); }; -#endif +#endif /* SQUID_SRC_TESTS_TESTREFCOUNT_H */ diff --git a/src/tests/testRock.h b/src/tests/testRock.h index 93adf6349a..6347ec9797 100644 --- a/src/tests/testRock.h +++ b/src/tests/testRock.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_TEST_TESTROCK_H -#define SQUID_SRC_TEST_TESTROCK_H +#ifndef SQUID_SRC_TESTS_TESTROCK_H +#define SQUID_SRC_TESTS_TESTROCK_H #include "compat/cppunit.h" @@ -43,5 +43,5 @@ private: Rock::SwapDirRr *rr; }; -#endif /* SQUID_SRC_TEST_TESTROCK_H */ +#endif /* SQUID_SRC_TESTS_TESTROCK_H */ diff --git a/src/tests/testSBuf.h b/src/tests/testSBuf.h index 59b0ff5286..59e3d470ce 100644 --- a/src/tests/testSBuf.h +++ b/src/tests/testSBuf.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_TEST_TESTSBUF_H -#define SQUID_SRC_TEST_TESTSBUF_H +#ifndef SQUID_SRC_TESTS_TESTSBUF_H +#define SQUID_SRC_TESTS_TESTSBUF_H #include "compat/cppunit.h" @@ -97,5 +97,5 @@ protected: void testSBufHash(); }; -#endif +#endif /* SQUID_SRC_TESTS_TESTSBUF_H */ diff --git a/src/tests/testSBufList.h b/src/tests/testSBufList.h index 3e04a50399..e394c2ac3c 100644 --- a/src/tests/testSBufList.h +++ b/src/tests/testSBufList.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_TEST_TESTSBUF_H -#define SQUID_SRC_TEST_TESTSBUF_H +#ifndef SQUID_SRC_TESTS_TESTSBUFLIST_H +#define SQUID_SRC_TESTS_TESTSBUFLIST_H #include "compat/cppunit.h" @@ -22,5 +22,5 @@ protected: void testSBufListJoin(); }; -#endif +#endif /* SQUID_SRC_TESTS_TESTSBUFLIST_H */ diff --git a/src/tests/testStatHist.h b/src/tests/testStatHist.h index 9c2dc39518..b47e65e8cb 100644 --- a/src/tests/testStatHist.h +++ b/src/tests/testStatHist.h @@ -10,8 +10,8 @@ * StatHist unit test */ -#ifndef TESTSTATHIST_H_ -#define TESTSTATHIST_H_ +#ifndef SQUID_SRC_TESTS_TESTSTATHIST_H +#define SQUID_SRC_TESTS_TESTSTATHIST_H #include "compat/cppunit.h" @@ -33,5 +33,5 @@ protected: void testStatHistSum(); }; -#endif /* TESTSTATHIST_H_ */ +#endif /* SQUID_SRC_TESTS_TESTSTATHIST_H */ diff --git a/src/tests/testStore.h b/src/tests/testStore.h index 2e043381ab..664af5f201 100644 --- a/src/tests/testStore.h +++ b/src/tests/testStore.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_TEST_STORE_H -#define SQUID_SRC_TEST_STORE_H +#ifndef SQUID_SRC_TESTS_TESTSTORE_H +#define SQUID_SRC_TESTS_TESTSTORE_H #include "Store.h" #include "store/Controlled.h" @@ -80,5 +80,5 @@ public: typedef RefCount TestStorePointer; -#endif +#endif /* SQUID_SRC_TESTS_TESTSTORE_H */ diff --git a/src/tests/testStoreController.h b/src/tests/testStoreController.h index 2c1aff615e..7b38750575 100644 --- a/src/tests/testStoreController.h +++ b/src/tests/testStoreController.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_TEST_STORECONTROLLER_H -#define SQUID_SRC_TEST_STORECONTROLLER_H +#ifndef SQUID_SRC_TESTS_TESTSTORECONTROLLER_H +#define SQUID_SRC_TESTS_TESTSTORECONTROLLER_H #include "compat/cppunit.h" @@ -31,5 +31,5 @@ protected: void testSearch(); }; -#endif +#endif /* SQUID_SRC_TESTS_TESTSTORECONTROLLER_H */ diff --git a/src/tests/testStoreHashIndex.h b/src/tests/testStoreHashIndex.h index 282bbfd484..a86b6b1b67 100644 --- a/src/tests/testStoreHashIndex.h +++ b/src/tests/testStoreHashIndex.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_TEST_STOREHASHINDEX_H -#define SQUID_SRC_TEST_STOREHASHINDEX_H +#ifndef SQUID_SRC_TESTS_TESTSTOREHASHINDEX_H +#define SQUID_SRC_TESTS_TESTSTOREHASHINDEX_H #include "compat/cppunit.h" @@ -31,5 +31,5 @@ protected: void testSearch(); }; -#endif +#endif /* SQUID_SRC_TESTS_TESTSTOREHASHINDEX_H */ diff --git a/src/tests/testStoreSupport.h b/src/tests/testStoreSupport.h index fee352811d..dd5c98c649 100644 --- a/src/tests/testStoreSupport.h +++ b/src/tests/testStoreSupport.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_TESTSTORESUPPORT_H -#define SQUID_TESTSTORESUPPORT_H +#ifndef SQUID_SRC_TESTS_TESTSTORESUPPORT_H +#define SQUID_SRC_TESTS_TESTSTORESUPPORT_H #include "EventLoop.h" #include "time/Engine.h" @@ -24,5 +24,5 @@ public: Time::Engine default_time_engine; }; -#endif /* SQUID_TESTSTORESUPPORT_H */ +#endif /* SQUID_SRC_TESTS_TESTSTORESUPPORT_H */ diff --git a/src/tests/testString.h b/src/tests/testString.h index 66f0d3d4ae..f8192fc363 100644 --- a/src/tests/testString.h +++ b/src/tests/testString.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_TEST_STRING_H -#define SQUID_SRC_TEST_STRING_H +#ifndef SQUID_SRC_TESTS_TESTSTRING_H +#define SQUID_SRC_TESTS_TESTSTRING_H #include "compat/cppunit.h" @@ -35,5 +35,5 @@ protected: void testSubstr(); }; -#endif +#endif /* SQUID_SRC_TESTS_TESTSTRING_H */ diff --git a/src/tests/testTokenizer.h b/src/tests/testTokenizer.h index b3d36d73c1..cbd8f12346 100644 --- a/src/tests/testTokenizer.h +++ b/src/tests/testTokenizer.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_TESTTOKENIZER_H_ -#define SQUID_TESTTOKENIZER_H_ +#ifndef SQUID_SRC_TESTS_TESTTOKENIZER_H +#define SQUID_SRC_TESTS_TESTTOKENIZER_H #include "compat/cppunit.h" @@ -31,5 +31,5 @@ protected: void testTokenizerInt64(); }; -#endif /* SQUID_TESTTOKENIZER_H_ */ +#endif /* SQUID_SRC_TESTS_TESTTOKENIZER_H */ diff --git a/src/tests/testURL.h b/src/tests/testURL.h index 898b0ee5b2..87248c9f02 100644 --- a/src/tests/testURL.h +++ b/src/tests/testURL.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_TEST_URL_H -#define SQUID_SRC_TEST_URL_H +#ifndef SQUID_SRC_TESTS_TESTURL_H +#define SQUID_SRC_TESTS_TESTURL_H #include "compat/cppunit.h" @@ -31,5 +31,5 @@ protected: void testDefaultConstructor(); }; -#endif +#endif /* SQUID_SRC_TESTS_TESTURL_H */ diff --git a/src/tests/testUfs.h b/src/tests/testUfs.h index 7277814db3..305bfbb351 100644 --- a/src/tests/testUfs.h +++ b/src/tests/testUfs.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_TEST_STORECONTROLLER_H -#define SQUID_SRC_TEST_STORECONTROLLER_H +#ifndef SQUID_SRC_TESTS_TESTUFS_H +#define SQUID_SRC_TESTS_TESTUFS_H #include "compat/cppunit.h" @@ -30,5 +30,5 @@ protected: void testUfsDefaultEngine(); }; -#endif +#endif /* SQUID_SRC_TESTS_TESTUFS_H */ diff --git a/src/tests/testUriScheme.h b/src/tests/testUriScheme.h index 5418ee5ef1..1b8b227fa4 100644 --- a/src/tests/testUriScheme.h +++ b/src/tests/testUriScheme.h @@ -42,5 +42,5 @@ protected: void testStream(); }; -#endif +#endif /* SQUID_SRC_TESTS_TESTURISCHEME_H */ diff --git a/src/time/Engine.h b/src/time/Engine.h index 72f0cbfb29..e1bfa13967 100644 --- a/src/time/Engine.h +++ b/src/time/Engine.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID__SRC_TIME_ENGINE_H -#define SQUID__SRC_TIME_ENGINE_H +#ifndef SQUID_SRC_TIME_ENGINE_H +#define SQUID_SRC_TIME_ENGINE_H namespace Time { @@ -23,5 +23,5 @@ public: } // namespace Time -#endif /* SQUID__SRC_TIME_ENGINE_H */ +#endif /* SQUID_SRC_TIME_ENGINE_H */ diff --git a/src/time/forward.h b/src/time/forward.h index 726d911abe..70f1c901c5 100644 --- a/src/time/forward.h +++ b/src/time/forward.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID__SRC_TIME_FORWARD_H -#define SQUID__SRC_TIME_FORWARD_H +#ifndef SQUID_SRC_TIME_FORWARD_H +#define SQUID_SRC_TIME_FORWARD_H /// Time and Date handling tools namespace Time @@ -17,5 +17,5 @@ class Engine; } // namespace Time -#endif /* SQUID__SRC_TIME_FORWARD_H */ +#endif /* SQUID_SRC_TIME_FORWARD_H */ diff --git a/src/time/gadgets.h b/src/time/gadgets.h index 7921032c1e..a3e60bf423 100644 --- a/src/time/gadgets.h +++ b/src/time/gadgets.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID__SRC_TIME_GADGETS_H -#define SQUID__SRC_TIME_GADGETS_H +#ifndef SQUID_SRC_TIME_GADGETS_H +#define SQUID_SRC_TIME_GADGETS_H #include #include @@ -139,5 +139,5 @@ operator ==(const timeval &a, const timeval &b) return !(a != b); } -#endif /* SQUID__SRC_TIME_GADGETS_H */ +#endif /* SQUID_SRC_TIME_GADGETS_H */ diff --git a/src/tools.h b/src/tools.h index 0714e1e45d..ae76af1a22 100644 --- a/src/tools.h +++ b/src/tools.h @@ -8,8 +8,8 @@ /* DEBUG: section 21 Misc Functions */ -#ifndef SQUID_TOOLS_H_ -#define SQUID_TOOLS_H_ +#ifndef SQUID_SRC_TOOLS_H +#define SQUID_SRC_TOOLS_H #include "sbuf/SBuf.h" #include "typedefs.h" @@ -114,5 +114,5 @@ inline pid_t WaitForAnyPid(PidStatus &status, int flags) SBuf WindowsErrorMessage(DWORD errorId); #endif // _SQUID_WINDOWS_ -#endif /* SQUID_TOOLS_H_ */ +#endif /* SQUID_SRC_TOOLS_H */ diff --git a/src/tunnel.h b/src/tunnel.h index 0c8a6ed5f8..17d9d5218e 100644 --- a/src/tunnel.h +++ b/src/tunnel.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef TUNNEL_H_ -#define TUNNEL_H_ +#ifndef SQUID_SRC_TUNNEL_H +#define SQUID_SRC_TUNNEL_H #include "comm/forward.h" #include "sbuf/forward.h" @@ -15,5 +15,5 @@ class HttpRequest; void switchToTunnel(HttpRequest *request, const Comm::ConnectionPointer &clientConn, const Comm::ConnectionPointer &srvConn, const SBuf &preReadServerData); -#endif /* TUNNEL_H_ */ +#endif /* SQUID_SRC_TUNNEL_H */ diff --git a/src/typedefs.h b/src/typedefs.h index 018c2aab88..68685981c1 100644 --- a/src/typedefs.h +++ b/src/typedefs.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_TYPEDEFS_H -#define SQUID_TYPEDEFS_H +#ifndef SQUID_SRC_TYPEDEFS_H +#define SQUID_SRC_TYPEDEFS_H #include "anyp/ProtocolType.h" #include "enums.h" @@ -21,5 +21,5 @@ typedef void DWCB(int, int, size_t, void *); /* disk write CB */ class CachePeer; typedef void IRCB(CachePeer *, peer_t, AnyP::ProtocolType, void *, void *data); -#endif /* SQUID_TYPEDEFS_H */ +#endif /* SQUID_SRC_TYPEDEFS_H */ diff --git a/src/unlinkd.h b/src/unlinkd.h index cd3c5e4cf8..d64108bbf0 100644 --- a/src/unlinkd.h +++ b/src/unlinkd.h @@ -8,8 +8,8 @@ /* DEBUG: section 02 Unlink Daemon */ -#ifndef SQUID_UNLINKD_H_ -#define SQUID_UNLINKD_H_ +#ifndef SQUID_SRC_UNLINKD_H +#define SQUID_SRC_UNLINKD_H #if USE_UNLINKD bool unlinkdNeeded(void); @@ -27,5 +27,5 @@ inline void unlinkdClose(void) { return; } inline void unlinkdUnlink(const char * path) { ::unlink(path); } #endif /* USE_UNLINKD */ -#endif /* SQUID_UNLINKD_H_ */ +#endif /* SQUID_SRC_UNLINKD_H */ diff --git a/src/urn.h b/src/urn.h index 0ecb78149d..55cf8e7412 100644 --- a/src/urn.h +++ b/src/urn.h @@ -8,8 +8,8 @@ /* DEBUG: section 52 URN Parsing */ -#ifndef SQUID_URN_H_ -#define SQUID_URN_H_ +#ifndef SQUID_SRC_URN_H +#define SQUID_SRC_URN_H #include "log/forward.h" @@ -18,5 +18,5 @@ class StoreEntry; void urnStart(HttpRequest *, StoreEntry *, const AccessLogEntryPointer &ale); -#endif /* SQUID_URN_H_ */ +#endif /* SQUID_SRC_URN_H */ diff --git a/src/wccp.h b/src/wccp.h index 4f8d4d2c77..c06e466e92 100644 --- a/src/wccp.h +++ b/src/wccp.h @@ -8,8 +8,8 @@ /* DEBUG: section 80 WCCP Support */ -#ifndef SQUID_WCCP_H_ -#define SQUID_WCCP_H_ +#ifndef SQUID_SRC_WCCP_H +#define SQUID_SRC_WCCP_H #if USE_WCCP void wccpInit(void); @@ -17,5 +17,5 @@ void wccpConnectionOpen(void); void wccpConnectionClose(void); #endif /* USE_WCCP */ -#endif /* SQUID_WCCP_H_ */ +#endif /* SQUID_SRC_WCCP_H */ diff --git a/src/wccp2.h b/src/wccp2.h index e151ad8470..9e95dcec97 100644 --- a/src/wccp2.h +++ b/src/wccp2.h @@ -8,8 +8,8 @@ /* DEBUG: section 80 WCCP Support */ -#ifndef SQUID_WCCP2_H_ -#define SQUID_WCCP2_H_ +#ifndef SQUID_SRC_WCCP2_H +#define SQUID_SRC_WCCP2_H #if USE_WCCPv2 @@ -38,5 +38,5 @@ void free_wccp2_service_info(void *v); void dump_wccp2_service_info(StoreEntry * e, const char *label, void *v); #endif /* USE_WCCPv2 */ -#endif /* WCCP2_H_ */ +#endif /* SQUID_SRC_WCCP2_H */ diff --git a/src/whois.h b/src/whois.h index 6977ad0ea7..dc27d4bdfc 100644 --- a/src/whois.h +++ b/src/whois.h @@ -8,8 +8,8 @@ /* DEBUG: section 75 WHOIS protocol */ -#ifndef SQUID_WHOIS_H_ -#define SQUID_WHOIS_H_ +#ifndef SQUID_SRC_WHOIS_H +#define SQUID_SRC_WHOIS_H /** * \defgroup ServerProtocolWhoisAPI Server-Side WHOIS API @@ -19,5 +19,5 @@ /// \ingroup ServerProtocolWhoisAPI void whoisStart(FwdState *); -#endif /* SQUID_WHOIS_H_ */ +#endif /* SQUID_SRC_WHOIS_H */ diff --git a/src/win32.h b/src/win32.h index c0b06789ab..031ffc4769 100644 --- a/src/win32.h +++ b/src/win32.h @@ -8,8 +8,8 @@ /* Inspired by previous work by Romeo Anghelache & Eric Stern. */ -#ifndef SQUID_WIN32_H_ -#define SQUID_WIN32_H_ +#ifndef SQUID_SRC_WIN32_H +#define SQUID_SRC_WIN32_H #if _SQUID_WINDOWS_ @@ -20,5 +20,5 @@ DWORD WIN32_IpAddrChangeMonitorInit(); #endif -#endif /* SQUID_WIN32_H_ */ +#endif /* SQUID_SRC_WIN32_H */ diff --git a/src/windows_service.h b/src/windows_service.h index 379435dfac..5679ee9356 100644 --- a/src/windows_service.h +++ b/src/windows_service.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef WINSVC_H_ -#define WINSVC_H_ +#ifndef SQUID_SRC_WINDOWS_SERVICE_H +#define SQUID_SRC_WINDOWS_SERVICE_H #if _SQUID_WINDOWS_ int WIN32_StartService(int, char **); @@ -24,5 +24,5 @@ inline void WIN32_InstallService(void) {} /* NOP */ inline void WIN32_RemoveService(void) {} /* NOP */ #endif /* _SQUID_WINDOWS_ */ -#endif /* WINSVC_H_ */ +#endif /* SQUID_SRC_WINDOWS_SERVICE_H */ diff --git a/src/wordlist.h b/src/wordlist.h index 671c2ef7a9..1114296cb3 100644 --- a/src/wordlist.h +++ b/src/wordlist.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_WORDLIST_H -#define SQUID_WORDLIST_H +#ifndef SQUID_SRC_WORDLIST_H +#define SQUID_SRC_WORDLIST_H #include "globals.h" #include "sbuf/List.h" @@ -65,5 +65,5 @@ char *wordlistChopHead(wordlist **); /// convert a wordlist to a SBufList SBufList ToSBufList(wordlist *); -#endif /* SQUID_WORDLIST_H */ +#endif /* SQUID_SRC_WORDLIST_H */ diff --git a/tools/squidclient/Parameters.h b/tools/squidclient/Parameters.h index f310ce13ac..184e50187a 100644 --- a/tools/squidclient/Parameters.h +++ b/tools/squidclient/Parameters.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_TOOLS_SQUIDCLIENT_PARAMETERS_H -#define _SQUID_TOOLS_SQUIDCLIENT_PARAMETERS_H +#ifndef SQUID_TOOLS_SQUIDCLIENT_PARAMETERS_H +#define SQUID_TOOLS_SQUIDCLIENT_PARAMETERS_H /** * squidclient command line parameters. @@ -34,5 +34,5 @@ public: /// global squidcleint parameters extern Parameters scParams; -#endif /* _SQUID_TOOLS_SQUIDCLIENT_PARAMETERS_H */ +#endif /* SQUID_TOOLS_SQUIDCLIENT_PARAMETERS_H */ diff --git a/tools/squidclient/Ping.h b/tools/squidclient/Ping.h index 3a9c353065..dc4f7d71fc 100644 --- a/tools/squidclient/Ping.h +++ b/tools/squidclient/Ping.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_TOOLS_CLIENT_PING_H -#define _SQUID_TOOLS_CLIENT_PING_H +#ifndef SQUID_TOOLS_SQUIDCLIENT_PING_H +#define SQUID_TOOLS_SQUIDCLIENT_PING_H /** * API for looping the squidclient request message @@ -59,5 +59,5 @@ void DisplayStats(); } // namespace Ping -#endif /* _SQUID_TOOLS_CLIENT_PING_H */ +#endif /* SQUID_TOOLS_SQUIDCLIENT_PING_H */ diff --git a/tools/squidclient/gssapi_support.h b/tools/squidclient/gssapi_support.h index b824e75ec4..ee0715a520 100644 --- a/tools/squidclient/gssapi_support.h +++ b/tools/squidclient/gssapi_support.h @@ -6,8 +6,8 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef _SQUID_TOOLS_SQUIDCLIENT_GSSAPI_H -#define _SQUID_TOOLS_SQUIDCLIENT_GSSAPI_H +#ifndef SQUID_TOOLS_SQUIDCLIENT_GSSAPI_SUPPORT_H +#define SQUID_TOOLS_SQUIDCLIENT_GSSAPI_SUPPORT_H #if HAVE_GSSAPI #if USE_APPLE_KRB5 @@ -49,5 +49,5 @@ bool check_gss_err(OM_uint32 major_status, OM_uint32 minor_status, const char *f char *GSSAPI_token(const char *server); #endif /* HAVE_GSSAPI */ -#endif /* _SQUID_TOOLS_SQUIDCLIENT_GSSAPI_H */ +#endif /* SQUID_TOOLS_SQUIDCLIENT_GSSAPI_SUPPORT_H */