Update all header guards.

Don't start with underscores, as those are reserved for system
libraries. Make sure all start with TINC_, and that they appear at
the top of the file.

diff --git a/src/autoconnect.h b/src/autoconnect.h
index dc3ee1cf0a8b739818098f2f7ad905f8cfe083ee..82a5043b102cd50fb55c2188fd51f1ab68b58634 100644 (file)
--- a/src/autoconnect.h
+++ b/src/autoconnect.h
@@ -1,3 +1,6 @@
+#ifndef TINC_AUTOCONNECT_H
+#define TINC_AUTOCONNECT_H
+
 /*
     autoconnect.h -- header for autoconnect.c
     Copyright (C) 2017 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_AUTOCONNECT_H__
-#define __TINC_AUTOCONNECT_H__
-
 extern void do_autoconnect(void);
 
 #endif

diff --git a/src/buffer.h b/src/buffer.h
index a96c15aa7a89e00e9f6088e5cc573869c25729fb..53522b69ba06b1b73a47668ac3d9ff9a7abb6f7b 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -1,5 +1,5 @@
-#ifndef __TINC_BUFFER_H__
-#define __TINC_BUFFER_H__
+#ifndef TINC_BUFFER_H
+#define TINC_BUFFER_H
 
 typedef struct buffer_t {
        char *data;

diff --git a/src/cipher.h b/src/cipher.h
index 44db40f8df888ce7593e66a9bd993c8243a5137f..05012230e7413ad8b6338abd528963594501fd93 100644 (file)
--- a/src/cipher.h
+++ b/src/cipher.h
@@ -1,3 +1,6 @@
+#ifndef TINC_CIPHER_H
+#define TINC_CIPHER_H
+
 /*
     cipher.h -- header file cipher.c
     Copyright (C) 2007-2016 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_CIPHER_H__
-#define __TINC_CIPHER_H__
-
 #define CIPHER_MAX_BLOCK_SIZE 32
 #define CIPHER_MAX_IV_SIZE 16
 #define CIPHER_MAX_KEY_SIZE 32

diff --git a/src/conf.h b/src/conf.h
index 2478c585423f383955b9c50336b231c966d6a1a2..9fcc30133e76380394fa0d335cf6f4e51fe1d46c 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,3 +1,6 @@
+#ifndef TINC_CONF_H
+#define TINC_CONF_H
+
 /*
     conf.h -- header for conf.c
     Copyright (C) 1998-2005 Ivo Timmermans
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_CONF_H__
-#define __TINC_CONF_H__
-
 #include "list.h"
 #include "splay_tree.h"
 #include "subnet.h"
@@ -61,4 +61,4 @@ extern bool read_server_config(void);
 extern bool read_host_config(splay_tree_t *, const char *);
 extern bool append_config_file(const char *, const char *, const char *);
 
-#endif /* __TINC_CONF_H__ */
+#endif

diff --git a/src/connection.h b/src/connection.h
index acd77bc277e88e5568b151ac2dca4349cc74fae3..b6f81056f4805f05ad404a945693180753855440 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -1,3 +1,6 @@
+#ifndef TINC_CONNECTION_H
+#define TINC_CONNECTION_H
+
 /*
     connection.h -- header for connection.c
     Copyright (C) 2000-2013 Guus Sliepen <guus@tinc-vpn.org>,
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_CONNECTION_H__
-#define __TINC_CONNECTION_H__
-
 #include "buffer.h"
 #include "cipher.h"
 #include "digest.h"
@@ -118,4 +118,4 @@ extern void connection_add(connection_t *);
 extern void connection_del(connection_t *);
 extern bool dump_connections(struct connection_t *);
 
-#endif /* __TINC_CONNECTION_H__ */
+#endif

diff --git a/src/control.h b/src/control.h
index ce8145a3510b80ca8ba04e37ad2daaa493c5ea7b..04fe30417bcf6e984288d975cbc46a66122d0bfa 100644 (file)
--- a/src/control.h
+++ b/src/control.h
@@ -1,3 +1,6 @@
+#ifndef TINC_CONTROL_H
+#define TINC_CONTROL_H
+
 /*
     control.h -- header for control.c.
     Copyright (C) 2007 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_CONTROL_H__
-#define __TINC_CONTROL_H__
-
 extern bool init_control();
 extern void exit_control();
 extern char controlcookie[];

diff --git a/src/control_common.h b/src/control_common.h
index cd54889a99a2d896fd4e681c4b14fb2d80892c1c..2be4abd57869c2cb31da69f318c22f493d9f72ff 100644 (file)
--- a/src/control_common.h
+++ b/src/control_common.h
@@ -1,3 +1,6 @@
+#ifndef TINC_CONTROL_COMMON_H
+#define TINC_CONTROL_COMMON_H
+
 /*
     control_protocol.h -- control socket protocol.
     Copyright (C) 2007      Scott Lamb <slamb@slamb.org>
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_CONTROL_PROTOCOL_H__
-#define __TINC_CONTROL_PROTOCOL_H__
-
 #include "protocol.h"
 
 enum request_type {

diff --git a/src/crypto.h b/src/crypto.h
index cd3654fec4849805c004e86eb6fd68c7729c5b6e..c9abddd52cf3d63be39ec62a162caf3b97704fe6 100644 (file)
--- a/src/crypto.h
+++ b/src/crypto.h
@@ -1,3 +1,6 @@
+#ifndef TINC_CRYPTO_H
+#define TINC_CRYPTO_H
+
 /*
     crypto.h -- header for crypto.c
     Copyright (C) 2007-2013 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_CRYPTO_H__
-#define __TINC_CRYPTO_H__
-
 extern void crypto_init();
 extern void crypto_exit();
 extern void randomize(void *, size_t);

diff --git a/src/device.h b/src/device.h
index fa27df3d61955a2c470e5238954497f34e6debf9..c85671b321f821180587f768f45970d8c0c7202b 100644 (file)
--- a/src/device.h
+++ b/src/device.h
@@ -1,3 +1,6 @@
+#ifndef TINC_DEVICE_H
+#define TINC_DEVICE_H
+
 /*
     device.h -- generic header for device.c
     Copyright (C) 2001-2005 Ivo Timmermans
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_DEVICE_H__
-#define __TINC_DEVICE_H__
-
 #include "net.h"
 
 extern int device_fd;
@@ -45,4 +45,4 @@ extern const devops_t uml_devops;
 extern const devops_t vde_devops;
 extern devops_t devops;
 
-#endif /* __TINC_DEVICE_H__ */
+#endif

