summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirk Engling <erdgeist@erdgeist.org>2017-04-28 15:41:24 +0200
committerDirk Engling <erdgeist@erdgeist.org>2017-04-28 15:41:24 +0200
commitd4598cc93017e4d7e71a6f854d389dcf6749e8df (patch)
tree58570553fb37f8534cd8fac4fe8964284548fb22
parent0ebc0ed6a3e3b7acc9f9e338cc23cea5f4f22f61 (diff)
Get rid of some warnings regarding header guards
-rw-r--r--opentracker.c1
-rw-r--r--ot_accesslist.h4
-rw-r--r--ot_clean.h4
-rw-r--r--ot_fullscrape.h4
-rw-r--r--ot_http.h4
-rw-r--r--ot_iovec.h4
-rw-r--r--ot_livesync.h4
-rw-r--r--ot_mutex.h4
-rw-r--r--ot_rijndael.h6
-rw-r--r--ot_stats.h7
-rw-r--r--ot_sync.h4
-rw-r--r--ot_udp.h4
-rw-r--r--ot_vector.h4
-rw-r--r--scan_urlencoded_query.h4
-rw-r--r--trackerlogic.h4
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;
48static char * g_serveruser; 48static char * g_serveruser;
49static unsigned int g_udp_workers; 49static unsigned int g_udp_workers;
50 50
51static void panic( const char *routing ) __attribute__ ((noreturn));
51static void panic( const char *routine ) { 52static void panic( const char *routine ) {
52 fprintf( stderr, "%s: %s\n", routine, strerror(errno) ); 53 fprintf( stderr, "%s: %s\n", routine, strerror(errno) );
53 exit( 111 ); 54 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 @@
3 3
4 $id$ */ 4 $id$ */
5 5
6#ifndef __OT_ACCESSLIST_H__ 6#ifndef OT_ACCESSLIST_H__
7#define __OT_ACCESSLIST_H__ 7#define OT_ACCESSLIST_H__
8 8
9#if defined ( WANT_ACCESSLIST_BLACK ) && defined (WANT_ACCESSLIST_WHITE ) 9#if defined ( WANT_ACCESSLIST_BLACK ) && defined (WANT_ACCESSLIST_WHITE )
10# error WANT_ACCESSLIST_BLACK and WANT_ACCESSLIST_WHITE are exclusive. 10# 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 @@
3 3
4 $id$ */ 4 $id$ */
5 5
6#ifndef __OT_CLEAN_H__ 6#ifndef OT_CLEAN_H__
7#define __OT_CLEAN_H__ 7#define OT_CLEAN_H__
8 8
9/* The amount of time a clean cycle should take */ 9/* The amount of time a clean cycle should take */
10#define OT_CLEAN_INTERVAL_MINUTES 2 10#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 @@
3 3
4 $id$ */ 4 $id$ */
5 5
6#ifndef __OT_FULLSCRAPE_H__ 6#ifndef OT_FULLSCRAPE_H__
7#define __OT_FULLSCRAPE_H__ 7#define OT_FULLSCRAPE_H__
8 8
9#ifdef WANT_FULLSCRAPE 9#ifdef WANT_FULLSCRAPE
10 10
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 @@
3 3
4 $id$ */ 4 $id$ */
5 5
6#ifndef __OT_HTTP_H__ 6#ifndef OT_HTTP_H__
7#define __OT_HTTP_H__ 7#define OT_HTTP_H__
8 8
9typedef enum { 9typedef enum {
10 STRUCT_HTTP_FLAG_WAITINGFORTASK = 1, 10 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 @@
3 3
4 $id$ */ 4 $id$ */
5 5
6#ifndef __OT_IOVEC_H__ 6#ifndef OT_IOVEC_H__
7#define __OT_IOVEC_H__ 7#define OT_IOVEC_H__
8 8
9#include <sys/uio.h> 9#include <sys/uio.h>
10 10
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 @@
3 3
4 $id$ */ 4 $id$ */
5 5
6#ifndef __OT_LIVESYNC_H__ 6#ifndef OT_LIVESYNC_H__
7#define __OT_LIVESYNC_H__ 7#define OT_LIVESYNC_H__
8 8
9#include "io.h" 9#include "io.h"
10#include "trackerlogic.h" 10#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 @@
3 3
4 $id$ */ 4 $id$ */
5 5
6#ifndef __OT_MUTEX_H__ 6#ifndef OT_MUTEX_H__
7#define __OT_MUTEX_H__ 7#define OT_MUTEX_H__
8 8
9#include <sys/uio.h> 9#include <sys/uio.h>
10 10
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 @@
9 9
10 $id$ */ 10 $id$ */
11 11
12#ifndef __OT_RIJNDAEL_H__ 12#ifndef OT_RIJNDAEL_H__
13#define __OT_RIJNDAEL_H__ 13#define OT_RIJNDAEL_H__
14 14
15#include <stdint.h> 15#include <stdint.h>
16 16
17int rijndaelKeySetupEnc128(uint32_t rk[44], const uint8_t cipherKey[] ); 17int rijndaelKeySetupEnc128(uint32_t rk[44], const uint8_t cipherKey[] );
18void rijndaelEncrypt128(const uint32_t rk[44], const uint8_t pt[16], uint8_t ct[16]); 18void rijndaelEncrypt128(const uint32_t rk[44], const uint8_t pt[16], uint8_t ct[16]);
19 19
20extern const char *g_version_rijndael_c;
21
20#endif 22#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 @@
3 3
4 $id$ */ 4 $id$ */
5 5
6#ifndef __OT_STATS_H__ 6#ifndef OT_STATS_H__
7#define __OT_STATS_H__ 7#define OT_STATS_H__
8 8
9typedef enum { 9typedef enum {
10 EVENT_ACCEPT, 10 EVENT_ACCEPT,
@@ -46,4 +46,7 @@ size_t stats_return_tracker_version( char *reply );
46void stats_init( ); 46void stats_init( );
47void stats_deinit( ); 47void stats_deinit( );
48 48
49extern const char *g_version_rijndael_c;
50extern const char *g_version_livesync_c;
51
49#endif 52#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 @@
3 3
4 $id$ */ 4 $id$ */
5 5
6#ifndef __OT_SYNC_H__ 6#ifndef OT_SYNC_H__
7#define __OT_SYNC_H__ 7#define OT_SYNC_H__
8 8
9#ifdef WANT_SYNC_BATCH 9#ifdef WANT_SYNC_BATCH
10enum { SYNC_IN, SYNC_OUT }; 10enum { 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 @@
3 3
4 $id$ */ 4 $id$ */
5 5
6#ifndef __OT_UDP_H__ 6#ifndef OT_UDP_H__
7#define __OT_UDP_H__ 7#define OT_UDP_H__
8 8
9void udp_init( int64 sock, unsigned int worker_count ); 9void udp_init( int64 sock, unsigned int worker_count );
10int handle_udp6( int64 serversocket, struct ot_workstruct *ws ); 10int 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 @@
3 3
4 $id$ */ 4 $id$ */
5 5
6#ifndef __OT_VECTOR_H__ 6#ifndef OT_VECTOR_H__
7#define __OT_VECTOR_H__ 7#define OT_VECTOR_H__
8 8
9/* These defines control vectors behaviour */ 9/* These defines control vectors behaviour */
10#define OT_VECTOR_MIN_MEMBERS 2 10#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 @@
3 3
4 $id$ */ 4 $id$ */
5 5
6#ifndef __SCAN_URLENCODED_QUERY_H__ 6#ifndef SCAN_URLENCODED_QUERY_H__
7#define __SCAN_URLENCODED_QUERY_H__ 7#define SCAN_URLENCODED_QUERY_H__
8 8
9#include <sys/types.h> 9#include <sys/types.h>
10 10
diff --git a/trackerlogic.h b/trackerlogic.h
index 370782a..721ba6e 100644
--- a/trackerlogic.h
+++ b/trackerlogic.h
@@ -3,8 +3,8 @@
3 3
4 $id$ */ 4 $id$ */
5 5
6#ifndef __OT_TRACKERLOGIC_H__ 6#ifndef OT_TRACKERLOGIC_H__
7#define __OT_TRACKERLOGIC_H__ 7#define OT_TRACKERLOGIC_H__
8 8
9#include <sys/types.h> 9#include <sys/types.h>
10#include <sys/time.h> 10#include <sys/time.h>