Fix warnings found by -Wstrict-prototypes

svn path=/trunk/; revision=9722

9 files changed, 20 insertions, 27 deletions

diff --git a/conditions.c b/conditions.c
index 285dd697c8..9ff2aa6a01 100644
--- a/conditions.c
+++ b/conditions.c
@@ -1,7 +1,7 @@
 /* conditions.c
  * Implementation for condition handler.
  *
- * $Id: conditions.c,v 1.5 2002/12/03 02:07:07 guy Exp $
+ * $Id: conditions.c,v 1.6 2004/01/18 16:20:09 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -47,7 +47,7 @@ typedef struct _cnd_class{
 } _cnd_class;
 
 /* helper function prototypes */
-static void _cnd_init();
+static void _cnd_init(void);
 static void _cnd_find_hash_key_for_class_id(gpointer, gpointer, gpointer);
 
 condition* cnd_new(const char* class_id, ...){
@@ -183,7 +183,7 @@ void cnd_unregister_class(const char* class_id){
 /*
  * Initialize hash table.
  */
-static void _cnd_init(){
+static void _cnd_init(void){
   if(classes != NULL) return;
   /* create hash table, we use strings as keys */
   classes = g_hash_table_new(g_str_hash, g_str_equal);
diff --git a/editcap.c b/editcap.c
index c6bd0047cc..e846f5ba7e 100644
--- a/editcap.c
+++ b/editcap.c
@@ -1,7 +1,7 @@
 /* Edit capture files.  We can delete records, adjust timestamps, or
  * simply convert from one format to another format.
  *
- * $Id: editcap.c,v 1.26 2002/08/28 21:00:06 jmayer Exp $
+ * $Id: editcap.c,v 1.27 2004/01/18 16:21:12 jmayer Exp $
  *
  * Originally written by Richard Sharpe.
  * Improved by Guy Harris.
@@ -268,7 +268,7 @@ set_time_adjustment(char *optarg)
   time_adj.tv.tv_usec = val;
 }
 
-static void usage()
+static void usage(void)
 {
   int i;
   const char *string;
diff --git a/gtk/rtp_stream.c b/gtk/rtp_stream.c
index 7ba9418ec2..f021dcb668 100644
--- a/gtk/rtp_stream.c
+++ b/gtk/rtp_stream.c
@@ -1,7 +1,7 @@
 /* rtp_stream.c
  * RTP streams summary addition for ethereal
  *
- * $Id: rtp_stream.c,v 1.5 2004/01/13 22:49:15 guy Exp $
+ * $Id: rtp_stream.c,v 1.6 2004/01/18 16:08:21 jmayer Exp $
  *
  * Copyright 2003, Alcatel Business Systems
  * By Lars Ruoff <lars.ruoff@gmx.net>
@@ -259,7 +259,7 @@ int rtpstream_packet(rtpstream_tapinfo_t *tapinfo _U_, packet_info *pinfo, epan_
 
 /****************************************************************************/
 /* scan for RTP streams */
-void rtpstream_scan()
+void rtpstream_scan(void)
 {
 	gboolean was_registered = the_tapinfo_struct.is_registered;
 	if (!the_tapinfo_struct.is_registered)
@@ -322,7 +322,7 @@ void rtpstream_mark(rtp_stream_info_t* stream_fwd, rtp_stream_info_t* stream_rev
 
 
 /****************************************************************************/
-const rtpstream_tapinfo_t* rtpstream_get_info()
+const rtpstream_tapinfo_t* rtpstream_get_info(void)
 {
 	return &the_tapinfo_struct;
 }
diff --git a/gtk/rtp_stream.h b/gtk/rtp_stream.h
index a0f656f9d2..2d2da12a18 100644
--- a/gtk/rtp_stream.h
+++ b/gtk/rtp_stream.h
@@ -1,7 +1,7 @@
 /* rtp_stream.h
  * RTP streams summary addition for ethereal
  *
- * $Id: rtp_stream.h,v 1.2 2003/11/20 23:34:31 guy Exp $
+ * $Id: rtp_stream.h,v 1.3 2004/01/18 16:08:21 jmayer Exp $
  *
  * Copyright 2003, Alcatel Business Systems
  * By Lars Ruoff <lars.ruoff@gmx.net>
@@ -115,7 +115,7 @@ void remove_tap_listener_rtp_stream(void);
 * Retrieves a constant reference to the unique info structure of the rtp_streams tap listener.
 * The user should not modify the data pointed to.
 */
-const rtpstream_tapinfo_t* rtpstream_get_info();
+const rtpstream_tapinfo_t* rtpstream_get_info(void);
 
 /*
 * Cleans up memory of rtp streams tap.
@@ -126,7 +126,7 @@ void rtpstream_reset(rtpstream_tapinfo_t *tapinfo _U_);
 * Scans all packets for RTP streams and updates the RTP streams list.
 * (redissects all packets)
 */
-void rtpstream_scan();
+void rtpstream_scan(void);
 
 /*
 * Saves an RTP stream as raw data stream with timestamp information for later RTP playback.
diff --git a/mergecap.c b/mergecap.c
index 4e92993ba1..30184e6d1a 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -1,6 +1,6 @@
 /* Combine two dump files, either by appending or by merging by timestamp
  *
- * $Id: mergecap.c,v 1.14 2004/01/18 02:12:59 jmayer Exp $
+ * $Id: mergecap.c,v 1.15 2004/01/18 16:21:12 jmayer Exp $
  *
  * Written by Scott Renfro <scott@renfro.org> based on
  * editcap by Richard Sharpe and Guy Harris
@@ -350,7 +350,7 @@ open_in_files(int argc, char *argv[], in_file_t *in_files[])
  * Show the usage
  */
 static void
-usage()
+usage(void)
 {
   int i;
   const char *string;
diff --git a/packet-icmpv6.c b/packet-icmpv6.c
index a5e4984830..44a34938b1 100644
--- a/packet-icmpv6.c
+++ b/packet-icmpv6.c
@@ -1,7 +1,7 @@
 /* packet-icmpv6.c
  * Routines for ICMPv6 packet disassembly
  *
- * $Id: packet-icmpv6.c,v 1.74 2003/12/19 23:20:53 guy Exp $
+ * $Id: packet-icmpv6.c,v 1.75 2004/01/18 16:15:25 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -434,11 +434,7 @@ again:
  */
 
 static const char *
-bitrange0(v, s, buf, buflen)
-	guint32 v;
-	int s;
-	char *buf;
-	int buflen;
+bitrange0(guint32 v, int s, char *buf, int buflen)
 {
 	guint32 v0;
 	char *p, *ep;
diff --git a/packet-x11.c b/packet-x11.c
index 8bc5e899ee..2d5a6f372d 100644
--- a/packet-x11.c
+++ b/packet-x11.c
@@ -3,7 +3,7 @@
  * Copyright 2000, Christophe Tronche <ch.tronche@computer.org>
  * Copyright 2003, Michael Shuldman
  *
- * $Id: packet-x11.c,v 1.52 2004/01/06 19:56:56 guy Exp $
+ * $Id: packet-x11.c,v 1.53 2004/01/18 16:18:30 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1393,10 +1393,7 @@ static gint compareGuint32(gconstpointer a, gconstpointer b)
 }
 
 static void
-XConvertCase(sym, lower, upper)
-    register int sym;
-    int *lower;
-    int *upper;
+XConvertCase(register int sym, int *lower, int *upper)
 {
     *lower = sym;
     *upper = sym;
diff --git a/xmlstub.c b/xmlstub.c
index 086ffc5fd9..f58f8d4027 100644
--- a/xmlstub.c
+++ b/xmlstub.c
@@ -3,7 +3,7 @@
  * exists so that the library can be loaded on systems that
  * have it.
  *
- * $Id: xmlstub.c,v 1.2 2002/08/28 21:00:41 jmayer Exp $
+ * $Id: xmlstub.c,v 1.3 2004/01/18 16:19:15 jmayer Exp $
  *
  * Copyright (c) 2001 by David Frascone <dave@frascone.com>
  *
@@ -42,7 +42,7 @@
  * not have libxml2 installed.
  */
 int
-loadLibXML()
+loadLibXML(void)
 {
 	GModule *handle;
 	gpointer symbol;
diff --git a/xmlstub.h b/xmlstub.h
index dabf2eb55d..8750a78413 100644
--- a/xmlstub.h
+++ b/xmlstub.h
@@ -1111,7 +1111,7 @@ XML_EXTERN int XmlStubInitialized;
  * is not installed on the current system.  (Or it's not in
  * the LD path)
  */
-int loadLibXML();
+int loadLibXML(void);