diff --git a/src/digest.h b/src/digest.h
index a3691bf05b8cd4591f3dfb696f2ac3f6ee31f2c5..334153113973ac9bb686e43464d2ecbdb19bd1c7 100644 (file)
--- a/src/digest.h
+++ b/src/digest.h
@@ -1,3 +1,6 @@
+#ifndef TINC_DIGEST_H
+#define TINC_DIGEST_H
+
 /*
     digest.h -- header file digest.c
     Copyright (C) 2007-2016 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_DIGEST_H__
-#define __TINC_DIGEST_H__
-
 #define DIGEST_MAX_SIZE 64
 
 #ifndef DISABLE_LEGACY

diff --git a/src/dropin.h b/src/dropin.h
index 938f30dc1ed794070deb544cca102e4254f3b142..81d1d03a1288f4a4d661f4b9473eb6b2bd571cf9 100644 (file)
--- a/src/dropin.h
+++ b/src/dropin.h
@@ -1,3 +1,6 @@
+#ifndef TINC_DROPIN_H
+#define TINC_DROPIN_H
+
 /*
     dropin.h -- header file for dropin.c
     Copyright (C) 2000-2005 Ivo Timmermans,
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __DROPIN_H__
-#define __DROPIN_H__
-
 #ifndef HAVE_DAEMON
 extern int daemon(int, int);
 #endif
@@ -67,4 +67,4 @@ extern int nanosleep(const struct timespec *req, struct timespec *rem);
 #define EAI_SYSTEM 0
 #endif
 
-#endif /* __DROPIN_H__ */
+#endif

diff --git a/src/ecdh.h b/src/ecdh.h
index c5ea3efbb6d64b593de3d789785b8264c8b9d4a2..5a88244da02ebe104e9c11db4e9975161447b829 100644 (file)
--- a/src/ecdh.h
+++ b/src/ecdh.h
@@ -1,3 +1,6 @@
+#ifndef TINC_ECDH_H
+#define TINC_ECDH_H
+
 /*
     ecdh.h -- header file for ecdh.c
     Copyright (C) 2011-2013 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,13 +20,10 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_ECDH_H__
-#define __TINC_ECDH_H__
-
 #define ECDH_SIZE 32
 #define ECDH_SHARED_SIZE 32
 
-#ifndef __TINC_ECDH_INTERNAL__
+#ifndef TINC_ECDH_INTERNAL
 typedef struct ecdh ecdh_t;
 #endif
 

diff --git a/src/ecdsa.h b/src/ecdsa.h
index d03a58edc5760dbd5811084b867dc2b4b220d8f8..be138f9a6d9e303f07867f0d32f9537a28ba3637 100644 (file)
--- a/src/ecdsa.h
+++ b/src/ecdsa.h
@@ -1,3 +1,6 @@
+#ifndef TINC_ECDSA_H
+#define TINC_ECDSA_H
+
 /*
     ecdsa.h -- ECDSA key handling
     Copyright (C) 2011-2013 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,10 +20,7 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_ECDSA_H__
-#define __TINC_ECDSA_H__
-
-#ifndef __TINC_ECDSA_INTERNAL__
+#ifndef TINC_ECDSA_INTERNAL
 typedef struct ecdsa ecdsa_t;
 #endif
 

diff --git a/src/ecdsagen.h b/src/ecdsagen.h
index 12e5c0032c5c25b7b7fa209a7570daf45675de61..95ec7417fa570a3a41ba0278f02fed0023cadcd3 100644 (file)
--- a/src/ecdsagen.h
+++ b/src/ecdsagen.h
@@ -1,3 +1,6 @@
+#ifndef TINC_ECDSAGEN_H
+#define TINC_ECDSAGEN_H
+
 /*
     ecdsagen.h -- ECDSA key generation and export
     Copyright (C) 2011-2013 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_ECDSAGEN_H__
-#define __TINC_ECDSAGEN_H__
-
 #include "ecdsa.h"
 
 extern ecdsa_t *ecdsa_generate(void) __attribute__ ((__malloc__));

diff --git a/src/ed25519/ecdh.c b/src/ed25519/ecdh.c
index d0cd7e0aae80168b03940a13c880513f9599ef89..9adf19fe1fb3b2ece8d90c1725197229d6b0f9d5 100644 (file)
--- a/src/ed25519/ecdh.c
+++ b/src/ed25519/ecdh.c
@@ -21,7 +21,7 @@
 
 #include "ed25519.h"
 
-#define __TINC_ECDH_INTERNAL__
+#define TINC_ECDH_INTERNAL
 typedef struct ecdh_t {
        uint8_t private[64];
 } ecdh_t;

diff --git a/src/ed25519/ecdsa.c b/src/ed25519/ecdsa.c
index f8aafe460b128868f9f63dd36c0ad47b0ebeead4..05b855011a2960b0279136f1d016a310c3a2cd95 100644 (file)
--- a/src/ed25519/ecdsa.c
+++ b/src/ed25519/ecdsa.c
@@ -21,7 +21,7 @@
 
 #include "ed25519.h"
 
-#define __TINC_ECDSA_INTERNAL__
+#define TINC_ECDSA_INTERNAL
 typedef struct {
        uint8_t private[64];
        uint8_t public[32];

diff --git a/src/ed25519/ecdsagen.c b/src/ed25519/ecdsagen.c
index d2a14890059dc0be5cf649273c656dfd968d119c..23ef6e975db03cb3ff533548ef12e9e006587a19 100644 (file)
--- a/src/ed25519/ecdsagen.c
+++ b/src/ed25519/ecdsagen.c
@@ -21,7 +21,7 @@
 
 #include "ed25519.h"
 
-#define __TINC_ECDSA_INTERNAL__
+#define TINC_ECDSA_INTERNAL
 typedef struct {
        uint8_t private[64];
        uint8_t public[32];

diff --git a/src/ed25519/fixedint.h b/src/ed25519/fixedint.h
index 8abced09accfa9a180c502b82f462ab63246383c..e9f973c87ac195af7835fe3c64446e4e1d552de8 100644 (file)
--- a/src/ed25519/fixedint.h
+++ b/src/ed25519/fixedint.h
@@ -1,12 +1,12 @@
+#ifndef TINC_FIXEDINT_H
+#define TINC_FIXEDINT_H
+
 /*
     Portable header to provide the 32 and 64 bits type.
 
     Not a compatible replacement for <stdint.h>, do not blindly use it as such.
 */
 
