diff options
Diffstat (limited to 'src/pulsecore/object.c')
| -rw-r--r-- | src/pulsecore/object.c | 18 | 
1 files changed, 10 insertions, 8 deletions
diff --git a/src/pulsecore/object.c b/src/pulsecore/object.c index f3ead9c5..099d50d9 100644 --- a/src/pulsecore/object.c +++ b/src/pulsecore/object.c @@ -28,21 +28,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, pa_bool_t (*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);      PA_REFCNT_INIT(o); -    o->type_name = type_name; +    o->type_id = type_id;      o->free = pa_object_free;      o->check_type = check_type; @@ -65,8 +67,8 @@ void pa_object_unref(pa_object *o) {      }  } -int pa_object_check_type(const char *type_name) { -    pa_assert(type_name); +pa_bool_t pa_object_check_type(const char *type_id) { +    pa_assert(type_id); -    return pa_streq(type_name, "pa_object"); +    return type_id == pa_object_type_id;  }  | 
