remap: Change remapping function argument type from void to int16_t / float as approp...

[pulseaudio] / src / pulsecore / object.c

diff --git a/src/pulsecore/object.c b/src/pulsecore/object.c
index 8fd05fb6aa389188a2b40f1994ce555b8ab71768..bc1aaf7011b2cfd3e9bdc45649ed6012c8f8a012 100644 (file)
--- a/src/pulsecore/object.c
+++ b/src/pulsecore/object.c
@@ -26,21 +26,23 @@
 
 #include "object.h"
 
-pa_object *pa_object_new_internal(size_t size, const char *type_name, int (*check_type)(const char *type_name)) {
+const char pa_object_type_id[] = "pa_object";
+
+pa_object *pa_object_new_internal(size_t size, const char *type_id, bool (*check_type)(const char *type_id)) {
     pa_object *o;
 
     pa_assert(size > sizeof(pa_object));
-    pa_assert(type_name);
+    pa_assert(type_id);
 
     if (!check_type)
         check_type = pa_object_check_type;
 
-    pa_assert(check_type(type_name));
-    pa_assert(check_type("pa_object"));
+    pa_assert(check_type(type_id));
+    pa_assert(check_type(pa_object_type_id));
 
-    o = pa_xmalloc(size);
+    o = pa_xmalloc0(size);
     PA_REFCNT_INIT(o);
-    o->type_name = type_name;
+    o->type_id = type_id;
     o->free = pa_object_free;
     o->check_type = check_type;
 
@@ -63,8 +65,8 @@ void pa_object_unref(pa_object *o) {
     }
 }
 
-int pa_object_check_type(const char *type_name) {
-    pa_assert(type_name);
+bool pa_object_check_type(const char *type_id) {
+    pa_assert(type_id);
 
-    return strcmp(type_name, "pa_object") == 0;
+    return type_id == pa_object_type_id;
 }