-#ifndef __TINC_FIXEDINT_H__
-#define __TINC_FIXEDINT_H__
-
 #if ((defined(__STDC__) && __STDC__ && __STDC_VERSION__ >= 199901L) || (defined(__WATCOMC__) && (defined(_STDINT_H_INCLUDED) || __WATCOMC__ >= 1250)) || (defined(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_) || defined(__UINT_FAST64_TYPE__)) )) && !defined(FIXEDINT_H_INCLUDED)
     #include <stdint.h>
     #define FIXEDINT_H_INCLUDED

diff --git a/src/edge.h b/src/edge.h
index ed46b8a428fd65b0bf3059e368f8246033b3a505..274e5d92f7d659b587c7456b86a23a0162f3d2eb 100644 (file)
--- a/src/edge.h
+++ b/src/edge.h
@@ -1,3 +1,6 @@
+#ifndef TINC_EDGE_H
+#define TINC_EDGE_H
+
 /*
     edge.h -- header for edge.c
     Copyright (C) 2001-2012 Guus Sliepen <guus@tinc-vpn.org>,
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_EDGE_H__
-#define __TINC_EDGE_H__
-
 #include "splay_tree.h"
 #include "connection.h"
 #include "net.h"
@@ -52,4 +52,4 @@ extern void edge_del(edge_t *);
 extern edge_t *lookup_edge(struct node_t *, struct node_t *);
 extern bool dump_edges(struct connection_t *);
 
-#endif /* __TINC_EDGE_H__ */
+#endif

diff --git a/src/ethernet.h b/src/ethernet.h
index 0b4a1db06b216eb645ee3fc21efcedec108e2874..6ee2d389c07df153636bbe8ac1637e783aa03ddd 100644 (file)
--- a/src/ethernet.h
+++ b/src/ethernet.h
@@ -1,3 +1,6 @@
+#ifndef TINC_ETHERNET_H
+#define TINC_ETHERNET_H
+
 /*
     ethernet.h -- missing Ethernet related definitions
     Copyright (C) 2005 Ivo Timmermans
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_ETHERNET_H__
-#define __TINC_ETHERNET_H__
-
 #ifndef ETH_ALEN
 #define ETH_ALEN 6
 #endif
@@ -99,4 +99,4 @@ struct  ether_arp {
 #define arp_op ea_hdr.ar_op
 #endif
 
-#endif /* __TINC_ETHERNET_H__ */
+#endif

diff --git a/src/event.h b/src/event.h
index 0ff8e01c0ca7a0804351f88aaee7971b0983d526..e7def9132c6afb0af34215e84ac758f50fbc53c5 100644 (file)
--- a/src/event.h
+++ b/src/event.h
@@ -1,3 +1,6 @@
+#ifndef TINC_EVENT_H
+#define TINC_EVENT_H
+
 /*
     event.h -- I/O, timeout and signal event handling
     Copyright (C) 2012-2013 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_EVENT_H__
-#define __TINC_EVENT_H__
-
 #include "splay_tree.h"
 
 #define IO_READ 1

diff --git a/src/fsck.h b/src/fsck.h
index 51e4f554cc3e4a0b22b9ba8776a26a1fb50beb0a..3e0b4ca1c33db4cf15f5587c29428e148272d67b 100644 (file)
--- a/src/fsck.h
+++ b/src/fsck.h
@@ -1,3 +1,6 @@
+#ifndef TINC_FSCK_H
+#define TINC_FSCK_H
+
 /*
     fsck.h -- header for fsck.c.
     Copyright (C) 2012 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,10 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_FSCK_H__
-#define __TINC_FSCK_H__
-
 extern int fsck(const char *argv0);
 
 #endif
-

diff --git a/src/gcrypt/cipher.h b/src/gcrypt/cipher.h
index 389bb1151d643727a2b2534e9137e7e7789792f9..64cb42dd1d3ad65aa1c7ec8cecf98680170c4650 100644 (file)
--- a/src/gcrypt/cipher.h
+++ b/src/gcrypt/cipher.h
@@ -1,3 +1,6 @@
+#ifndef TINC_GCRYPT_CIPHER_H
+#define TINC_GCRYPT_CIPHER_H
+
 /*
     cipher.h -- header file cipher.c
     Copyright (C) 2007-2009 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_CIPHER_H__
-#define __TINC_CIPHER_H__
-
 #include <gcrypt.h>
 
 #define CIPHER_MAX_BLOCK_SIZE 32

diff --git a/src/gcrypt/crypto.h b/src/gcrypt/crypto.h
index 71df50c0091a6fe021a3555b7975c5ec8e42b765..c77d4f46bf40d1bf3790856e8b193669fab11105 100644 (file)
--- a/src/gcrypt/crypto.h
+++ b/src/gcrypt/crypto.h
@@ -1,3 +1,6 @@
+#ifndef TINC_GCRYPT_CRYPTO_H
+#define TINC_GCRYPT_CRYPTO_H
+
 /*
     crypto.h -- header for crypto.c
     Copyright (C) 2007-2009 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_CRYPTO_H__
-#define __TINC_CRYPTO_H__
-
 extern void crypto_init();
 extern void crypto_exit();
 extern void randomize(void *, size_t);

diff --git a/src/gcrypt/digest.h b/src/gcrypt/digest.h
index 9f0d7d85e8aa79bc1e5c851b42096eaf423ec752..42404fcd95a8077244cfeb54e21528d46de90ded 100644 (file)
--- a/src/gcrypt/digest.h
+++ b/src/gcrypt/digest.h
@@ -1,3 +1,6 @@
+#ifndef TINC_GCRYPT_DIGEST_H
+#define TINC_GCRYPT_DIGEST_H
+
 /*
     digest.h -- header file digest.c
     Copyright (C) 2007-2009 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_DIGEST_H__
-#define __TINC_DIGEST_H__
-
 #include <gcrypt.h>
 
 #define DIGEST_MAX_SIZE 64

diff --git a/src/gcrypt/rsa.h b/src/gcrypt/rsa.h
index 143f01537ed4f3c2ef80c29f14d57ebb6ef87fc7..2ea5e6500662902d58f6a9f252eac5cd8775cda5 100644 (file)
--- a/src/gcrypt/rsa.h
+++ b/src/gcrypt/rsa.h
@@ -1,3 +1,6 @@
+#ifndef TINC_GCRYPT_RSA_H
+#define TINC_GCRYPT_RSA_H
+
 /*
     rsa.h -- RSA key handling
     Copyright (C) 2007 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_RSA_H__
-#define __TINC_RSA_H__
-
 #include <gcrypt.h>
 
 typedef struct rsa {

diff --git a/src/gcrypt/rsagen.h b/src/gcrypt/rsagen.h
index 422d1560f55d671e7abd08f9cc7a970fefddef10..4b491173b17144770e65aabdcd6a2a3295d9720e 100644 (file)
--- a/src/gcrypt/rsagen.h
+++ b/src/gcrypt/rsagen.h
@@ -1,3 +1,6 @@
+#ifndef TINC_GCRYPT_RSAGEN_H
+#define TINC_GCRYPT_RSAGEN_H
+
 /*
     rsagen.h -- RSA key generation and export
     Copyright (C) 2008 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_RSAGEN_H__
-#define __TINC_RSAGEN_H__
-
 #include "rsa.h"
 
 extern bool rsa_generate(rsa_t *rsa, size_t bits, unsigned long exponent);

diff --git a/src/getopt.h b/src/getopt.h
index ddf6fdda5cbe8b31f3719ff97286933c8933ecdf..7cac1bd5e506e2d3109a94c5581498fcf540d9b7 100644 (file)
--- a/src/getopt.h
+++ b/src/getopt.h
@@ -1,3 +1,6 @@
+#ifndef TINC_GETOPT_H
+#define TINC_GETOPT_H
+
 /* Declarations for getopt.
    Copyright (C) 1989,90,91,92,93,94,96,97 Free Software Foundation, Inc.
 
@@ -130,4 +133,4 @@ extern int _getopt_internal ();
 }
 #endif
 
-#endif /* _GETOPT_H */
+#endif

