Overview
| Comment: | Add OFUUID |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
c5eb73a9c461461a51d849bcd3aff0d3 |
| User & Date: | js on 2021-10-17 14:25:21 |
| Other Links: | manifest | tags |
Context
|
2021-10-17
| ||
| 19:35 | Add MorphOS build to GitHub Actions (check-in: c72e1b4034 user: js tags: trunk) | |
| 14:25 | Add OFUUID (check-in: c5eb73a9c4 user: js tags: trunk) | |
| 12:06 | README.md: Add `make check` to instructions (check-in: 03edd2ac4f user: js tags: trunk) | |
Changes
Modified src/Makefile from [89f588f854] to [47315f910b].
| ︙ | ︙ | |||
93 94 95 96 97 98 99 100 101 102 103 104 105 106 |
OFTarArchive.m \
OFTarArchiveEntry.m \
OFThread.m \
OFTimer.m \
OFTriple.m \
OFURL.m \
OFURLHandler.m \
OFValue.m \
OFXMLAttribute.m \
OFXMLCDATA.m \
OFXMLCharacters.m \
OFXMLComment.m \
OFXMLElement.m \
OFXMLElement+Serialization.m \
| > | 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 |
OFTarArchive.m \
OFTarArchiveEntry.m \
OFThread.m \
OFTimer.m \
OFTriple.m \
OFURL.m \
OFURLHandler.m \
OFUUID.m \
OFValue.m \
OFXMLAttribute.m \
OFXMLCDATA.m \
OFXMLCharacters.m \
OFXMLComment.m \
OFXMLElement.m \
OFXMLElement+Serialization.m \
|
| ︙ | ︙ |
Added src/OFUUID.h version [a7ccfa8276].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 |
/*
* Copyright (c) 2008-2021 Jonathan Schleifer <js@nil.im>
*
* All rights reserved.
*
* This file is part of ObjFW. It may be distributed under the terms of the
* Q Public License 1.0, which can be found in the file LICENSE.QPL included in
* the packaging of this file.
*
* Alternatively, it may be distributed under the terms of the GNU General
* Public License, either version 2 or 3, which can be found in the file
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#import "OFObject.h"
OF_ASSUME_NONNULL_BEGIN
/**
* @class OFUUID OFUUID.h ObjFW/OFUUID.h
*
* @brief A UUID conforming to RFC 4122.
*/
OF_SUBCLASSING_RESTRICTED
@interface OFUUID: OFObject <OFCopying, OFComparing>
{
unsigned char _bytes[16];
}
/**
* @brief The UUID as a string.
*/
@property (readonly, nonatomic) OFString *UUIDString;
/**
* @brief Creates a new random UUID as per RFC 4122 version 4.
*
* @return A new, autoreleased OFUUID
*/
+ (instancetype)UUID;
/**
* @brief Initializes an already allocated OFUUID as a new random UUID as per
* RFC 4122 version 4.
*
* @return An initialized OFUUID
*/
- (instancetype)init;
/**
* @brief Compares the UUID to another UUID.
*
* @param UUID The UUID to compare to
* @return The result of the comparison
*/
- (OFComparisonResult)compare: (OFUUID *)UUID;
@end
OF_ASSUME_NONNULL_END
|
Added src/OFUUID.m version [da8220fbff].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 |
/*
* Copyright (c) 2008-2021 Jonathan Schleifer <js@nil.im>
*
* All rights reserved.
*
* This file is part of ObjFW. It may be distributed under the terms of the
* Q Public License 1.0, which can be found in the file LICENSE.QPL included in
* the packaging of this file.
*
* Alternatively, it may be distributed under the terms of the GNU General
* Public License, either version 2 or 3, which can be found in the file
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#include "config.h"
#import "OFUUID.h"
#import "OFString.h"
#import "OFInvalidArgumentException.h"
@implementation OFUUID
+ (instancetype)UUID
{
return [[[self alloc] init] autorelease];
}
- (instancetype)init
{
uint64_t r;
self = [super init];
r = OFRandom64();
memcpy(_bytes, &r, 8);
r = OFRandom64();
memcpy(_bytes + 8, &r, 8);
_bytes[6] &= ~((1 << 7) | (1 << 5) | (1 << 4));
_bytes[6] |= (1 << 6);
_bytes[8] &= ~(1 << 6);
_bytes[8] |= (1 << 7);
return self;
}
- (bool)isEqual: (id)object
{
OFUUID *UUID;
if (![object isKindOfClass: [OFUUID class]])
return false;
UUID = object;
return (memcmp(_bytes, UUID->_bytes, sizeof(_bytes)) == 0);
}
- (unsigned long)hash
{
unsigned long hash;
OFHashInit(&hash);
for (size_t i = 0; i < sizeof(_bytes); i++)
OFHashAdd(&hash, _bytes[i]);
OFHashFinalize(&hash);
return hash;
}
- (id)copy
{
return [self retain];
}
- (OFComparisonResult)compare: (OFUUID *)UUID
{
int comparison;
if (![UUID isKindOfClass: [OFUUID class]])
@throw [OFInvalidArgumentException exception];
if ((comparison = memcmp(_bytes, UUID->_bytes, sizeof(_bytes))) == 0)
return OFOrderedSame;
if (comparison > 0)
return OFOrderedDescending;
else
return OFOrderedAscending;
}
- (OFString *)UUIDString
{
return [OFString stringWithFormat:
@"%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-"
@"%02X%02X%02X%02X%02X%02X",
_bytes[0], _bytes[1], _bytes[2], _bytes[3],
_bytes[4], _bytes[5], _bytes[6], _bytes[7],
_bytes[8], _bytes[9], _bytes[10], _bytes[11],
_bytes[12], _bytes[13], _bytes[14], _bytes[15]];
}
- (OFString *)description
{
return self.UUIDString;
}
@end
|
Modified src/ObjFW.h from [304cf44661] to [59913cb5c3].
| ︙ | ︙ | |||
41 42 43 44 45 46 47 48 49 50 51 52 53 54 | #import "OFNull.h" #import "OFMethodSignature.h" #import "OFInvocation.h" #import "OFNumber.h" #import "OFDate.h" #import "OFURL.h" #import "OFURLHandler.h" #import "OFColor.h" #import "OFStream.h" #import "OFStdIOStream.h" #import "OFInflateStream.h" | > | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | #import "OFNull.h" #import "OFMethodSignature.h" #import "OFInvocation.h" #import "OFNumber.h" #import "OFDate.h" #import "OFUUID.h" #import "OFURL.h" #import "OFURLHandler.h" #import "OFColor.h" #import "OFStream.h" #import "OFStdIOStream.h" #import "OFInflateStream.h" |
| ︙ | ︙ |