oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

libheimbase: Allow static const heim types.

Browse Source
This commit is contained in:
Taylor R Campbell
2023-05-28 20:13:58 +00:00
committed by Nico Williams
parent 2db6c29a3e
commit 72606cb95e
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/base/heimbase.c
View File

@@ -40,7 +40,7 @@
static heim_base_atomic(uint32_t) tidglobal = HEIM_TID_USER; static heim_base_atomic(uint32_t) tidglobal = HEIM_TID_USER;
struct heim_base { struct heim_base {
heim_type_t isa; heim_const_type_t isa;
heim_base_atomic(uint32_t) ref_cnt; heim_base_atomic(uint32_t) ref_cnt;
HEIM_TAILQ_ENTRY(heim_base) autorel; HEIM_TAILQ_ENTRY(heim_base) autorel;
heim_auto_release_t autorelpool; heim_auto_release_t autorelpool;
@@ -49,7 +49,7 @@ struct heim_base {
/* specialized version of base */ /* specialized version of base */
struct heim_base_mem { struct heim_base_mem {
heim_type_t isa; heim_const_type_t isa;
heim_base_atomic(uint32_t) ref_cnt; heim_base_atomic(uint32_t) ref_cnt;
HEIM_TAILQ_ENTRY(heim_base) autorel; HEIM_TAILQ_ENTRY(heim_base) autorel;
heim_auto_release_t autorelpool; heim_auto_release_t autorelpool;
@@ -182,7 +182,7 @@ static heim_type_t tagged_isa[9] = {
NULL NULL
}; };
heim_type_t heim_const_type_t
_heim_get_isa(heim_object_t ptr) _heim_get_isa(heim_object_t ptr)
{ {
struct heim_base *p; struct heim_base *p;
@@ -206,7 +206,7 @@ _heim_get_isa(heim_object_t ptr)
heim_tid_t heim_tid_t
heim_get_tid(heim_object_t ptr) heim_get_tid(heim_object_t ptr)
{ {
heim_type_t isa = _heim_get_isa(ptr); heim_const_type_t isa = _heim_get_isa(ptr);
return isa->tid; return isa->tid;
} }
@@ -221,7 +221,7 @@ heim_get_tid(heim_object_t ptr)
uintptr_t uintptr_t
heim_get_hash(heim_object_t ptr) heim_get_hash(heim_object_t ptr)
{ {
heim_type_t isa = _heim_get_isa(ptr); heim_const_type_t isa = _heim_get_isa(ptr);
if (isa->hash) if (isa->hash)
return isa->hash(ptr); return isa->hash(ptr);
return (uintptr_t)ptr; return (uintptr_t)ptr;
@@ -241,7 +241,7 @@ int
heim_cmp(heim_object_t a, heim_object_t b) heim_cmp(heim_object_t a, heim_object_t b)
{ {
heim_tid_t ta, tb; heim_tid_t ta, tb;
heim_type_t isa; heim_const_type_t isa;
ta = heim_get_tid(a); ta = heim_get_tid(a);
tb = heim_get_tid(b); tb = heim_get_tid(b);
@@ -272,7 +272,7 @@ memory_dealloc(void *ptr)
} }
} }
struct heim_type_data memory_object = { static const struct heim_type_data memory_object = {
HEIM_TID_MEMORY, HEIM_TID_MEMORY,
"memory-object", "memory-object",
NULL, NULL,
@@ -338,7 +338,7 @@ _heim_create_type(const char *name,
} }
heim_object_t heim_object_t
_heim_alloc_object(heim_type_t type, size_t size) _heim_alloc_object(heim_const_type_t type, size_t size)
{ {
/* XXX should use posix_memalign */ /* XXX should use posix_memalign */
struct heim_base *p = calloc(1, size + sizeof(*p)); struct heim_base *p = calloc(1, size + sizeof(*p));

5
lib/base/heimbasepriv.h
View File

@@ -46,6 +46,7 @@ typedef uintptr_t (*heim_type_hash)(void *);
typedef heim_string_t (*heim_type_description)(void *); typedef heim_string_t (*heim_type_description)(void *);
typedef struct heim_type_data *heim_type_t; typedef struct heim_type_data *heim_type_t;
typedef const struct heim_type_data *heim_const_type_t;
struct heim_type_data { struct heim_type_data {
heim_tid_t tid; heim_tid_t tid;
@@ -58,7 +59,7 @@ struct heim_type_data {
heim_type_description desc; heim_type_description desc;
}; };
heim_type_t _heim_get_isa(heim_object_t); heim_const_type_t _heim_get_isa(heim_object_t);
heim_type_t heim_type_t
_heim_create_type(const char *name, _heim_create_type(const char *name,
@@ -70,7 +71,7 @@ _heim_create_type(const char *name,
heim_type_description desc); heim_type_description desc);
heim_object_t heim_object_t
_heim_alloc_object(heim_type_t type, size_t size); _heim_alloc_object(heim_const_type_t type, size_t size);
void * void *
_heim_get_isaextra(heim_object_t o, size_t idx); _heim_get_isaextra(heim_object_t o, size_t idx);