diff --git a/src/graph.h b/src/graph.h
index fa521f53fbf2b81767b0f8ac28e0d6ad799d469d..fafffcb0c1bac02a8d697d1d45a803b1a3e26599 100644 (file)
--- a/src/graph.h
+++ b/src/graph.h
@@ -1,3 +1,6 @@
+#ifndef TINC_GRAPH_H
+#define TINC_GRAPH_H
+
 /*
     graph.h -- header for graph.c
     Copyright (C) 2001-2012 Guus Sliepen <guus@tinc-vpn.org>,
@@ -18,10 +21,7 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_GRAPH_H__
-#define __TINC_GRAPH_H__
-
 extern void graph(void);
 extern void dump_graph(void);
 
-#endif /* __TINC_GRAPH_H__ */
+#endif

diff --git a/src/hash.h b/src/hash.h
index 30a15fb270ca0e5bc8eaedee620bc3abf9cf0cf0..a5ae2e9d42d037225a14918b48e6c1ce3df286f3 100644 (file)
--- a/src/hash.h
+++ b/src/hash.h
@@ -1,3 +1,6 @@
+#ifndef TINC_HASH_H
+#define TINC_HASH_H
+
 /*
     hash.h -- header file for hash.c
     Copyright (C) 2012 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_HASH_H__
-#define __TINC_HASH_H__
-
 typedef struct hash_t {
        size_t n;
        size_t size;
@@ -39,4 +39,4 @@ extern void *hash_search_or_insert(hash_t *, const void *key, const void *value)
 extern void hash_clear(hash_t *);
 extern void hash_resize(hash_t *, size_t n);
 
-#endif /* __TINC_HASH_H__ */
+#endif

diff --git a/src/have.h b/src/have.h
index faa4c9e0f38be54d7d9448b08646577ccba5e046..402f80289d7b550e6af5b9900f74bc0a61a950e7 100644 (file)
--- a/src/have.h
+++ b/src/have.h
@@ -1,3 +1,6 @@
+#ifndef TINC_HAVE_H
+#define TINC_HAVE_H
+
 /*
     have.h -- include headers which are known to exist
     Copyright (C) 1998-2005 Ivo Timmermans
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_HAVE_H__
-#define __TINC_HAVE_H__
-
 #ifdef HAVE_MINGW
 #define WINVER WindowsXP
 #define WIN32_LEAN_AND_MEAN
@@ -213,4 +213,4 @@
 #define SLASH "/"
 #endif
 
-#endif /* __TINC_SYSTEM_H__ */
+#endif

