Max Kellermann <max@duempel.org>:

Fix tons of gcc warnings

7 files changed, 16 insertions, 12 deletions

diff --git a/include/cache.h b/include/cache.h
index 5ca6ce4..e4fb945 100644
--- a/include/cache.h
+++ b/include/cache.h
@@ -75,7 +75,7 @@ struct cache_extra {
 
 struct nf_conntrack;
 
-struct cache *cache_create(char *name, unsigned int features, u_int8_t proto, struct cache_extra *extra);
+struct cache *cache_create(const char *name, unsigned int features, u_int8_t proto, struct cache_extra *extra);
 void cache_destroy(struct cache *e);
 
 struct us_conntrack *cache_add(struct cache *c, struct nf_conntrack *ct);
diff --git a/include/conntrack.h b/include/conntrack.h
index 1b2581e..8f2b6a2 100644
--- a/include/conntrack.h
+++ b/include/conntrack.h
@@ -148,9 +148,9 @@ enum {
 struct ctproto_handler {
 	struct list_head 	head;
 
-	char 			*name;
+	const char		*name;
 	u_int16_t 		protonum;
-	char			*version;
+	const char		*version;
 
 	enum ctattr_protoinfo	protoinfo_attr;
 	
@@ -164,7 +164,7 @@ struct ctproto_handler {
 			    unsigned int command,
 			    struct nf_conntrack *ct);
 
-	void (*help)();
+	void (*help)(void);
 
 	struct option 		*opts;
 
@@ -181,7 +181,7 @@ void generic_opt_check(int options,
 		       int nops,
 		       char *optset,
 		       const char *optflg[]);
-void exit_error(enum exittype status, char *msg, ...);
+void exit_error(enum exittype status, const char *msg, ...);
 
 extern void register_proto(struct ctproto_handler *h);
 
diff --git a/include/conntrackd.h b/include/conntrackd.h
index 33732a4..d3f66ba 100644
--- a/include/conntrackd.h
+++ b/include/conntrackd.h
@@ -181,4 +181,8 @@ void local_handler(int fd, void *data);
 int init(void);
 void run(void);
 
+/* from read_config_yy.c */
+int
+init_config(char *filename);
+
 #endif
diff --git a/include/debug.h b/include/debug.h
index 1ffd9ac..f205983 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -14,8 +14,8 @@
 })
 #define debug printf
 #else
-#define debug_ct(ct, msg)
-#define debug
+#define debug_ct(ct, msg) do {} while (0)
+#define debug(...) do {} while (0)
 #endif
 
 #endif
diff --git a/include/linux_list.h b/include/linux_list.h
index 57b56d7..b84b1c4 100644
--- a/include/linux_list.h
+++ b/include/linux_list.h
@@ -13,7 +13,7 @@
  *
  */
 #define container_of(ptr, type, member) ({			\
-        const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
+        typeof( ((type *)0)->member ) *__mptr = (ptr);	\
         (type *)( (char *)__mptr - offsetof(type,member) );})
 
 /*
diff --git a/include/log.h b/include/log.h
index b5bbddb..64bf1ce 100644
--- a/include/log.h
+++ b/include/log.h
@@ -6,10 +6,10 @@
 struct buffer;
 struct nf_conntrack;
 
-int init_log();
-void dlog(FILE *fd, int priority, char *format, ...);
+int init_log(void);
+void dlog(FILE *fd, int priority, const char *format, ...);
 void dlog_buffered_ct(FILE *fd, struct buffer *b, struct nf_conntrack *ct);
 void dlog_buffered_ct_flush(void *buffer_data, void *data);
-void close_log();
+void close_log(void);
 
 #endif
diff --git a/include/network.h b/include/network.h
index 88ff43b..d0b639b 100644
--- a/include/network.h
+++ b/include/network.h
@@ -60,7 +60,7 @@ int mcast_track_seq(u_int32_t seq, u_int32_t *exp_seq);
 struct mcast_conf;
 
 int mcast_buffered_init(struct mcast_conf *conf);
-void mcast_buffered_destroy();
+void mcast_buffered_destroy(void);
 int mcast_buffered_send_netmsg(struct mcast_sock *m, void *data, int len);
 int mcast_buffered_pending_netmsg(struct mcast_sock *m);