aniani/icecast-common
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-common.git synced 2024-12-04 14:46:31 -05:00
Code

Update: Pass instance to igloo_ro_clone_t, igloo_ro_convert_t, and igloo_ro_get_interface_t

Browse Source
This commit is contained in:
Philipp Schafft 2019-09-14 12:32:03 +00:00
parent 02837785c3
commit 8ccb5c7b12
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/igloo/ro.h
View File

@ -88,7 +88,7 @@ typedef unsigned long int igloo_ro_cf_t;
* name, associated * name, associated
* See igloo_ro_new(). * See igloo_ro_new().
*/ */
typedef igloo_ro_t (*igloo_ro_clone_t)(igloo_ro_t self, igloo_ro_cf_t required, igloo_ro_cf_t allowed, const char *name, igloo_ro_t associated); typedef igloo_ro_t (*igloo_ro_clone_t)(igloo_ro_t self, igloo_ro_cf_t required, igloo_ro_cf_t allowed, const char *name, igloo_ro_t associated, igloo_ro_t instance);
/* Type used for callback called when the object needs to be converted to another type. /* Type used for callback called when the object needs to be converted to another type.
* *
@ -111,7 +111,7 @@ typedef igloo_ro_t (*igloo_ro_clone_t)(igloo_ro_t self, igloo_ro_cf_t required,
* name, associated * name, associated
* See igloo_ro_new(). * See igloo_ro_new().
*/ */
typedef igloo_ro_t (*igloo_ro_convert_t)(igloo_ro_t self, const igloo_ro_type_t *type, igloo_ro_cf_t required, igloo_ro_cf_t allowed, const char *name, igloo_ro_t associated); typedef igloo_ro_t (*igloo_ro_convert_t)(igloo_ro_t self, const igloo_ro_type_t *type, igloo_ro_cf_t required, igloo_ro_cf_t allowed, const char *name, igloo_ro_t associated, igloo_ro_t instance);
/* Type used for callback called when a specific interface to the object is requested. /* Type used for callback called when a specific interface to the object is requested.
* *
@ -129,7 +129,7 @@ typedef igloo_ro_t (*igloo_ro_convert_t)(igloo_ro_t self, const igloo_ro_type_t
* name, associated * name, associated
* See igloo_ro_new(). * See igloo_ro_new().
*/ */
typedef igloo_ro_t (*igloo_ro_get_interface_t)(igloo_ro_t self, const igloo_ro_type_t *type, const char *name, igloo_ro_t associated); typedef igloo_ro_t (*igloo_ro_get_interface_t)(igloo_ro_t self, const igloo_ro_type_t *type, const char *name, igloo_ro_t associated, igloo_ro_t instance);
/* Type used to store flags for stringify operation. /* Type used to store flags for stringify operation.
*/ */

8
src/ro.c
View File

@ -367,7 +367,7 @@ igloo_ro_t igloo_ro_clone(igloo_ro_t self, igloo_ro_cf_t required, igloo_ro
} }
if (base->type->type_clonecb) if (base->type->type_clonecb)
ret = base->type->type_clonecb(self, required, allowed, name, associated); ret = base->type->type_clonecb(self, required, allowed, name, associated, base->instance);
igloo_thread_mutex_unlock(&(base->lock)); igloo_thread_mutex_unlock(&(base->lock));
return ret; return ret;
@ -398,11 +398,11 @@ igloo_ro_t igloo_ro_convert(igloo_ro_t self, const igloo_ro_type_t *type, i
allowed = igloo_RO_CF_DEFAULT; allowed = igloo_RO_CF_DEFAULT;
if (base->type->type_convertcb) if (base->type->type_convertcb)
ret = base->type->type_convertcb(self, type, required, allowed, name, associated); ret = base->type->type_convertcb(self, type, required, allowed, name, associated, base->instance);
if (igloo_RO_IS_NULL(ret)) if (igloo_RO_IS_NULL(ret))
if (type->type_convertcb) if (type->type_convertcb)
ret = type->type_convertcb(self, type, required, allowed, name, associated); ret = type->type_convertcb(self, type, required, allowed, name, associated, base->instance);
igloo_thread_mutex_unlock(&(base->lock)); igloo_thread_mutex_unlock(&(base->lock));
return ret; return ret;
@ -428,7 +428,7 @@ igloo_ro_t igloo_ro_get_interface_ext(igloo_ro_t self, const igloo_ro_type_t *ty
igloo_thread_mutex_unlock(&(base->lock)); igloo_thread_mutex_unlock(&(base->lock));
if (base->type->type_get_interfacecb) if (base->type->type_get_interfacecb)
ret = base->type->type_get_interfacecb(self, type, name, associated); ret = base->type->type_get_interfacecb(self, type, name, associated, base->instance);
igloo_thread_mutex_lock(&(base->lock)); igloo_thread_mutex_lock(&(base->lock));
/* remove temp reference /* remove temp reference