diff --git a/src/ifconfig.h b/src/ifconfig.h
index 3dbf9f6895926f3dae17127451545c07221f2636..854780b7fd1093e3487ee9cc2110abda23a20975 100644 (file)
--- a/src/ifconfig.h
+++ b/src/ifconfig.h
@@ -1,3 +1,6 @@
+#ifndef TINC_IFCONFIG_H
+#define TINC_IFCONFIG_H
+
 /*
     ifconfig.h -- header for ifconfig.c.
     Copyright (C) 2016 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_IFCONFIG_H__
-#define __TINC_IFCONFIG_H__
-
 extern void ifconfig_dhcp(FILE *out);
 extern void ifconfig_dhcp6(FILE *out);
 extern void ifconfig_slaac(FILE *out);

diff --git a/src/info.h b/src/info.h
index a3f387ff61c0b0f04e78dfd803f15af78e7fb2c2..1b323e019bfd7b9025c01194e999a98f6d2f7dc6 100644 (file)
--- a/src/info.h
+++ b/src/info.h
@@ -1,3 +1,6 @@
+#ifndef TINC_INFO_H
+#define TINC_INFO_H
+
 /*
     info.h -- header for info.c.
     Copyright (C) 2012 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,11 +20,7 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_INFO_H__
-#define __TINC_INFO_H__
-
 extern int info(int fd, const char *item);
 extern char *strip_weight(char *);
 
 #endif
-

diff --git a/src/invitation.h b/src/invitation.h
index 3d017e92ef32ce50d02a509eec53a7aa242c8ef1..621baab923d3e60a8e4f7941091dedbcd85e1d69 100644 (file)
--- a/src/invitation.h
+++ b/src/invitation.h
@@ -1,3 +1,6 @@
+#ifndef TINC_INVITATION_H
+#define TINC_INVITATION_H
+
 /*
     invitation.h -- header for invitation.c.
     Copyright (C) 2013 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_INVITATION_H__
-#define __TINC_INVITATION_H__
-
 bool recvdata(int fd, char *data, size_t len);
 int cmd_invite(int argc, char *argv[]);
 int cmd_join(int argc, char *argv[]);

diff --git a/src/ipv4.h b/src/ipv4.h
index 997b88d8998890bd1835ddcae8641a1cfe0cd4f4..7ad7e01be32a9c032e4f474f0cbf1f6c43c7722f 100644 (file)
--- a/src/ipv4.h
+++ b/src/ipv4.h
@@ -1,3 +1,6 @@
+#ifndef TINC_IPV4_H
+#define TINC_IPV4_H
+
 /*
     ipv4.h -- missing IPv4 related definitions
     Copyright (C) 2005 Ivo Timmermans
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_IPV4_H__
-#define __TINC_IPV4_H__
-
 #ifndef AF_INET
 #define AF_INET 2
 #endif
@@ -146,4 +146,4 @@ struct icmp {
 } __attribute__ ((__gcc_struct__, __packed__));
 #endif
 
-#endif /* __TINC_IPV4_H__ */
+#endif

diff --git a/src/ipv6.h b/src/ipv6.h
index cc2c5b6d9d56c49f26295178153e898f00144d3b..b57ba74b5d8b0ba9c76b6f3a0dc8b5d1eac73143 100644 (file)
--- a/src/ipv6.h
+++ b/src/ipv6.h
@@ -1,3 +1,6 @@
+#ifndef TINC_IPV6_H
+#define TINC_IPV6_H
+
 /*
     ipv6.h -- missing IPv6 related definitions
     Copyright (C) 2005 Ivo Timmermans
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_IPV6_H__
-#define __TINC_IPV6_H__
-
 #ifndef AF_INET6
 #define AF_INET6 10
 #endif
@@ -104,4 +104,4 @@ struct nd_opt_hdr {
 } __attribute__ ((__gcc_struct__, __packed__));
 #endif
 
-#endif /* __TINC_IPV6_H__ */
+#endif

diff --git a/src/list.h b/src/list.h
index b0e7a845240124663f77812e840b47e1570c3f0b..489c8d100f173edc8efe7b9517d9fd33f3eba5a2 100644 (file)
--- a/src/list.h
+++ b/src/list.h
@@ -1,3 +1,6 @@
+#ifndef TINC_LIST_H
+#define TINC_LIST_H
+
 /*
     list.h -- header file for list.c
     Copyright (C) 2000-2005 Ivo Timmermans
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_LIST_H__
-#define __TINC_LIST_H__
-
 typedef struct list_node_t {
        struct list_node_t *prev;
        struct list_node_t *next;
@@ -87,4 +87,4 @@ extern void list_foreach_node(list_t *, list_action_node_t);
  */
 #define list_each(type, item, list) (type *item = (type *)1; item; item = NULL) for(list_node_t *node = (list)->head, *next; item = node ? node->data : NULL, next = node ? node->next : NULL, node; node = next)
 
-#endif /* __TINC_LIST_H__ */
+#endif

diff --git a/src/logger.h b/src/logger.h
index f4f46f9d96009391e770d5cff64ac2501c1e4f48..a14b909f2672dbd2a3d9d79d39573af2552058c0 100644 (file)
--- a/src/logger.h
+++ b/src/logger.h
@@ -1,3 +1,6 @@
+#ifndef TINC_LOGGER_H
+#define TINC_LOGGER_H
+
 /*
     logger.h -- header file for logger.c
     Copyright (C) 1998-2005 Ivo Timmermans
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_LOGGER_H__
-#define __TINC_LOGGER_H__
-
 typedef enum debug_t {
        DEBUG_NOTHING = 0,              /* Quiet mode, only show starting/stopping of the daemon */
        DEBUG_ALWAYS = 0,
@@ -75,4 +75,4 @@ extern void reopenlogger(void);
 extern void logger(int, int, const char *, ...) __attribute__ ((__format__(printf, 3, 4)));
 extern void closelogger(void);
 
-#endif /* __TINC_LOGGER_H__ */
+#endif

diff --git a/src/meta.h b/src/meta.h
index 8b00a5ab64b3f7435a38e012d48a59bcf25b6e09..52da7530e77fd77cade8671512792b28eb2a8dc1 100644 (file)
--- a/src/meta.h
+++ b/src/meta.h
@@ -1,3 +1,6 @@
+#ifndef TINC_META_H
+#define TINC_META_H
+
 /*
     meta.h -- header for meta.c
     Copyright (C) 2000-2014 Guus Sliepen <guus@tinc-vpn.org>,
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_META_H__
-#define __TINC_META_H__
-
 #include "connection.h"
 
 extern bool send_meta(struct connection_t *, const char *, int);
@@ -30,4 +30,4 @@ extern bool receive_meta_sptps(void *, uint8_t, const void *, uint16_t);
 extern void broadcast_meta(struct connection_t *, const char *, int);
 extern bool receive_meta(struct connection_t *);
 
-#endif /* __TINC_META_H__ */
+#endif

