From d4598cc93017e4d7e71a6f854d389dcf6749e8df Mon Sep 17 00:00:00 2001 From: Dirk Engling Date: Fri, 28 Apr 2017 15:41:24 +0200 Subject: Get rid of some warnings regarding header guards --- opentracker.c | 1 + ot_accesslist.h | 4 ++-- ot_clean.h | 4 ++-- ot_fullscrape.h | 4 ++-- ot_http.h | 4 ++-- ot_iovec.h | 4 ++-- ot_livesync.h | 4 ++-- ot_mutex.h | 4 ++-- ot_rijndael.h | 6 ++++-- ot_stats.h | 7 +++++-- ot_sync.h | 4 ++-- ot_udp.h | 4 ++-- ot_vector.h | 4 ++-- scan_urlencoded_query.h | 4 ++-- trackerlogic.h | 4 ++-- 15 files changed, 34 insertions(+), 28 deletions(-) diff --git a/opentracker.c b/opentracker.c index 40ed78e..5b9915f 100644 --- a/opentracker.c +++ b/opentracker.c @@ -48,6 +48,7 @@ static char * g_serverdir; static char * g_serveruser; static unsigned int g_udp_workers; +static void panic( const char *routing ) __attribute__ ((noreturn)); static void panic( const char *routine ) { fprintf( stderr, "%s: %s\n", routine, strerror(errno) ); exit( 111 ); diff --git a/ot_accesslist.h b/ot_accesslist.h index a1e4ad2..b38b91a 100644 --- a/ot_accesslist.h +++ b/ot_accesslist.h @@ -3,8 +3,8 @@ $id$ */ -#ifndef __OT_ACCESSLIST_H__ -#define __OT_ACCESSLIST_H__ +#ifndef OT_ACCESSLIST_H__ +#define OT_ACCESSLIST_H__ #if defined ( WANT_ACCESSLIST_BLACK ) && defined (WANT_ACCESSLIST_WHITE ) # error WANT_ACCESSLIST_BLACK and WANT_ACCESSLIST_WHITE are exclusive. diff --git a/ot_clean.h b/ot_clean.h index cb450c4..956770a 100644 --- a/ot_clean.h +++ b/ot_clean.h @@ -3,8 +3,8 @@ $id$ */ -#ifndef __OT_CLEAN_H__ -#define __OT_CLEAN_H__ +#ifndef OT_CLEAN_H__ +#define OT_CLEAN_H__ /* The amount of time a clean cycle should take */ #define OT_CLEAN_INTERVAL_MINUTES 2 diff --git a/ot_fullscrape.h b/ot_fullscrape.h index b86f8ea..0f920ec 100644 --- a/ot_fullscrape.h +++ b/ot_fullscrape.h @@ -3,8 +3,8 @@ $id$ */ -#ifndef __OT_FULLSCRAPE_H__ -#define __OT_FULLSCRAPE_H__ +#ifndef OT_FULLSCRAPE_H__ +#define OT_FULLSCRAPE_H__ #ifdef WANT_FULLSCRAPE diff --git a/ot_http.h b/ot_http.h index 7e367ed..b1a60e7 100644 --- a/ot_http.h +++ b/ot_http.h @@ -3,8 +3,8 @@ $id$ */ -#ifndef __OT_HTTP_H__ -#define __OT_HTTP_H__ +#ifndef OT_HTTP_H__ +#define OT_HTTP_H__ typedef enum { STRUCT_HTTP_FLAG_WAITINGFORTASK = 1, diff --git a/ot_iovec.h b/ot_iovec.h index 83a1a36..5dbe706 100644 --- a/ot_iovec.h +++ b/ot_iovec.h @@ -3,8 +3,8 @@ $id$ */ -#ifndef __OT_IOVEC_H__ -#define __OT_IOVEC_H__ +#ifndef OT_IOVEC_H__ +#define OT_IOVEC_H__ #include diff --git a/ot_livesync.h b/ot_livesync.h index 1a3ed45..d7490e5 100644 --- a/ot_livesync.h +++ b/ot_livesync.h @@ -3,8 +3,8 @@ $id$ */ -#ifndef __OT_LIVESYNC_H__ -#define __OT_LIVESYNC_H__ +#ifndef OT_LIVESYNC_H__ +#define OT_LIVESYNC_H__ #include "io.h" #include "trackerlogic.h" diff --git a/ot_mutex.h b/ot_mutex.h index b0f0f0b..1079074 100644 --- a/ot_mutex.h +++ b/ot_mutex.h @@ -3,8 +3,8 @@ $id$ */ -#ifndef __OT_MUTEX_H__ -#define __OT_MUTEX_H__ +#ifndef OT_MUTEX_H__ +#define OT_MUTEX_H__ #include diff --git a/ot_rijndael.h b/ot_rijndael.h index 7f57b3f..54725dc 100644 --- a/ot_rijndael.h +++ b/ot_rijndael.h @@ -9,12 +9,14 @@ $id$ */ -#ifndef __OT_RIJNDAEL_H__ -#define __OT_RIJNDAEL_H__ +#ifndef OT_RIJNDAEL_H__ +#define OT_RIJNDAEL_H__ #include int rijndaelKeySetupEnc128(uint32_t rk[44], const uint8_t cipherKey[] ); void rijndaelEncrypt128(const uint32_t rk[44], const uint8_t pt[16], uint8_t ct[16]); +extern const char *g_version_rijndael_c; + #endif diff --git a/ot_stats.h b/ot_stats.h index c73ebec..6a2515b 100644 --- a/ot_stats.h +++ b/ot_stats.h @@ -3,8 +3,8 @@ $id$ */ -#ifndef __OT_STATS_H__ -#define __OT_STATS_H__ +#ifndef OT_STATS_H__ +#define OT_STATS_H__ typedef enum { EVENT_ACCEPT, @@ -46,4 +46,7 @@ size_t stats_return_tracker_version( char *reply ); void stats_init( ); void stats_deinit( ); +extern const char *g_version_rijndael_c; +extern const char *g_version_livesync_c; + #endif diff --git a/ot_sync.h b/ot_sync.h index 81d4d22..441010d 100644 --- a/ot_sync.h +++ b/ot_sync.h @@ -3,8 +3,8 @@ $id$ */ -#ifndef __OT_SYNC_H__ -#define __OT_SYNC_H__ +#ifndef OT_SYNC_H__ +#define OT_SYNC_H__ #ifdef WANT_SYNC_BATCH enum { SYNC_IN, SYNC_OUT }; diff --git a/ot_udp.h b/ot_udp.h index a4f6ce0..974c727 100644 --- a/ot_udp.h +++ b/ot_udp.h @@ -3,8 +3,8 @@ $id$ */ -#ifndef __OT_UDP_H__ -#define __OT_UDP_H__ +#ifndef OT_UDP_H__ +#define OT_UDP_H__ void udp_init( int64 sock, unsigned int worker_count ); int handle_udp6( int64 serversocket, struct ot_workstruct *ws ); diff --git a/ot_vector.h b/ot_vector.h index 37135e7..f7f87aa 100644 --- a/ot_vector.h +++ b/ot_vector.h @@ -3,8 +3,8 @@ $id$ */ -#ifndef __OT_VECTOR_H__ -#define __OT_VECTOR_H__ +#ifndef OT_VECTOR_H__ +#define OT_VECTOR_H__ /* These defines control vectors behaviour */ #define OT_VECTOR_MIN_MEMBERS 2 diff --git a/scan_urlencoded_query.h b/scan_urlencoded_query.h index 92e3f34..06b91f5 100644 --- a/scan_urlencoded_query.h +++ b/scan_urlencoded_query.h @@ -3,8 +3,8 @@ $id$ */ -#ifndef __SCAN_URLENCODED_QUERY_H__ -#define __SCAN_URLENCODED_QUERY_H__ +#ifndef SCAN_URLENCODED_QUERY_H__ +#define SCAN_URLENCODED_QUERY_H__ #include diff --git a/trackerlogic.h b/trackerlogic.h index 370782a..721ba6e 100644 --- a/trackerlogic.h +++ b/trackerlogic.h @@ -3,8 +3,8 @@ $id$ */ -#ifndef __OT_TRACKERLOGIC_H__ -#define __OT_TRACKERLOGIC_H__ +#ifndef OT_TRACKERLOGIC_H__ +#define OT_TRACKERLOGIC_H__ #include #include -- cgit v1.2.3