ctf.fs: bt_ctf_notif_iter_create(): assert() that all medops exist

[babeltrace.git] / lib / registry.c

diff --git a/lib/registry.c b/lib/registry.c
index 4d09e5db079837e04df86450d3772399648e2d2a..bc2be95ef739215648d5ab709e30dcc93515db1d 100644 (file)
--- a/lib/registry.c
+++ b/lib/registry.c
@@ -16,6 +16,14 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #include <babeltrace/format.h>
@@ -59,13 +67,13 @@ void format_refcount_dec(void)
                format_cleanup();
 }
 
-struct format *bt_lookup_format(bt_intern_str name)
+struct bt_format *bt_lookup_format(bt_intern_str name)
 {
        if (!init_done)
                return NULL;
 
        return g_hash_table_lookup(format_registry,
-                                  (gconstpointer) (unsigned long) name);
+                                  (gconstpointer) GUINT_TO_POINTER(name));
 }
 
 static void show_format(gpointer key, gpointer value, gpointer user_data)
@@ -73,7 +81,7 @@ static void show_format(gpointer key, gpointer value, gpointer user_data)
        struct walk_data *data = user_data;
 
        fprintf(data->fp, "%s%s", data->iter ? ", " : "",
-               g_quark_to_string((GQuark) (unsigned long) key));
+               g_quark_to_string((GQuark) GPOINTER_TO_UINT(key)));
        data->iter++;
 }
 
@@ -95,7 +103,7 @@ void bt_fprintf_format_list(FILE *fp)
        fprintf(fp, ".\n");
 }
 
-int bt_register_format(struct format *format)
+int bt_register_format(struct bt_format *format)
 {
        if (!format)
                return -EINVAL;
@@ -108,16 +116,16 @@ int bt_register_format(struct format *format)
 
        format_refcount_inc();
        g_hash_table_insert(format_registry,
-                           (gpointer) (unsigned long) format->name,
+                           GUINT_TO_POINTER(format->name),
                            format);
        return 0;
 }
 
-void bt_unregister_format(struct format *format)
+void bt_unregister_format(struct bt_format *format)
 {
        assert(bt_lookup_format(format->name));
        g_hash_table_remove(format_registry,
-                           (gpointer) (unsigned long) format->name);
+                           GUINT_TO_POINTER(format->name));
        format_refcount_dec();
 }