diff --git a/src/mingw/common.h b/src/mingw/common.h
index 6e5e75cebf137f7a5950a9c502b131eea275feb7..f16744b14981611ad26f57912c38a2904fbf805c 100644 (file)
--- a/src/mingw/common.h
+++ b/src/mingw/common.h
@@ -1,3 +1,6 @@
+#ifndef TINC_MINGW_COMMON_H
+#define TINC_MINGW_COMMON_H
+
 /*
  *  TAP-Win32 -- A kernel driver to provide virtual tap device functionality
  *               on Windows.  Originally derived from the CIPE-Win32
@@ -73,3 +76,5 @@
 //=========================================================
 
 #define TAP_COMPONENT_ID "tap0801"
+
+#endif

diff --git a/src/names.h b/src/names.h
index e6b99c56d630daa744da56b1b63f59a41a7d5a78..f10968661e3bc5574c705461d1653c7efd668747 100644 (file)
--- a/src/names.h
+++ b/src/names.h
@@ -1,3 +1,6 @@
+#ifndef TINC_NAMES_H
+#define TINC_NAMES_H
+
 /*
     names.h -- header for names.c
     Copyright (C) 1998-2005 Ivo Timmermans
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_NAMES_H__
-#define __TINC_NAMES_H__
-
 extern char *confdir;
 extern char *confbase;
 extern bool confbase_given;
@@ -35,4 +35,4 @@ extern char *program_name;
 extern void make_names(bool daemon);
 extern void free_names(void);
 
-#endif /* __TINC_NAMES_H__ */
+#endif

diff --git a/src/net.h b/src/net.h
index 69ca48877b9ff590ab433464c66db44c97ef3ef3..6d4dfc892e232dd32c8e27a379e84c85b034291c 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -1,3 +1,6 @@
+#ifndef TINC_NET_H
+#define TINC_NET_H
+
 /*
     net.h -- header for net.c
     Copyright (C) 1998-2005 Ivo Timmermans
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_NET_H__
-#define __TINC_NET_H__
-
 #include "ipv6.h"
 #include "cipher.h"
 #include "digest.h"
@@ -225,4 +225,4 @@ extern void try_tx(struct node_t *n, bool);
 #define closesocket(s) close(s)
 #endif
 
-#endif /* __TINC_NET_H__ */
+#endif

diff --git a/src/netutl.h b/src/netutl.h
index 2e2f293614b64099c44e5022402183da9e06d7c2..90aa54da83187d56c2c37b940900e3c404afa89a 100644 (file)
--- a/src/netutl.h
+++ b/src/netutl.h
@@ -1,3 +1,6 @@
+#ifndef TINC_NETUTL_H
+#define TINC_NETUTL_H
+
 /*
     netutl.h -- header file for netutl.c
     Copyright (C) 1998-2005 Ivo Timmermans
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_NETUTL_H__
-#define __TINC_NETUTL_H__
-
 #include "net.h"
 
 extern bool hostnames;
@@ -36,4 +36,4 @@ extern void sockaddrfree(sockaddr_t *);
 extern void sockaddrcpy(sockaddr_t *, const sockaddr_t *);
 extern void sockaddr_setport(sockaddr_t *, const char *);
 
-#endif /* __TINC_NETUTL_H__ */
+#endif

diff --git a/src/node.h b/src/node.h
index b48fe88f878704031538bb59ad3595d5c0b6a286..ad8b728f535f1069400d36bb752c21f4ea7c7148 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -1,3 +1,6 @@
+#ifndef TINC_NODE_H
+#define TINC_NODE_H
+
 /*
     node.h -- header for node.c
     Copyright (C) 2001-2013 Guus Sliepen <guus@tinc-vpn.org>,
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_NODE_H__
-#define __TINC_NODE_H__
-
 #include "splay_tree.h"
 #include "cipher.h"
 #include "connection.h"
@@ -128,4 +128,4 @@ extern bool dump_nodes(struct connection_t *);
 extern bool dump_traffic(struct connection_t *);
 extern void update_node_udp(node_t *, const sockaddr_t *);
 
-#endif /* __TINC_NODE_H__ */
+#endif

diff --git a/src/openssl/digest.h b/src/openssl/digest.h
index 0a32707eadbf9de4785299d505a41f1200a454e6..1b1389d1b0f91417e6a1705d186dc9d2064e9f3c 100644 (file)
--- a/src/openssl/digest.h
+++ b/src/openssl/digest.h
@@ -1,3 +1,6 @@
+#ifndef TINC_OPENSSL_DIGEST_H
+#define TINC_OPENSSL_DIGEST_H
+
 /*
     digest.h -- header file digest.c
     Copyright (C) 2013 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_OPENSSL_DIGEST_H__
-#define __TINC_OPENSSL_DIGEST_H__
-
 #include <openssl/evp.h>
 
 struct digest {

diff --git a/src/openssl/rsa.c b/src/openssl/rsa.c
index 3033bcd762d9e19d705cd8d094444b42f87d6ba8..3543df3050f3d7decaa7ee2575a6c8e831ce426f 100644 (file)
--- a/src/openssl/rsa.c
+++ b/src/openssl/rsa.c
@@ -22,7 +22,7 @@
 #include <openssl/pem.h>
 #include <openssl/err.h>
 
-#define __TINC_RSA_INTERNAL__
+#define TINC_RSA_INTERNAL
 typedef RSA rsa_t;
 
 #include "../logger.h"

diff --git a/src/openssl/rsagen.c b/src/openssl/rsagen.c
index b7eb6299a05b3d854fec20f4bc15d81137240606..78a22d92b391d56939fd7ca9295051e290ac0290 100644 (file)
--- a/src/openssl/rsagen.c
+++ b/src/openssl/rsagen.c
@@ -22,7 +22,7 @@
 #include <openssl/pem.h>
 #include <openssl/err.h>
 
-#define __TINC_RSA_INTERNAL__
+#define TINC_RSA_INTERNAL
 typedef RSA rsa_t;
 
 #include "../logger.h"

diff --git a/src/prf.h b/src/prf.h
index ef4b99bbf8639a525ff2d221abcd7bf27710c33d..6f5448bb3b36395155c605e47ce0856213918876 100644 (file)
--- a/src/prf.h
+++ b/src/prf.h
@@ -1,3 +1,6 @@
+#ifndef TINC_PRF_H
+#define TINC_PRF_H
+
 /*
     prf.h -- header file for prf.c
     Copyright (C) 2011-2013 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_PRF_H__
-#define __TINC_PRF_H__
-
 extern bool prf(const char *secret, size_t secretlen, char *seed, size_t seedlen, char *out, size_t outlen) __attribute__ ((__warn_unused_result__));
 
 #endif

diff --git a/src/process.h b/src/process.h
index ce2daed523d909f8f9738bcf5628f45fe46150fe..93ef5e9c91ee7f03c5675bcea0cb8d1f9c426a3f 100644 (file)
--- a/src/process.h
+++ b/src/process.h
@@ -1,3 +1,6 @@
+#ifndef TINC_PROCESS_H
+#define TINC_PROCESS_H
+
 /*
     process.h -- header file for process.c
     Copyright (C) 1999-2005 Ivo Timmermans,
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_PROCESS_H__
-#define __TINC_PROCESS_H__
-
 extern bool do_detach;
 extern bool sigalrm;
 
@@ -33,4 +33,4 @@ extern io_t stop_io;
 extern bool init_service(void);
 #endif
 
-#endif /* __TINC_PROCESS_H__ */
+#endif

