Differences From Artifact [c2480d6470]:
- File
src/OFObject.m
— part of check-in
[aeb403a1ed]
at
2020-10-10 14:27:37
on branch trunk
— OFObject: Change type of -[hash] to unsigned long
The internal hash is still 32 bit in most places, but this way, it is at
least not baked into the API and ABI and can be upgraded later, should
that ever be necessary. (user: js, size: 31608) [annotate] [blame] [check-ins using]
To Artifact [133c2d9091]:
- File src/OFObject.m — part of check-in [d0ae3bfd6c] at 2020-10-25 23:33:09 on branch trunk — Add of_{malloc,calloc,realloc,free} (user: js, size: 32809) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
103 104 105 106 107 108 109 110 111 112 113 114 115 116 |
#define PRE_MEM(mem) ((struct pre_mem *)(void *)((char *)mem - PRE_MEM_ALIGN))
static struct {
Class isa;
} allocFailedException;
uint32_t of_hash_seed;
#if !defined(HAVE_ARC4RANDOM) && !defined(HAVE_GETRANDOM)
static void
initRandom(void)
{
struct timeval tv;
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 |
#define PRE_MEM(mem) ((struct pre_mem *)(void *)((char *)mem - PRE_MEM_ALIGN))
static struct {
Class isa;
} allocFailedException;
uint32_t of_hash_seed;
void *
of_malloc(size_t count, size_t size)
{
void *pointer;
if OF_UNLIKELY (count == 0 || size == 0)
return NULL;
if OF_UNLIKELY (count > SIZE_MAX / size)
@throw [OFOutOfRangeException exception];
if OF_UNLIKELY ((pointer = malloc(count * size)) == NULL)
@throw [OFOutOfMemoryException
exceptionWithRequestedSize: size];
return pointer;
}
void *
of_calloc(size_t count, size_t size)
{
void *pointer;
if OF_UNLIKELY (count == 0 || size == 0)
return NULL;
/* Not all calloc implementations check for overflow. */
if OF_UNLIKELY (count > SIZE_MAX / size)
@throw [OFOutOfRangeException exception];
if OF_UNLIKELY ((pointer = calloc(count, size)) == NULL)
@throw [OFOutOfMemoryException
exceptionWithRequestedSize: size];
return pointer;
}
void *
of_realloc(void *pointer, size_t count, size_t size)
{
if OF_UNLIKELY (count == 0 || size == 0)
return NULL;
if OF_UNLIKELY (count > SIZE_MAX / size)
@throw [OFOutOfRangeException exception];
if OF_UNLIKELY ((pointer = realloc(pointer, count * size)) == NULL)
@throw [OFOutOfMemoryException
exceptionWithRequestedSize: size];
return pointer;
}
void
of_free(void *pointer)
{
free(pointer);
}
#if !defined(HAVE_ARC4RANDOM) && !defined(HAVE_GETRANDOM)
static void
initRandom(void)
{
struct timeval tv;
|
| ︙ | ︙ |