Build fix

[babeltrace.git] / formats / registry.c

diff --git a/formats/registry.c b/formats/registry.c
index 83e0aa0e30d5b04c4157abb370edd56c1ed7afc6..4f9dc244a3618451c54e0f4265563d0a7a0bc739 100644 (file)
--- a/formats/registry.c
+++ b/formats/registry.c
@@ -3,23 +3,20 @@
  *
  * Format Registry
  *
  *
  * Format Registry
  *

- * Copyright (c) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

  *
  *

- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:

  *
  *

- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.

  */
 
  */
 

+#include <babeltrace/format.h>

 #include <glib.h>
 #include <errno.h>
 
 #include <glib.h>
 #include <errno.h>
 


@@ -39,19 +36,19 @@ struct format *bt_lookup_format(GQuark qname)
        if (!init_done)
                return NULL;
        return g_hash_table_lookup(format_registry,
        if (!init_done)
                return NULL;
        return g_hash_table_lookup(format_registry,

-                                  (gconstpointer) (unsigned long) qname)
+                                  (gconstpointer) (unsigned long) qname);

 }
 
 }
 

-int bt_register_format(const struct format *format)
+int bt_register_format(struct format *format)

 {
        if (!init_done)
                format_init();
 
 {
        if (!init_done)
                format_init();
 

-       if (bt_lookup_format(qname))
+       if (bt_lookup_format(format->name))

                return -EEXIST;
 
        g_hash_table_insert(format_registry,
                return -EEXIST;
 
        g_hash_table_insert(format_registry,

-                           (gconstpointer) (unsigned long) format->name,
+                           (gpointer) (unsigned long) format->name,

                            format);
        return 0;
 }
                            format);
        return 0;
 }


@@ -63,7 +60,7 @@ void format_init(void)
        init_done = 1;
 }
 
        init_done = 1;
 }
 

-int format_finalize(void)
+void format_finalize(void)

 {
        g_hash_table_destroy(format_registry);
 }
 {
        g_hash_table_destroy(format_registry);
 }