diff --git a/src/protocol.h b/src/protocol.h
index 8ce4e0d3b718a3644ab7bf580ed1a077fc08a68a..c0e6f4fa61b3d8ebc379420d1cad0220549c7592 100644 (file)
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -1,3 +1,6 @@
+#ifndef TINC_PROTOCOL_H
+#define TINC_PROTOCOL_H
+
 /*
     protocol.h -- header for protocol.c
     Copyright (C) 1999-2005 Ivo Timmermans,
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_PROTOCOL_H__
-#define __TINC_PROTOCOL_H__
-
 #include "ecdsa.h"
 
 /* Protocol version. Different major versions are incompatible. */
@@ -138,4 +138,4 @@ extern bool control_h(struct connection_t *, const char *);
 extern bool udp_info_h(struct connection_t *, const char *);
 extern bool mtu_info_h(struct connection_t *, const char *);
 
-#endif /* __TINC_PROTOCOL_H__ */
+#endif

diff --git a/src/route.h b/src/route.h
index a0121d7d9f2562184d5e14465fa329a216496b01..bb4f7686d5e4f22f83eb7acec79f813472a06171 100644 (file)
--- a/src/route.h
+++ b/src/route.h
@@ -1,3 +1,6 @@
+#ifndef TINC_ROUTE_H
+#define TINC_ROUTE_H
+
 /*
     route.h -- header file for route.c
     Copyright (C) 2000-2005 Ivo Timmermans
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_ROUTE_H__
-#define __TINC_ROUTE_H__
-
 #include "net.h"
 #include "node.h"
 
@@ -56,4 +56,4 @@ extern mac_t mymac;
 
 extern void route(struct node_t *, struct vpn_packet_t *);
 
-#endif /* __TINC_ROUTE_H__ */
+#endif

diff --git a/src/rsa.h b/src/rsa.h
index f4290d443377e920da06d52a1eb949747ec32dae..dc849aee3cc69b5ae7194308da1fe3c3359b78c9 100644 (file)
--- a/src/rsa.h
+++ b/src/rsa.h
@@ -1,3 +1,6 @@
+#ifndef TINC_RSA_H
+#define TINC_RSA_H
+
 /*
     rsa.h -- RSA key handling
     Copyright (C) 2007-2013 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,10 +20,7 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_RSA_H__
-#define __TINC_RSA_H__
-
-#ifndef __TINC_RSA_INTERNAL__
+#ifndef TINC_RSA_INTERNAL
 typedef struct rsa rsa_t;
 #endif
 

diff --git a/src/rsagen.h b/src/rsagen.h
index 58ce29f0cb20da3a18469b6168b0481ec3c73cb4..83349f91454949e0d95d90b2c75fafb9cdbf7b92 100644 (file)
--- a/src/rsagen.h
+++ b/src/rsagen.h
@@ -1,3 +1,6 @@
+#ifndef TINC_RSAGEN_H
+#define TINC_RSAGEN_H
+
 /*
     rsagen.h -- RSA key generation and export
     Copyright (C) 2008-2013 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_RSAGEN_H__
-#define __TINC_RSAGEN_H__
-
 #include "rsa.h"
 
 extern rsa_t *rsa_generate(size_t bits, unsigned long exponent) __attribute__ ((__malloc__));

diff --git a/src/script.h b/src/script.h
index 2e26418d46be4f72f1e91ea17d052c348c53b52f..5172034932111062c2a5b3c9009438ac588d9ed5 100644 (file)
--- a/src/script.h
+++ b/src/script.h
@@ -1,3 +1,6 @@
+#ifndef TINC_SCRIPT_H
+#define TINC_SCRIPT_H
+
 /*
     script.h -- header file for script.c
     Copyright (C) 1999-2005 Ivo Timmermans,
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_SCRIPT_H__
-#define __TINC_SCRIPT_H__
-
 typedef struct environment {
        int n;
        int size;
@@ -35,4 +35,4 @@ extern void environment_exit(environment_t *env);
 
 extern bool execute_script(const char *name, environment_t *env);
 
-#endif /* __TINC_SCRIPT_H__ */
+#endif

diff --git a/src/splay_tree.h b/src/splay_tree.h
index 3ddf21727a6aec819951c94310e996997a39c607..d360fc3c4cdc28945f9c4806416d72399d65d3ef 100644 (file)
--- a/src/splay_tree.h
+++ b/src/splay_tree.h
@@ -1,3 +1,6 @@
+#ifndef TINC_SPLAY_TREE_H
+#define TINC_SPLAY_TREE_H
+
 /*
     splay_tree.h -- header file for splay_tree.c
     Copyright (C) 2004-2013 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,10 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-
-#ifndef __SPLAY_TREE_H__
-#define __SPLAY_TREE_H__
-
 typedef struct splay_node_t {
 
        /* Linked list part */

