Overview
| Comment: | Make OFHashSeed private |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
39863b35036a2a38292551be89dbda88 |
| User & Date: | js on 2021-04-30 21:23:07 |
| Other Links: | manifest | tags |
Context
|
2021-05-01
| ||
| 02:39 | Fix compiling for AmigaOS check-in: 171f3ba831 user: js tags: trunk | |
|
2021-04-30
| ||
| 23:06 | Merge trunk into branch "sctp" check-in: a82e7f4b3d user: js tags: sctp | |
| 22:26 | Merge trunk into branch "invoke-invocation" check-in: efca87b509 user: js tags: invoke-invocation | |
| 22:04 | Merge trunk into branch "ofsock" check-in: 4eb272eb8b user: js tags: ofsock | |
| 21:56 | Merge trunk into branch "asn1" check-in: 4507e0bee3 user: js tags: asn1 | |
| 21:37 | Merge trunk into 1.0 branch check-in: 9a64964dd0 user: js tags: 1.0 | |
| 21:23 | Make OFHashSeed private check-in: 39863b3503 user: js tags: trunk | |
| 21:15 | OFTCPSocketSOCKS5Connector: Move state enum to .m check-in: f7abfde081 user: js tags: trunk | |
Changes
Modified src/OFMapTable.m from [6075b5b12b] to [37fa19bf82].
| ︙ | ︙ | |||
23 24 25 26 27 28 29 30 31 32 33 34 35 36 |
#import "OFMapTable.h"
#import "OFMapTable+Private.h"
#import "OFEnumerator.h"
#import "OFEnumerationMutationException.h"
#import "OFInvalidArgumentException.h"
#import "OFOutOfRangeException.h"
static const unsigned long minCapacity = 16;
struct OFMapTableBucket {
void *key, *object;
unsigned long hash;
};
| > > | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 |
#import "OFMapTable.h"
#import "OFMapTable+Private.h"
#import "OFEnumerator.h"
#import "OFEnumerationMutationException.h"
#import "OFInvalidArgumentException.h"
#import "OFOutOfRangeException.h"
extern unsigned long OFHashSeed;
static const unsigned long minCapacity = 16;
struct OFMapTableBucket {
void *key, *object;
unsigned long hash;
};
|
| ︙ | ︙ |
Modified src/OFObject.h from [f1db17a081] to [6b4d0acc99].
| ︙ | ︙ | |||
279 280 281 282 283 284 285 286 287 288 289 290 291 292 | return false; if (!OFSizeEqual(rect1.size, rect2.size)) return false; return true; } static const size_t OFNotFound = SIZE_MAX; #ifdef __OBJC__ @class OFMethodSignature; @class OFString; @class OFThread; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 |
return false;
if (!OFSizeEqual(rect1.size, rect2.size))
return false;
return true;
}
/**
* @brief Adds the specified byte to the hash.
*
* @param hash A pointer to a hash to add the byte to
* @param byte The byte to add to the hash
*/
static OF_INLINE void
OFHashAdd(unsigned long *_Nonnull hash, unsigned char byte)
{
uint32_t tmp = (uint32_t)*hash;
tmp += byte;
tmp += tmp << 10;
tmp ^= tmp >> 6;
*hash = tmp;
}
/**
* @brief Adds the specified hash to the hash.
*
* @param hash A pointer to a hash to add the hash to
* @param otherHash The hash to add to the hash
*/
static OF_INLINE void
OFHashAddHash(unsigned long *_Nonnull hash, unsigned long otherHash)
{
OFHashAdd(hash, (otherHash >> 24) & 0xFF);
OFHashAdd(hash, (otherHash >> 16) & 0xFF);
OFHashAdd(hash, (otherHash >> 8) & 0xFF);
OFHashAdd(hash, otherHash & 0xFF);
}
/**
* @brief Finalizes the specified hash.
*
* @param hash A pointer to the hash to finalize
*/
static OF_INLINE void
OFHashFinalize(unsigned long *_Nonnull hash)
{
uint32_t tmp = (uint32_t)*hash;
tmp += tmp << 3;
tmp ^= tmp >> 11;
tmp += tmp << 15;
*hash = tmp;
}
static const size_t OFNotFound = SIZE_MAX;
#ifdef __OBJC__
@class OFMethodSignature;
@class OFString;
@class OFThread;
|
| ︙ | ︙ | |||
1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 | /** * @brief Returns 64 bit or non-cryptographical randomness. * * @return 64 bit or non-cryptographical randomness */ extern uint64_t OFRandom64(void); #ifdef __cplusplus } #endif OF_ASSUME_NONNULL_END #include "OFBlock.h" | > > > > > > > | 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 | /** * @brief Returns 64 bit or non-cryptographical randomness. * * @return 64 bit or non-cryptographical randomness */ extern uint64_t OFRandom64(void); /** * @brief Initializes the specified hash. * * @param hash A pointer to the hash to initialize */ extern void OFHashInit(unsigned long *_Nonnull hash); #ifdef __cplusplus } #endif OF_ASSUME_NONNULL_END #include "OFBlock.h" |
| ︙ | ︙ |
Modified src/OFObject.m from [63795ddfa3] to [ec692d0b5b].
| ︙ | ︙ | |||
223 224 225 226 227 228 229 230 231 232 233 234 235 236 |
OFEnsure(getrandom(&buffer, sizeof(buffer), 0) == sizeof(buffer));
return buffer;
#else
return ((uint64_t)OFRandom32() << 32) | OFRandom32();
#endif
}
static const char *
typeEncodingForSelector(Class class, SEL selector)
{
Method method;
if ((method = class_getInstanceMethod(class, selector)) == NULL)
| > > > > > > | 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 |
OFEnsure(getrandom(&buffer, sizeof(buffer), 0) == sizeof(buffer));
return buffer;
#else
return ((uint64_t)OFRandom32() << 32) | OFRandom32();
#endif
}
void
OFHashInit(unsigned long *hash)
{
*hash = OFHashSeed;
}
static const char *
typeEncodingForSelector(Class class, SEL selector)
{
Method method;
if ((method = class_getInstanceMethod(class, selector)) == NULL)
|
| ︙ | ︙ |
Modified src/macros.h from [3a3771fba4] to [22f8070f90].
| ︙ | ︙ | |||
635 636 637 638 639 640 641 |
? ((value) >> ((bits) % (sizeof(value) * 8))) | \
((value) << (sizeof(value) * 8 - ((bits) % (sizeof(value) * 8)))) \
: (value))
#define OFRoundUpToPowerOf2(pow2, value) \
(((value) + (pow2) - 1) & ~((pow2) - 1))
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 635 636 637 638 639 640 641 642 643 644 645 646 647 648 |
? ((value) >> ((bits) % (sizeof(value) * 8))) | \
((value) << (sizeof(value) * 8 - ((bits) % (sizeof(value) * 8)))) \
: (value))
#define OFRoundUpToPowerOf2(pow2, value) \
(((value) + (pow2) - 1) & ~((pow2) - 1))
static OF_INLINE bool
OFBitsetIsSet(unsigned char *_Nonnull storage, size_t idx)
{
return storage[idx / CHAR_BIT] & (1u << (idx % CHAR_BIT));
}
static OF_INLINE void
|
| ︙ | ︙ |
Modified tests/TestsAppDelegate.m from [0b419cd689] to [c47240e9e7].
| ︙ | ︙ | |||
46 47 48 49 50 51 52 53 54 55 56 57 58 59 |
#ifdef OF_NINTENDO_3DS
/* Newer versions of libctru started using id as a parameter name. */
# define id id_3ds
# include <3ds.h>
# undef id
#endif
#ifdef OF_PSP
static int
exit_cb(int arg1, int arg2, void *arg)
{
sceKernelExitGame();
| > > | 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 |
#ifdef OF_NINTENDO_3DS
/* Newer versions of libctru started using id as a parameter name. */
# define id id_3ds
# include <3ds.h>
# undef id
#endif
extern unsigned long OFHashSeed;
#ifdef OF_PSP
static int
exit_cb(int arg1, int arg2, void *arg)
{
sceKernelExitGame();
|
| ︙ | ︙ |