Add escaping of an apostrophe in XML output.

[obnox/wireshark/wip.git] / conditions.c

diff --git a/conditions.c b/conditions.c
index 74f08b49a8b9c4922a86182b87e4abd711104361..9ff2aa6a01afa951030556a4d710dd9c4e7490b1 100644 (file)
--- a/conditions.c
+++ b/conditions.c
@@ -1,7 +1,7 @@
 /* conditions.c
  * Implementation for condition handler.
  *
- * $Id: conditions.c,v 1.4 2002/12/02 23:43:25 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, ...){
@@ -168,7 +168,7 @@ void cnd_unregister_class(const char* class_id){
   /* find the key for this class id and store it in 'pkey' */
   g_hash_table_foreach(classes,
                        _cnd_find_hash_key_for_class_id,
-                       key);
+                       (gpointer)key);
   /* find the class structure for this class id */
   cls = (_cnd_class*)g_hash_table_lookup(classes, class_id);
   /* remove constructor from hash table */
@@ -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);