Modified src/OFApplication.h
from [627b4181f1]
to [2d5bcb9dc9].
︙ | | | ︙ | |
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
|
{
OFString *_programName;
OFArray OF_GENERIC(OFString *) *_arguments;
OFMutableDictionary OF_GENERIC(OFString *, OFString *) *_environment;
int *_argc;
char ***_argv;
@public
id <OFApplicationDelegate> _delegate;
void (*_SIGINTHandler)(id, SEL);
#ifndef OF_WINDOWS
void (*_SIGHUPHandler)(id, SEL);
void (*_SIGUSR1Handler)(id, SEL);
void (*_SIGUSR2Handler)(id, SEL);
#endif
}
/*!
* The name of the program (argv[0]).
*/
@property (readonly, nonatomic) OFString *programName;
|
|
|
|
|
|
|
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
|
{
OFString *_programName;
OFArray OF_GENERIC(OFString *) *_arguments;
OFMutableDictionary OF_GENERIC(OFString *, OFString *) *_environment;
int *_argc;
char ***_argv;
@public
id <OFApplicationDelegate> _Nullable _delegate;
void (*_Nullable _SIGINTHandler)(id, SEL);
#ifndef OF_WINDOWS
void (*_Nullable _SIGHUPHandler)(id, SEL);
void (*_Nullable _SIGUSR1Handler)(id, SEL);
void (*_Nullable _SIGUSR2Handler)(id, SEL);
#endif
}
/*!
* The name of the program (argv[0]).
*/
@property (readonly, nonatomic) OFString *programName;
|
︙ | | | ︙ | |
Modified src/OFApplication.m
from [a37acbc186]
to [f12746971d].
︙ | | | ︙ | |
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
|
#define REGISTER_SIGNAL(sig) \
if ([delegate respondsToSelector: \
@selector(applicationDidReceive##sig)]) { \
_##sig##Handler = (void (*)(id, SEL))[(id)delegate \
methodForSelector: \
@selector(applicationDidReceive##sig)]; \
signal(sig, handle##sig); \
} else \
signal(sig, (void (*)(int))SIG_DFL);
_delegate = delegate;
REGISTER_SIGNAL(SIGINT)
#ifdef SIGHUP
REGISTER_SIGNAL(SIGHUP)
#endif
|
|
>
|
>
|
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
|
#define REGISTER_SIGNAL(sig) \
if ([delegate respondsToSelector: \
@selector(applicationDidReceive##sig)]) { \
_##sig##Handler = (void (*)(id, SEL))[(id)delegate \
methodForSelector: \
@selector(applicationDidReceive##sig)]; \
signal(sig, handle##sig); \
} else { \
_##sig##Handler = NULL; \
signal(sig, (void (*)(int))SIG_DFL); \
}
_delegate = delegate;
REGISTER_SIGNAL(SIGINT)
#ifdef SIGHUP
REGISTER_SIGNAL(SIGHUP)
#endif
|
︙ | | | ︙ | |
Modified src/OFArray.h
from [768648064e]
to [d3ec117a12].
︙ | | | ︙ | |
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
|
/*!
* @brief Checks whether the array contains an object equal to the specified
* object.
*
* @param object The object which is checked for being in the array
* @return A boolean whether the array contains the specified object
*/
- (bool)containsObject: (nullable ObjectType)object;
/*!
* @brief Checks whether the array contains an object with the specified
* address.
*
* @param object The object which is checked for being in the array
* @return A boolean whether the array contains an object with the specified
* address
*/
- (bool)containsObjectIdenticalTo: (nullable ObjectType)object;
/*!
* @brief Returns the first object of the array or `nil`.
*
* @warning The returned object is *not* retained and autoreleased for
* performance reasons!
*
|
|
|
|
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
|
/*!
* @brief Checks whether the array contains an object equal to the specified
* object.
*
* @param object The object which is checked for being in the array
* @return A boolean whether the array contains the specified object
*/
- (bool)containsObject: (ObjectType)object;
/*!
* @brief Checks whether the array contains an object with the specified
* address.
*
* @param object The object which is checked for being in the array
* @return A boolean whether the array contains an object with the specified
* address
*/
- (bool)containsObjectIdenticalTo: (ObjectType)object;
/*!
* @brief Returns the first object of the array or `nil`.
*
* @warning The returned object is *not* retained and autoreleased for
* performance reasons!
*
|
︙ | | | ︙ | |
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
|
#if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN)
# undef ObjectType
#endif
@end
@interface OFArrayEnumerator: OFEnumerator
{
OFArray *_array;
size_t _count;
unsigned long _mutations;
unsigned long *_mutationsPtr;
size_t _position;
}
- initWithArray: (OFArray *)data
mutationsPtr: (unsigned long *_Nullable)mutationsPtr;
@end
OF_ASSUME_NONNULL_END
|
|
|
|
|
|
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
|
#if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN)
# undef ObjectType
#endif
@end
@interface OFArrayEnumerator: OFEnumerator
{
OFArray *_array;
size_t _count;
unsigned long _mutations;
unsigned long *_Nullable _mutationsPtr;
size_t _position;
}
- initWithArray: (OFArray *)data
mutationsPtr: (unsigned long *_Nullable)mutationsPtr;
@end
OF_ASSUME_NONNULL_END
|
︙ | | | ︙ | |
Modified src/OFCollection.h
from [443478d52e]
to [835760a641].
︙ | | | ︙ | |
34
35
36
37
38
39
40
41
42
43
44
|
/*!
* @brief Checks whether the collection contains an object equal to the
* specified object.
*
* @param object The object which is checked for being in the collection
* @return A boolean whether the collection contains the specified object
*/
- (bool)containsObject: (nullable id)object;
@end
OF_ASSUME_NONNULL_END
|
|
|
34
35
36
37
38
39
40
41
42
43
44
|
/*!
* @brief Checks whether the collection contains an object equal to the
* specified object.
*
* @param object The object which is checked for being in the collection
* @return A boolean whether the collection contains the specified object
*/
- (bool)containsObject: (id)object;
@end
OF_ASSUME_NONNULL_END
|
Modified src/OFData.h
from [9086a3be08]
to [1f9618a527].
︙ | | | ︙ | |
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
*
* For security reasons, serialization and deserialization is only implemented
* for OFData with item size 1.
*/
@interface OFData: OFObject <OFCopying, OFMutableCopying, OFComparing,
OFSerialization, OFMessagePackRepresentation>
{
unsigned char *_items;
size_t _count, _itemSize;
bool _freeWhenDone;
}
/*!
* The size of a single item in the OFData in bytes.
*/
|
|
|
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
*
* For security reasons, serialization and deserialization is only implemented
* for OFData with item size 1.
*/
@interface OFData: OFObject <OFCopying, OFMutableCopying, OFComparing,
OFSerialization, OFMessagePackRepresentation>
{
unsigned char *_Nullable _items;
size_t _count, _itemSize;
bool _freeWhenDone;
}
/*!
* The size of a single item in the OFData in bytes.
*/
|
︙ | | | ︙ | |
Modified src/OFGZIPStream.h
from [28a3137a76]
to [5bd0cee2bc].
︙ | | | ︙ | |
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
*
* @brief A class that handles GZIP compression and decompression transparently
* for an underlying stream.
*/
@interface OFGZIPStream: OFStream
{
OFStream *_stream;
OFInflateStream *_inflateStream;
enum of_gzip_stream_state {
OF_GZIP_STREAM_ID1,
OF_GZIP_STREAM_ID2,
OF_GZIP_STREAM_COMPRESSION_METHOD,
OF_GZIP_STREAM_FLAGS,
OF_GZIP_STREAM_MODIFICATION_TIME,
OF_GZIP_STREAM_EXTRA_FLAGS,
|
|
|
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
*
* @brief A class that handles GZIP compression and decompression transparently
* for an underlying stream.
*/
@interface OFGZIPStream: OFStream
{
OFStream *_stream;
OFInflateStream *_Nullable _inflateStream;
enum of_gzip_stream_state {
OF_GZIP_STREAM_ID1,
OF_GZIP_STREAM_ID2,
OF_GZIP_STREAM_COMPRESSION_METHOD,
OF_GZIP_STREAM_FLAGS,
OF_GZIP_STREAM_MODIFICATION_TIME,
OF_GZIP_STREAM_EXTRA_FLAGS,
|
︙ | | | ︙ | |
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
OF_GZIP_STREAM_OS_NTFS = 11,
OF_GZIP_STREAM_OS_QDOS = 12,
OF_GZIP_STREAM_OS_ACORN_RISCOS = 13,
OF_GZIP_STREAM_OS_UNKNOWN = 255
} _OS;
size_t _bytesRead;
uint8_t _buffer[4];
OFDate *_modificationDate;
uint16_t _extraLength;
uint32_t _CRC32, _uncompressedSize;
}
/*!
* @brief Creates a new OFGZIPStream with the specified underlying stream.
*
|
|
|
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
OF_GZIP_STREAM_OS_NTFS = 11,
OF_GZIP_STREAM_OS_QDOS = 12,
OF_GZIP_STREAM_OS_ACORN_RISCOS = 13,
OF_GZIP_STREAM_OS_UNKNOWN = 255
} _OS;
size_t _bytesRead;
uint8_t _buffer[4];
OFDate *_Nullable _modificationDate;
uint16_t _extraLength;
uint32_t _CRC32, _uncompressedSize;
}
/*!
* @brief Creates a new OFGZIPStream with the specified underlying stream.
*
|
︙ | | | ︙ | |
Modified src/OFHMAC.h
from [78bbd3d482]
to [10fea24a9c].
︙ | | | ︙ | |
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
* @class OFHMAC OFHMAC.h ObjFW/OFHMAC.h
*
* @brief A class which provides methods to calculate an HMAC.
*/
@interface OFHMAC: OFObject
{
Class <OFCryptoHash> _hashClass;
id <OFCryptoHash> _outerHash, _innerHash;
id <OFCryptoHash> _outerHashCopy, _innerHashCopy;
bool _calculated;
}
/*! The class for the cryptographic hash used by the HMAC. */
@property (readonly, nonatomic) Class <OFCryptoHash> hashClass;
/*!
|
|
|
|
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
* @class OFHMAC OFHMAC.h ObjFW/OFHMAC.h
*
* @brief A class which provides methods to calculate an HMAC.
*/
@interface OFHMAC: OFObject
{
Class <OFCryptoHash> _hashClass;
id <OFCryptoHash> _Nullable _outerHash, _innerHash;
id <OFCryptoHash> _Nullable _outerHashCopy, _innerHashCopy;
bool _calculated;
}
/*! The class for the cryptographic hash used by the HMAC. */
@property (readonly, nonatomic) Class <OFCryptoHash> hashClass;
/*!
|
︙ | | | ︙ | |
Modified src/OFHTTPClient.h
from [a366523288]
to [cd3656efe4].
︙ | | | ︙ | |
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
|
/*!
* @class OFHTTPClient OFHTTPClient.h ObjFW/OFHTTPClient.h
*
* @brief A class for performing HTTP requests.
*/
@interface OFHTTPClient: OFObject
{
id <OFHTTPClientDelegate> _delegate;
bool _insecureRedirectsAllowed;
OFTCPSocket *_socket;
OFURL *_lastURL;
bool _lastWasHEAD;
OFHTTPResponse *_lastResponse;
}
/*!
* The delegate of the HTTP request.
*/
@property OF_NULLABLE_PROPERTY (nonatomic, assign)
id <OFHTTPClientDelegate> delegate;
|
|
|
|
|
|
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
|
/*!
* @class OFHTTPClient OFHTTPClient.h ObjFW/OFHTTPClient.h
*
* @brief A class for performing HTTP requests.
*/
@interface OFHTTPClient: OFObject
{
id <OFHTTPClientDelegate> _Nullable _delegate;
bool _insecureRedirectsAllowed;
OFTCPSocket *_Nullable _socket;
OFURL *_Nullable _lastURL;
bool _lastWasHEAD;
OFHTTPResponse *_Nullable _lastResponse;
}
/*!
* The delegate of the HTTP request.
*/
@property OF_NULLABLE_PROPERTY (nonatomic, assign)
id <OFHTTPClientDelegate> delegate;
|
︙ | | | ︙ | |
Modified src/OFHTTPCookie.h
from [b3a1f16ba1]
to [00698eed19].
︙ | | | ︙ | |
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
* @class OFHTTPCookie OFHTTPCookie.h ObjFW/OFHTTPCookie.h
*
* @brief A class for storing and manipulating HTTP cookies.
*/
@interface OFHTTPCookie: OFObject <OFCopying>
{
OFString *_name, *_value, *_domain, *_path;
OFDate *_expires;
bool _secure, _HTTPOnly;
OFMutableArray OF_GENERIC(OFString *) *_extensions;
}
/*!
* The name of the cookie.
*/
|
|
|
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
* @class OFHTTPCookie OFHTTPCookie.h ObjFW/OFHTTPCookie.h
*
* @brief A class for storing and manipulating HTTP cookies.
*/
@interface OFHTTPCookie: OFObject <OFCopying>
{
OFString *_name, *_value, *_domain, *_path;
OFDate *_Nullable _expires;
bool _secure, _HTTPOnly;
OFMutableArray OF_GENERIC(OFString *) *_extensions;
}
/*!
* The name of the cookie.
*/
|
︙ | | | ︙ | |
Modified src/OFHTTPRequest.h
from [c4ecec1316]
to [c06e523cb0].
︙ | | | ︙ | |
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
* @brief A class for storing HTTP requests.
*/
@interface OFHTTPRequest: OFObject <OFCopying>
{
OFURL *_URL;
of_http_request_method_t _method;
of_http_request_protocol_version_t _protocolVersion;
OFDictionary OF_GENERIC(OFString *, OFString *) *_headers;
OFData *_body;
OFString *_remoteAddress;
}
/*!
* The URL of the HTTP request.
*/
@property (nonatomic, copy) OFURL *URL;
|
|
|
|
|
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
* @brief A class for storing HTTP requests.
*/
@interface OFHTTPRequest: OFObject <OFCopying>
{
OFURL *_URL;
of_http_request_method_t _method;
of_http_request_protocol_version_t _protocolVersion;
OFDictionary OF_GENERIC(OFString *, OFString *) *_Nullable _headers;
OFData *_Nullable _body;
OFString *_Nullable _remoteAddress;
}
/*!
* The URL of the HTTP request.
*/
@property (nonatomic, copy) OFURL *URL;
|
︙ | | | ︙ | |
Modified src/OFHTTPResponse.h
from [96ba448907]
to [50360976c1].
︙ | | | ︙ | |
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
* The status code of the reply to the HTTP request.
*/
@property (nonatomic) short statusCode;
/*!
* The headers of the reply to the HTTP request.
*/
@property OF_NULLABLE_PROPERTY (nonatomic, copy)
OFDictionary OF_GENERIC(OFString *, OFString *) *headers;
/*!
* @brief Sets the protocol version of the HTTP request reply.
*
* @param protocolVersion The protocol version of the HTTP request reply
*/
- (void)setProtocolVersion: (of_http_request_protocol_version_t)protocolVersion;
|
<
|
>
|
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
* The status code of the reply to the HTTP request.
*/
@property (nonatomic) short statusCode;
/*!
* The headers of the reply to the HTTP request.
*/
@property (copy, nonatomic) OFDictionary OF_GENERIC(OFString *, OFString *)
*headers;
/*!
* @brief Sets the protocol version of the HTTP request reply.
*
* @param protocolVersion The protocol version of the HTTP request reply
*/
- (void)setProtocolVersion: (of_http_request_protocol_version_t)protocolVersion;
|
︙ | | | ︙ | |
Modified src/OFHTTPResponse.m
from [a696a64757]
to [78fcbe257c].
︙ | | | ︙ | |
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
|
@implementation OFHTTPResponse
@synthesize statusCode = _statusCode, headers = _headers;
- init
{
self = [super init];
_protocolVersion.major = 1;
_protocolVersion.minor = 1;
return self;
}
- (void)dealloc
{
[_headers release];
|
>
|
|
>
>
>
>
>
|
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
|
@implementation OFHTTPResponse
@synthesize statusCode = _statusCode, headers = _headers;
- init
{
self = [super init];
@try {
_protocolVersion.major = 1;
_protocolVersion.minor = 1;
_headers = [[OFDictionary alloc] init];
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (void)dealloc
{
[_headers release];
|
︙ | | | ︙ | |
Modified src/OFHTTPServer.h
from [6f778fd782]
to [e0793a9509].
︙ | | | ︙ | |
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
|
/*!
* @class OFHTTPServer OFHTTPServer.h ObjFW/OFHTTPServer.h
*
* @brief A class for creating a simple HTTP server inside of applications.
*/
@interface OFHTTPServer: OFObject
{
OFString *_host;
uint16_t _port;
id <OFHTTPServerDelegate> _delegate;
OFString *_name;
OFTCPSocket *_listeningSocket;
}
/*!
* The host on which the HTTP server will listen.
*/
@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFString *host;
|
|
|
|
|
|
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
|
/*!
* @class OFHTTPServer OFHTTPServer.h ObjFW/OFHTTPServer.h
*
* @brief A class for creating a simple HTTP server inside of applications.
*/
@interface OFHTTPServer: OFObject
{
OFString *_Nullable _host;
uint16_t _port;
id <OFHTTPServerDelegate> _Nullable _delegate;
OFString *_Nullable _name;
OFTCPSocket *_Nullable _listeningSocket;
}
/*!
* The host on which the HTTP server will listen.
*/
@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFString *host;
|
︙ | | | ︙ | |
Modified src/OFINICategory+Private.h
from [59ee9ce154]
to [5583b4a433].
︙ | | | ︙ | |
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
#import "OFString.h"
OF_ASSUME_NONNULL_BEGIN
@class OFStream;
@interface OFINICategory ()
- (instancetype)of_init OF_METHOD_FAMILY(init);
- (void)of_parseLine: (OFString *)line;
- (bool)of_writeToStream: (OFStream *)stream
encoding: (of_string_encoding_t)encoding
first: (bool)first;
@end
OF_ASSUME_NONNULL_END
|
|
|
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
#import "OFString.h"
OF_ASSUME_NONNULL_BEGIN
@class OFStream;
@interface OFINICategory ()
- (instancetype)of_initWithName: (OFString *)name OF_METHOD_FAMILY(init);
- (void)of_parseLine: (OFString *)line;
- (bool)of_writeToStream: (OFStream *)stream
encoding: (of_string_encoding_t)encoding
first: (bool)first;
@end
OF_ASSUME_NONNULL_END
|
Modified src/OFINICategory.m
from [77ec98f4c0]
to [e8548169a5].
︙ | | | ︙ | |
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
|
[super dealloc];
}
@end
@implementation OFINICategory
@synthesize name = _name;
- (instancetype)of_init
{
self = [super init];
@try {
_lines = [[OFMutableArray alloc] init];
} @catch (id e) {
[self release];
@throw e;
}
return self;
|
|
>
|
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
|
[super dealloc];
}
@end
@implementation OFINICategory
@synthesize name = _name;
- (instancetype)of_initWithName: (OFString *)name
{
self = [super init];
@try {
_name = [name copy];
_lines = [[OFMutableArray alloc] init];
} @catch (id e) {
[self release];
@throw e;
}
return self;
|
︙ | | | ︙ | |
Modified src/OFINIFile.m
from [5212c0b9d0]
to [01663115e7].
︙ | | | ︙ | |
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
|
void *pool = objc_autoreleasePoolPush();
OFINICategory *category;
for (category in _categories)
if ([[category name] isEqual: name])
return category;
category = [[[OFINICategory alloc] of_init] autorelease];
[category setName: name];
[_categories addObject: category];
objc_autoreleasePoolPop(pool);
return category;
}
|
|
<
|
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
|
void *pool = objc_autoreleasePoolPush();
OFINICategory *category;
for (category in _categories)
if ([[category name] isEqual: name])
return category;
category = [[[OFINICategory alloc] of_initWithName: name] autorelease];
[_categories addObject: category];
objc_autoreleasePoolPop(pool);
return category;
}
|
︙ | | | ︙ | |
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
|
if (![line hasSuffix: @"]"])
@throw [OFInvalidFormatException exception];
categoryName = [line substringWithRange:
of_range(1, [line length] - 2)];
category = [[[OFINICategory alloc]
of_init] autorelease];
[category setName: categoryName];
[_categories addObject: category];
} else {
if (category == nil)
@throw [OFInvalidFormatException exception];
[category of_parseLine: line];
}
|
<
|
|
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
|
if (![line hasSuffix: @"]"])
@throw [OFInvalidFormatException exception];
categoryName = [line substringWithRange:
of_range(1, [line length] - 2)];
category = [[[OFINICategory alloc]
of_initWithName: categoryName] autorelease];
[_categories addObject: category];
} else {
if (category == nil)
@throw [OFInvalidFormatException exception];
[category of_parseLine: line];
}
|
︙ | | | ︙ | |
Modified src/OFInflateStream.h
from [2b188fa81c]
to [d858471aa3].
︙ | | | ︙ | |
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
|
#endif
OFStream *_stream;
uint8_t _buffer[OF_INFLATE_STREAM_BUFFER_SIZE];
uint16_t _bufferIndex, _bufferLength;
uint8_t _byte;
uint8_t _bitIndex, _savedBitsLength;
uint16_t _savedBits;
uint8_t *_slidingWindow;
uint16_t _slidingWindowIndex, _slidingWindowMask;
int _state;
union {
struct {
uint8_t position;
uint8_t length[4];
} uncompressedHeader;
struct {
uint16_t position, length;
} uncompressed;
struct {
struct huffman_tree *litLenTree, *distTree;
struct huffman_tree *codeLenTree, *treeIter;
uint8_t *lengths;
uint16_t receivedCount;
uint8_t value, litLenCodesCount, distCodesCount;
uint8_t codeLenCodesCount;
} huffmanTree;
struct {
struct huffman_tree *litLenTree, *distTree;
struct huffman_tree *treeIter;
int state;
uint16_t value, length, distance, extraBits;
} huffman;
} _context;
bool _inLastBlock, _atEndOfStream;
}
|
|
>
|
>
|
|
>
|
|
|
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
|
#endif
OFStream *_stream;
uint8_t _buffer[OF_INFLATE_STREAM_BUFFER_SIZE];
uint16_t _bufferIndex, _bufferLength;
uint8_t _byte;
uint8_t _bitIndex, _savedBitsLength;
uint16_t _savedBits;
uint8_t *_Nullable _slidingWindow;
uint16_t _slidingWindowIndex, _slidingWindowMask;
int _state;
union {
struct {
uint8_t position;
uint8_t length[4];
} uncompressedHeader;
struct {
uint16_t position, length;
} uncompressed;
struct {
struct huffman_tree *_Nullable litLenTree;
struct huffman_tree *_Nullable distTree;
struct huffman_tree *_Nullable codeLenTree;
struct huffman_tree *_Nullable treeIter;
uint8_t *_Nullable lengths;
uint16_t receivedCount;
uint8_t value, litLenCodesCount, distCodesCount;
uint8_t codeLenCodesCount;
} huffmanTree;
struct {
struct huffman_tree *_Nullable litLenTree;
struct huffman_tree *_Nullable distTree;
struct huffman_tree *_Nullable treeIter;
int state;
uint16_t value, length, distance, extraBits;
} huffman;
} _context;
bool _inLastBlock, _atEndOfStream;
}
|
︙ | | | ︙ | |
Modified src/OFIntrospection.h
from [be287d0416]
to [69d1f3e9bd].
︙ | | | ︙ | |
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
*
* @brief A class for describing a property.
*/
@interface OFProperty: OFObject
{
OFString *_name;
unsigned _attributes;
OFString *_getter, *_setter;
}
/*!
* The name of the property.
*/
@property (readonly, nonatomic) OFString *name;
|
|
|
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
*
* @brief A class for describing a property.
*/
@interface OFProperty: OFObject
{
OFString *_name;
unsigned _attributes;
OFString *_Nullable _getter, *_Nullable _setter;
}
/*!
* The name of the property.
*/
@property (readonly, nonatomic) OFString *name;
|
︙ | | | ︙ | |
Modified src/OFKernelEventObserver.h
from [46bd90f11e]
to [25392c4526].
︙ | | | ︙ | |
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
|
*/
@interface OFKernelEventObserver: OFObject
{
OFMutableArray OF_GENERIC(id <OFReadyForReadingObserving>)
*_readObjects;
OFMutableArray OF_GENERIC(id <OFReadyForWritingObserving>)
*_writeObjects;
id <OFKernelEventObserverDelegate> _delegate;
#ifdef OF_HAVE_PIPE
int _cancelFD[2];
#else
of_socket_t _cancelFD[2];
struct sockaddr_in _cancelAddr;
#endif
#ifdef OF_HAVE_THREADS
|
|
|
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
|
*/
@interface OFKernelEventObserver: OFObject
{
OFMutableArray OF_GENERIC(id <OFReadyForReadingObserving>)
*_readObjects;
OFMutableArray OF_GENERIC(id <OFReadyForWritingObserving>)
*_writeObjects;
id <OFKernelEventObserverDelegate> _Nullable _delegate;
#ifdef OF_HAVE_PIPE
int _cancelFD[2];
#else
of_socket_t _cancelFD[2];
struct sockaddr_in _cancelAddr;
#endif
#ifdef OF_HAVE_THREADS
|
︙ | | | ︙ | |
Modified src/OFList.h
from [56e2b65e10]
to [ebae885803].
︙ | | | ︙ | |
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
*/
@interface OFList OF_GENERIC(ObjectType): OFObject <OFCopying, OFCollection,
OFSerialization>
#if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN)
# define ObjectType id
#endif
{
of_list_object_t *_firstListObject;
of_list_object_t *_lastListObject;
size_t _count;
unsigned long _mutations;
}
/*!
* The first list object of the list.
*/
@property OF_NULLABLE_PROPERTY (readonly, nonatomic)
of_list_object_t *firstListObject;
|
|
|
|
|
|
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
*/
@interface OFList OF_GENERIC(ObjectType): OFObject <OFCopying, OFCollection,
OFSerialization>
#if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN)
# define ObjectType id
#endif
{
of_list_object_t *_Nullable _firstListObject;
of_list_object_t *_Nullable _lastListObject;
size_t _count;
unsigned long _mutations;
}
/*!
* The first list object of the list.
*/
@property OF_NULLABLE_PROPERTY (readonly, nonatomic)
of_list_object_t *firstListObject;
|
︙ | | | ︙ | |
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
|
#if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN)
# undef ObjectType
#endif
@end
@interface OFListEnumerator: OFEnumerator
{
OFList *_list;
of_list_object_t *_current;
unsigned long _mutations;
unsigned long *_mutationsPtr;
}
- initWithList: (OFList *)list
mutationsPointer: (unsigned long *)mutationsPtr;
@end
OF_ASSUME_NONNULL_END
|
|
|
|
|
|
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
|
#if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN)
# undef ObjectType
#endif
@end
@interface OFListEnumerator: OFEnumerator
{
OFList *_list;
of_list_object_t *_Nullable _current;
unsigned long _mutations;
unsigned long *_Nullable _mutationsPtr;
}
- initWithList: (OFList *)list
mutationsPointer: (unsigned long *)mutationsPtr;
@end
OF_ASSUME_NONNULL_END
|
Modified src/OFLocalization.h
from [f635a4f99c]
to [03b54489d7].
︙ | | | ︙ | |
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
/*!
* @class OFLocalization OFLocalization.h ObjFW/OFLocalization.h
*
* @brief A class for querying the locale and retrieving localized strings.
*/
@interface OFLocalization: OFObject
{
OFString *_language;
OFString *_territory;
of_string_encoding_t _encoding;
OFString *_decimalPoint;
OFMutableArray OF_GENERIC(OFDictionary OF_GENERIC(OFString *, id) *)
*_localizedStrings;
}
/**
|
|
<
|
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
/*!
* @class OFLocalization OFLocalization.h ObjFW/OFLocalization.h
*
* @brief A class for querying the locale and retrieving localized strings.
*/
@interface OFLocalization: OFObject
{
OFString *_Nullable _language, *_Nullable _territory;
of_string_encoding_t _encoding;
OFString *_decimalPoint;
OFMutableArray OF_GENERIC(OFDictionary OF_GENERIC(OFString *, id) *)
*_localizedStrings;
}
/**
|
︙ | | | ︙ | |
Modified src/OFMapTable.h
from [d688a725dd]
to [21253784bd].
︙ | | | ︙ | |
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
|
*
* @brief A class similar to OFDictionary, but providing more options how keys
* and objects should be retained, released, compared and hashed.
*/
@interface OFMapTable: OFObject <OFCopying, OFFastEnumeration>
{
of_map_table_functions_t _keyFunctions, _objectFunctions;
struct of_map_table_bucket **_buckets;
uint32_t _count, _capacity;
uint8_t _rotate;
unsigned long _mutations;
}
/*!
* The key functions used by the map table.
|
|
|
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
|
*
* @brief A class similar to OFDictionary, but providing more options how keys
* and objects should be retained, released, compared and hashed.
*/
@interface OFMapTable: OFObject <OFCopying, OFFastEnumeration>
{
of_map_table_functions_t _keyFunctions, _objectFunctions;
struct of_map_table_bucket *_Nonnull *_Nullable _buckets;
uint32_t _count, _capacity;
uint8_t _rotate;
unsigned long _mutations;
}
/*!
* The key functions used by the map table.
|
︙ | | | ︙ | |
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
|
*
* @brief A class which provides methods to enumerate through an OFMapTable's
* keys or objects.
*/
@interface OFMapTableEnumerator: OFObject
{
OFMapTable *_mapTable;
struct of_map_table_bucket **_buckets;
uint32_t _capacity;
unsigned long _mutations;
unsigned long *_mutationsPtr;
uint32_t _position;
}
- init OF_UNAVAILABLE;
/*!
* @brief Returns the next object.
|
|
|
|
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
|
*
* @brief A class which provides methods to enumerate through an OFMapTable's
* keys or objects.
*/
@interface OFMapTableEnumerator: OFObject
{
OFMapTable *_mapTable;
struct of_map_table_bucket *_Nonnull *_Nullable _buckets;
uint32_t _capacity;
unsigned long _mutations;
unsigned long *_Nullable _mutationsPtr;
uint32_t _position;
}
- init OF_UNAVAILABLE;
/*!
* @brief Returns the next object.
|
︙ | | | ︙ | |
Modified src/OFMutex.h
from [60b100f7b5]
to [0ee6091df5].
︙ | | | ︙ | |
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
*
* @brief A class for creating mutual exclusions.
*/
@interface OFMutex: OFObject <OFLocking>
{
of_mutex_t _mutex;
bool _initialized;
OFString *_name;
}
/*!
* @brief Creates a new mutex.
*
* @return A new autoreleased mutex.
*/
|
|
|
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
*
* @brief A class for creating mutual exclusions.
*/
@interface OFMutex: OFObject <OFLocking>
{
of_mutex_t _mutex;
bool _initialized;
OFString *_Nullable _name;
}
/*!
* @brief Creates a new mutex.
*
* @return A new autoreleased mutex.
*/
|
︙ | | | ︙ | |
Modified src/OFOptionsParser.h
from [b82c75fff0]
to [b57dc17fb3].
︙ | | | ︙ | |
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
@interface OFOptionsParser: OFObject
{
of_options_parser_option_t *_options;
OFMapTable *_longOptions;
OFArray OF_GENERIC(OFString *) *_arguments;
size_t _index, _subIndex;
of_unichar_t _lastOption;
OFString *_lastLongOption, *_argument;
bool _done;
}
/*!
* The last parsed option.
*
* If @ref nextOption returned `?` or `:`, this returns the option which was
|
|
|
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
@interface OFOptionsParser: OFObject
{
of_options_parser_option_t *_options;
OFMapTable *_longOptions;
OFArray OF_GENERIC(OFString *) *_arguments;
size_t _index, _subIndex;
of_unichar_t _lastOption;
OFString *_Nullable _lastLongOption, *_Nullable _argument;
bool _done;
}
/*!
* The last parsed option.
*
* If @ref nextOption returned `?` or `:`, this returns the option which was
|
︙ | | | ︙ | |
Modified src/OFRecursiveMutex.h
from [8408c300d0]
to [6ef5e2c06f].
︙ | | | ︙ | |
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
* @brief A class for creating mutual exclusions which can be entered
* recursively.
*/
@interface OFRecursiveMutex: OFObject <OFLocking>
{
of_rmutex_t _rmutex;
bool _initialized;
OFString *_name;
}
/*!
* @brief Creates a new recursive mutex.
*
* @return A new autoreleased recursive mutex.
*/
|
|
|
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
* @brief A class for creating mutual exclusions which can be entered
* recursively.
*/
@interface OFRecursiveMutex: OFObject <OFLocking>
{
of_rmutex_t _rmutex;
bool _initialized;
OFString *_Nullable _name;
}
/*!
* @brief Creates a new recursive mutex.
*
* @return A new autoreleased recursive mutex.
*/
|
︙ | | | ︙ | |
Modified src/OFStream.h
from [fc84511d6f]
to [1cb5dc2e2d].
︙ | | | ︙ | |
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
|
OFReadyForReadingObserving, OFReadyForWritingObserving,
#endif
OFCopying>
{
#if !defined(OF_SEEKABLE_STREAM_M) && !defined(OF_TCP_SOCKET_M)
@private
#endif
char *_readBuffer, *_readBufferMemory, *_writeBuffer;
size_t _readBufferLength, _writeBufferLength;
bool _writeBuffered, _waitingForDelimiter;
@protected
bool _blocking;
}
/*!
|
>
|
|
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
|
OFReadyForReadingObserving, OFReadyForWritingObserving,
#endif
OFCopying>
{
#if !defined(OF_SEEKABLE_STREAM_M) && !defined(OF_TCP_SOCKET_M)
@private
#endif
char *_Nullable _readBuffer, *_Nullable _readBufferMemory;
char *_Nullable _writeBuffer;
size_t _readBufferLength, _writeBufferLength;
bool _writeBuffered, _waitingForDelimiter;
@protected
bool _blocking;
}
/*!
|
︙ | | | ︙ | |
Modified src/OFString_UTF8.h
from [27665fb3c4]
to [b15a7ec396].
︙ | | | ︙ | |
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
struct of_string_utf8_ivars {
char *cString;
size_t cStringLength;
bool isUTF8;
size_t length;
bool hashed;
uint32_t hash;
char *freeWhenDone;
} *restrict _s;
struct of_string_utf8_ivars _storage;
}
@end
#ifdef __cplusplus
extern "C" {
|
|
|
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
struct of_string_utf8_ivars {
char *cString;
size_t cStringLength;
bool isUTF8;
size_t length;
bool hashed;
uint32_t hash;
char *_Nullable freeWhenDone;
} *restrict _s;
struct of_string_utf8_ivars _storage;
}
@end
#ifdef __cplusplus
extern "C" {
|
︙ | | | ︙ | |
Modified src/OFTCPSocket.h
from [0d4361b9a8]
to [91bb6c7528].
︙ | | | ︙ | |
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
*
* To connect to a server, create a socket and connect it.
* To create a server, create a socket, bind it and listen on it.
*/
@interface OFTCPSocket: OFStreamSocket
{
bool _listening;
struct sockaddr *_address;
socklen_t _addressLength;
OFString *_SOCKS5Host;
uint16_t _SOCKS5Port;
#ifdef OF_WII
uint16_t _port;
#endif
}
/*!
|
|
|
|
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
*
* To connect to a server, create a socket and connect it.
* To create a server, create a socket, bind it and listen on it.
*/
@interface OFTCPSocket: OFStreamSocket
{
bool _listening;
struct sockaddr *_Nullable _address;
socklen_t _addressLength;
OFString *_Nullable _SOCKS5Host;
uint16_t _SOCKS5Port;
#ifdef OF_WII
uint16_t _port;
#endif
}
/*!
|
︙ | | | ︙ | |
Modified src/OFTarArchive.h
from [dede3f7288]
to [9c5a85aa2e].
︙ | | | ︙ | |
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
@interface OFTarArchive: OFObject
{
#ifdef OF_TAR_ARCHIVE_ENTRY_M
@public
#endif
OFStream *_stream;
@protected
OFTarArchiveEntry *_lastReturnedEntry;
}
/*!
* @brief Creates a new OFTarArchive object with the specified stream.
*
* @param stream A stream from which the tar archive will be read
* @return A new, autoreleased OFTarArchive
|
|
|
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
@interface OFTarArchive: OFObject
{
#ifdef OF_TAR_ARCHIVE_ENTRY_M
@public
#endif
OFStream *_stream;
@protected
OFTarArchiveEntry *_Nullable _lastReturnedEntry;
}
/*!
* @brief Creates a new OFTarArchive object with the specified stream.
*
* @param stream A stream from which the tar archive will be read
* @return A new, autoreleased OFTarArchive
|
︙ | | | ︙ | |
Modified src/OFTarArchiveEntry.h
from [37e5a4326d]
to [c755caa995].
︙ | | | ︙ | |
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
|
OFStream *_stream;
bool _atEndOfStream;
OFString *_fileName;
uint32_t _mode;
uint64_t _size, _toRead;
OFDate *_modificationDate;
of_tar_archive_entry_type_t _type;
OFString *_targetFileName;
OFString *_owner, *_group;
uint32_t _deviceMajor, _deviceMinor;
}
/*!
* The file name of the entry.
*/
@property (readonly, nonatomic) OFString *fileName;
|
|
|
|
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
|
OFStream *_stream;
bool _atEndOfStream;
OFString *_fileName;
uint32_t _mode;
uint64_t _size, _toRead;
OFDate *_modificationDate;
of_tar_archive_entry_type_t _type;
OFString *_Nullable _targetFileName;
OFString *_Nullable _owner, *_Nullable _group;
uint32_t _deviceMajor, _deviceMinor;
}
/*!
* The file name of the entry.
*/
@property (readonly, nonatomic) OFString *fileName;
|
︙ | | | ︙ | |
Modified src/OFThread.h
from [f3aa3dc787]
to [8bc0990f48].
︙ | | | ︙ | |
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
OF_THREAD_WAITING_FOR_JOIN
} _running;
void *_pool;
# ifdef OF_HAVE_BLOCKS
of_thread_block_t _threadBlock;
# endif
id _returnValue;
OFRunLoop *_runLoop;
OFMutableDictionary *_threadDictionary;
@private
OFString *_name;
}
#ifdef OF_HAVE_BLOCKS
/*!
* The block to execute in the thread.
*/
@property (readonly, nonatomic) of_thread_block_t threadBlock;
|
|
|
|
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
OF_THREAD_WAITING_FOR_JOIN
} _running;
void *_pool;
# ifdef OF_HAVE_BLOCKS
of_thread_block_t _threadBlock;
# endif
id _returnValue;
OFRunLoop *_Nullable _runLoop;
OFMutableDictionary *_threadDictionary;
@private
OFString *_Nullable _name;
}
#ifdef OF_HAVE_BLOCKS
/*!
* The block to execute in the thread.
*/
@property (readonly, nonatomic) of_thread_block_t threadBlock;
|
︙ | | | ︙ | |
Modified src/OFTimer.h
from [a9d9f7dbbd]
to [71d9d15e16].
︙ | | | ︙ | |
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
|
*
* @brief A class for creating and firing timers.
*/
@interface OFTimer: OFObject <OFComparing>
{
OFDate *_fireDate;
of_time_interval_t _interval;
id _target, _object1, _object2;
SEL _selector;
uint8_t _arguments;
bool _repeats;
#ifdef OF_HAVE_BLOCKS
of_timer_block_t _block;
#endif
bool _valid;
#ifdef OF_HAVE_THREADS
OFCondition *_condition;
bool _done;
#endif
OFRunLoop *_inRunLoop;
}
/*!
* The time interval in which the timer will repeat, if it is a repeating
* timer.
*/
@property (readonly, nonatomic) of_time_interval_t timeInterval;
|
|
>
|
|
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
|
*
* @brief A class for creating and firing timers.
*/
@interface OFTimer: OFObject <OFComparing>
{
OFDate *_fireDate;
of_time_interval_t _interval;
id _target;
id _Nullable _object1, _object2;
SEL _selector;
uint8_t _arguments;
bool _repeats;
#ifdef OF_HAVE_BLOCKS
of_timer_block_t _block;
#endif
bool _valid;
#ifdef OF_HAVE_THREADS
OFCondition *_condition;
bool _done;
#endif
OFRunLoop *_Nullable _inRunLoop;
}
/*!
* The time interval in which the timer will repeat, if it is a repeating
* timer.
*/
@property (readonly, nonatomic) of_time_interval_t timeInterval;
|
︙ | | | ︙ | |
Modified src/OFURL.h
from [94ac818021]
to [d9d859f93e].
︙ | | | ︙ | |
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
*
* @brief A class for parsing URLs and accessing parts of it.
*/
@interface OFURL: OFObject <OFCopying, OFMutableCopying, OFSerialization>
{
OFString *_scheme, *_host;
uint16_t _port;
OFString *_user, *_password, *_path, *_parameters, *_query, *_fragment;
}
/*!
* The scheme part of the URL.
*/
@property (readonly, nonatomic, copy) OFString *scheme;
|
|
>
>
|
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
*
* @brief A class for parsing URLs and accessing parts of it.
*/
@interface OFURL: OFObject <OFCopying, OFMutableCopying, OFSerialization>
{
OFString *_scheme, *_host;
uint16_t _port;
OFString *_Nullable _user, *_Nullable _password, *_path;
OFString *_Nullable _parameters, *_Nullable _query;
OFString *_Nullable _fragment;
}
/*!
* The scheme part of the URL.
*/
@property (readonly, nonatomic, copy) OFString *scheme;
|
︙ | | | ︙ | |
Modified src/OFXMLAttribute.h
from [3dd574a92f]
to [30a9d4482b].
︙ | | | ︙ | |
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
* @class OFXMLAttribute OFXMLAttribute.h ObjFW/OFXMLAttribute.h
*
* @brief A representation of an attribute of an XML element as an object.
*/
@interface OFXMLAttribute: OFXMLNode
{
@public
OFString *_name, *_namespace, *_stringValue;
}
/*!
* The name of the attribute.
*/
@property (readonly, nonatomic) OFString *name;
|
|
|
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
* @class OFXMLAttribute OFXMLAttribute.h ObjFW/OFXMLAttribute.h
*
* @brief A representation of an attribute of an XML element as an object.
*/
@interface OFXMLAttribute: OFXMLNode
{
@public
OFString *_name, *_Nullable _namespace, *_stringValue;
}
/*!
* The name of the attribute.
*/
@property (readonly, nonatomic) OFString *name;
|
︙ | | | ︙ | |
Modified src/OFXMLElement.h
from [449499d0ab]
to [f3e2075c5a].
︙ | | | ︙ | |
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
/*!
* @class OFXMLElement OFXMLElement.h ObjFW/OFXMLElement.h
*
* @brief A class which stores an XML element.
*/
@interface OFXMLElement: OFXMLNode
{
OFString *_name, *_namespace, *_defaultNamespace;
OFMutableArray OF_GENERIC(OFXMLAttribute *) *_attributes;
OFMutableDictionary OF_GENERIC(OFString *, OFString *) *_namespaces;
OFMutableArray OF_GENERIC(OFXMLNode *) *_children;
}
/*!
* The name of the element.
*/
@property (nonatomic, copy) OFString *name;
|
|
|
|
>
|
|
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
/*!
* @class OFXMLElement OFXMLElement.h ObjFW/OFXMLElement.h
*
* @brief A class which stores an XML element.
*/
@interface OFXMLElement: OFXMLNode
{
OFString *_name, *_Nullable _namespace, *_Nullable _defaultNamespace;
OFMutableArray OF_GENERIC(OFXMLAttribute *) *_Nullable _attributes;
OFMutableDictionary OF_GENERIC(OFString *, OFString *) *_Nullable
_namespaces;
OFMutableArray OF_GENERIC(OFXMLNode *) *_Nullable _children;
}
/*!
* The name of the element.
*/
@property (nonatomic, copy) OFString *name;
|
︙ | | | ︙ | |
Modified src/OFXMLElementBuilder.h
from [f7df881b5d]
to [fb6eb4c1ba].
︙ | | | ︙ | |
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
|
* It can also be used to build OFXMLElements from parts of the document by
* first parsing stuff using the OFXMLParser with another delegate and then
* setting the OFXMLElementBuilder as delegate for the parser.
*/
@interface OFXMLElementBuilder: OFObject <OFXMLParserDelegate>
{
OFMutableArray OF_GENERIC(OFXMLElement *) *_stack;
id <OFXMLElementBuilderDelegate> _delegate;
}
/*!
* The delegate for the OFXMLElementBuilder.
*/
@property OF_NULLABLE_PROPERTY (nonatomic, assign)
id <OFXMLElementBuilderDelegate> delegate;
|
|
|
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
|
* It can also be used to build OFXMLElements from parts of the document by
* first parsing stuff using the OFXMLParser with another delegate and then
* setting the OFXMLElementBuilder as delegate for the parser.
*/
@interface OFXMLElementBuilder: OFObject <OFXMLParserDelegate>
{
OFMutableArray OF_GENERIC(OFXMLElement *) *_stack;
id <OFXMLElementBuilderDelegate> _Nullable _delegate;
}
/*!
* The delegate for the OFXMLElementBuilder.
*/
@property OF_NULLABLE_PROPERTY (nonatomic, assign)
id <OFXMLElementBuilderDelegate> delegate;
|
︙ | | | ︙ | |
Modified src/OFXMLParser.h
from [8a20ab513e]
to [f9d631bcc2].
︙ | | | ︙ | |
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
|
* @brief An event-based XML parser.
*
* OFXMLParser is an event-based XML parser which calls the delegate's callbacks
* as soon as it finds something, thus suitable for streams as well.
*/
@interface OFXMLParser: OFObject <OFStringXMLUnescapingDelegate>
{
id <OFXMLParserDelegate> _delegate;
enum of_xml_parser_state {
OF_XMLPARSER_IN_BYTE_ORDER_MARK,
OF_XMLPARSER_OUTSIDE_TAG,
OF_XMLPARSER_TAG_OPENED,
OF_XMLPARSER_IN_PROCESSING_INSTRUCTIONS,
OF_XMLPARSER_IN_TAG_NAME,
OF_XMLPARSER_IN_CLOSE_TAG_NAME,
|
|
|
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
|
* @brief An event-based XML parser.
*
* OFXMLParser is an event-based XML parser which calls the delegate's callbacks
* as soon as it finds something, thus suitable for streams as well.
*/
@interface OFXMLParser: OFObject <OFStringXMLUnescapingDelegate>
{
id <OFXMLParserDelegate> _Nullable _delegate;
enum of_xml_parser_state {
OF_XMLPARSER_IN_BYTE_ORDER_MARK,
OF_XMLPARSER_OUTSIDE_TAG,
OF_XMLPARSER_TAG_OPENED,
OF_XMLPARSER_IN_PROCESSING_INSTRUCTIONS,
OF_XMLPARSER_IN_TAG_NAME,
OF_XMLPARSER_IN_CLOSE_TAG_NAME,
|
︙ | | | ︙ | |
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
|
OF_XMLPARSER_IN_COMMENT_OPENING,
OF_XMLPARSER_IN_COMMENT_1,
OF_XMLPARSER_IN_COMMENT_2,
OF_XMLPARSER_IN_DOCTYPE,
OF_XMLPARSER_NUM_STATES
} _state;
size_t _i, _last;
const char *_data;
OFMutableData *_buffer;
OFString *_name, *_prefix;
OFMutableArray
OF_GENERIC(OFMutableDictionary OF_GENERIC(OFString *, OFString *) *)
*_namespaces;
OFMutableArray OF_GENERIC(OFXMLAttribute *) *_attributes;
OFString *_attributeName, *_attributePrefix;
char _delimiter;
OFMutableArray OF_GENERIC(OFString *) *_previous;
size_t _level;
bool _acceptProlog;
size_t _lineNumber;
bool _lastCarriageReturn, _finishedParsing;
of_string_encoding_t _encoding;
|
|
|
|
|
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
|
OF_XMLPARSER_IN_COMMENT_OPENING,
OF_XMLPARSER_IN_COMMENT_1,
OF_XMLPARSER_IN_COMMENT_2,
OF_XMLPARSER_IN_DOCTYPE,
OF_XMLPARSER_NUM_STATES
} _state;
size_t _i, _last;
const char *_Nullable _data;
OFMutableData *_buffer;
OFString *_Nullable _name, *_Nullable _prefix;
OFMutableArray
OF_GENERIC(OFMutableDictionary OF_GENERIC(OFString *, OFString *) *)
*_namespaces;
OFMutableArray OF_GENERIC(OFXMLAttribute *) *_attributes;
OFString *_Nullable _attributeName, *_Nullable _attributePrefix;
char _delimiter;
OFMutableArray OF_GENERIC(OFString *) *_previous;
size_t _level;
bool _acceptProlog;
size_t _lineNumber;
bool _lastCarriageReturn, _finishedParsing;
of_string_encoding_t _encoding;
|
︙ | | | ︙ | |
Modified src/OFZIPArchive.h
from [b61ed08fb0]
to [c1d40e93ed].
︙ | | | ︙ | |
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
@interface OFZIPArchive: OFObject
{
OFSeekableStream *_stream;
uint32_t _diskNumber, _centralDirectoryDisk;
uint64_t _centralDirectoryEntriesInDisk, _centralDirectoryEntries;
uint64_t _centralDirectorySize;
int64_t _centralDirectoryOffset;
OFString *_archiveComment;
OFMutableArray OF_GENERIC(OFZIPArchiveEntry *) *_entries;
OFMutableDictionary OF_GENERIC(OFString *, OFZIPArchiveEntry *)
*_pathToEntryMap;
OFStream *_lastReturnedStream;
}
/*!
* The archive comment.
*/
@property (readonly, nonatomic) OFString *archiveComment;
|
|
|
|
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
@interface OFZIPArchive: OFObject
{
OFSeekableStream *_stream;
uint32_t _diskNumber, _centralDirectoryDisk;
uint64_t _centralDirectoryEntriesInDisk, _centralDirectoryEntries;
uint64_t _centralDirectorySize;
int64_t _centralDirectoryOffset;
OFString *_Nullable _archiveComment;
OFMutableArray OF_GENERIC(OFZIPArchiveEntry *) *_entries;
OFMutableDictionary OF_GENERIC(OFString *, OFZIPArchiveEntry *)
*_pathToEntryMap;
OFStream *_Nullable _lastReturnedStream;
}
/*!
* The archive comment.
*/
@property (readonly, nonatomic) OFString *archiveComment;
|
︙ | | | ︙ | |
Modified src/OFZIPArchiveEntry.h
from [0e65bfdec8]
to [708bd90b86].
︙ | | | ︙ | |
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
|
{
uint16_t _versionMadeBy, _minVersionNeeded, _generalPurposeBitFlag;
uint16_t _compressionMethod;
uint16_t _lastModifiedFileTime, _lastModifiedFileDate;
uint32_t _CRC32;
uint64_t _compressedSize, _uncompressedSize;
OFString *_fileName;
OFData *_extraField;
OFString *_fileComment;
uint32_t _startDiskNumber;
uint16_t _internalAttributes;
uint32_t _versionSpecificAttributes;
int64_t _localFileHeaderOffset;
}
/*!
|
|
|
|
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
|
{
uint16_t _versionMadeBy, _minVersionNeeded, _generalPurposeBitFlag;
uint16_t _compressionMethod;
uint16_t _lastModifiedFileTime, _lastModifiedFileDate;
uint32_t _CRC32;
uint64_t _compressedSize, _uncompressedSize;
OFString *_fileName;
OFData *_Nullable _extraField;
OFString *_Nullable _fileComment;
uint32_t _startDiskNumber;
uint16_t _internalAttributes;
uint32_t _versionSpecificAttributes;
int64_t _localFileHeaderOffset;
}
/*!
|
︙ | | | ︙ | |
Modified src/block.h
from [a2c827d522]
to [6fd563cf3c].
︙ | | | ︙ | |
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
#endif
int flags;
int reserved;
void (*invoke)(void *block, ...);
struct of_block_descriptor_t {
unsigned long reserved;
unsigned long size;
void (*copy_helper)(void *dest, void *src);
void (*dispose_helper)(void *src);
const char *signature;
} *descriptor;
} of_block_literal_t;
#ifdef __cplusplus
extern "C" {
#endif
|
|
|
|
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
#endif
int flags;
int reserved;
void (*invoke)(void *block, ...);
struct of_block_descriptor_t {
unsigned long reserved;
unsigned long size;
void (*_Nullable copy_helper)(void *dest, void *src);
void (*_Nullable dispose_helper)(void *src);
const char *signature;
} *descriptor;
} of_block_literal_t;
#ifdef __cplusplus
extern "C" {
#endif
|
︙ | | | ︙ | |