diff --git a/src/sptps.h b/src/sptps.h
index 75a95651bdfc083cc1b24939b576db38a23fa971..f5686f4e8f1ddf2445385b428b3fb09605ebec11 100644 (file)
--- a/src/sptps.h
+++ b/src/sptps.h
@@ -1,3 +1,6 @@
+#ifndef TINC_SPTPS_H
+#define TINC_SPTPS_H
+
 /*
     sptps.h -- Simple Peer-to-Peer Security
     Copyright (C) 2011-2014 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __SPTPS_H__
-#define __SPTPS_H__
-
 #include "system.h"
 
 #include "chacha-poly1305/chacha-poly1305.h"

diff --git a/src/subnet.h b/src/subnet.h
index 6184e6b77794639913731f14ec6a4b15b9e4952f..5bd5ff0009171f95d8d41f43141a91eaa1fe6279 100644 (file)
--- a/src/subnet.h
+++ b/src/subnet.h
@@ -1,3 +1,6 @@
+#ifndef TINC_SUBNET_H
+#define TINC_SUBNET_H
+
 /*
     subnet.h -- header for subnet.c
     Copyright (C) 2000-2012 Guus Sliepen <guus@tinc-vpn.org>,
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_SUBNET_H__
-#define __TINC_SUBNET_H__
-
 #include "net.h"
 #include "node.h"
 
@@ -88,4 +88,4 @@ extern subnet_t *lookup_subnet_ipv6(const ipv6_t *);
 extern bool dump_subnets(struct connection_t *);
 extern void subnet_cache_flush(void);
 
-#endif /* __TINC_SUBNET_H__ */
+#endif

diff --git a/src/system.h b/src/system.h
index 2201ff312729d9fd0c3db4ee676a7cbba297c9a6..f9675f95961f773d44adb9b223108184f93b0275 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -1,3 +1,6 @@
+#ifndef TINC_SYSTEM_H
+#define TINC_SYSTEM_H
+
 /*
     system.h -- system headers
     Copyright (C) 1998-2005 Ivo Timmermans
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_SYSTEM_H__
-#define __TINC_SYSTEM_H__
-
 #include "../config.h"
 
 #include "have.h"
@@ -33,4 +33,4 @@
 
 #include "dropin.h"
 
-#endif /* __TINC_SYSTEM_H__ */
+#endif

diff --git a/src/tincctl.h b/src/tincctl.h
index 6628f2bbf80d12d07d53e6c44c917f39afa8adbc..db7f45a37bed2c41c7db8c0dad61d7a1153a29ed 100644 (file)
--- a/src/tincctl.h
+++ b/src/tincctl.h
@@ -1,3 +1,6 @@
+#ifndef TINC_TINCCTL_H
+#define TINC_TINCCTL_H
+
 /*
     tincctl.h -- header for tincctl.c.
     Copyright (C) 2011-2016 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_TINCCTL_H__
-#define __TINC_TINCCTL_H__
-
 extern bool tty;
 extern bool force;
 extern char line[4096];
@@ -53,4 +53,3 @@ extern FILE *fopenmask(const char *filename, const char *mode, mode_t perms);
 extern ecdsa_t *get_pubkey(FILE *f);
 
 #endif
-

diff --git a/src/top.h b/src/top.h
index b3a264dafcc51f4a226d53eae42b18e81afaa680..612d0d8dffa56426f891b720b979c6cb0d2a2b7e 100644 (file)
--- a/src/top.h
+++ b/src/top.h
@@ -1,3 +1,6 @@
+#ifndef TINC_TOP_H
+#define TINC_TOP_H
+
 /*
     top.h -- header for top.c.
     Copyright (C) 2011 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,10 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_TOP_H__
-#define __TINC_TOP_H__
-
 extern void top(int fd);
 
 #endif
-

diff --git a/src/upnp.h b/src/upnp.h
index dd0531bb1c3cb1f0005f0dd6597d2c330bb8f937..485734227b0a5166039c7bbde0df7bf6882b28ff 100644 (file)
--- a/src/upnp.h
+++ b/src/upnp.h
@@ -1,3 +1,6 @@
+#ifndef TINC_UPNP_H
+#define TINC_UPNP_H
+
 /*
     upnp.h -- UPnP-IGD client
     Copyright (C) 2015 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __UPNP_H__
-#define __UPNP_H__
-
 #include "system.h"
 
 extern void upnp_init(bool, bool);

diff --git a/src/utils.h b/src/utils.h
index 5c387bdb8fe333d6272f02049d6b672eb7105e8a..7b16bc61ee3883f4dcb8d819c3ab50757b799b85 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -1,3 +1,6 @@
+#ifndef TINC_UTILS_H
+#define TINC_UTILS_H
+
 /*
     utils.h -- header file for utils.c
     Copyright (C) 1999-2005 Ivo Timmermans
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_UTILS_H__
-#define __TINC_UTILS_H__
-
 extern int hex2bin(const char *src, void *dst, int length);
 extern int bin2hex(const void *src, char *dst, int length);
 
@@ -54,4 +54,4 @@ extern bool check_id(const char *);
 extern bool check_netname(const char *, bool strict);
 char *replace_name(const char *name);
 
-#endif /* __TINC_UTILS_H__ */
+#endif

diff --git a/src/version.h b/src/version.h
index 9cbecb6e51e62d56d6bc5479529c9454211fe059..f34373e53a60bc92c466101daf5f0e2e331c62e1 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -1,3 +1,6 @@
+#ifndef TINC_VERSION_H
+#define TINC_VERSION_H
+
 /*
     version.h -- header for version.c
     Copyright (C) 2014      Etienne Dechamps <etienne@edechamps.fr>
@@ -17,11 +20,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_VERSION_H__
-#define __TINC_VERSION_H__
-
 extern const char* const BUILD_DATE;
 extern const char* const BUILD_TIME;
 extern const char* const BUILD_VERSION;
 
-#endif /* __TINC_VERSION_H__ */
+#endif

diff --git a/src/xalloc.h b/src/xalloc.h
index 28960fbd4e06efccb19ba01a5dfc49c32da353fd..34dac3ccfe260b988fb33abce72b71f3f2508eff 100644 (file)
--- a/src/xalloc.h
+++ b/src/xalloc.h
@@ -1,3 +1,6 @@
+#ifndef TINC_XALLOC_H
+#define TINC_XALLOC_H
+
 /*
    xalloc.h -- malloc and related fuctions with out of memory checking
    Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.
@@ -15,10 +18,8 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation, Inc., Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
-
-#ifndef __TINC_XALLOC_H__
-#define __TINC_XALLOC_H__
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
 
 static inline void *xmalloc(size_t n) __attribute__ ((__malloc__));
 static inline void *xmalloc(size_t n) {