Overview
Context
Changes
Modified src/OFMutableString.m
from [7230c7c71f]
to [ee0cfc9cd4].
| ︙ | | |
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
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
|
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
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
|
-
+
-
+
-
+
-
+
|
- initWithUnicodeString: (const of_unichar_t*)string
{
return (id)[[OFMutableString_UTF8 alloc] initWithUnicodeString: string];
}
- initWithUnicodeString: (const of_unichar_t*)string
byteOrder: (of_endianess_t)byteOrder
byteOrder: (of_byte_order_t)byteOrder
{
return (id)[[OFMutableString_UTF8 alloc]
initWithUnicodeString: string
byteOrder: byteOrder];
}
- initWithUnicodeString: (const of_unichar_t*)string
length: (size_t)length
{
return (id)[[OFMutableString_UTF8 alloc] initWithUnicodeString: string
length: length];
}
- initWithUnicodeString: (const of_unichar_t*)string
byteOrder: (of_endianess_t)byteOrder
byteOrder: (of_byte_order_t)byteOrder
length: (size_t)length
{
return (id)[[OFMutableString_UTF8 alloc]
initWithUnicodeString: string
byteOrder: byteOrder
length: length];
}
- initWithUTF16String: (const uint16_t*)string
{
return (id)[[OFMutableString_UTF8 alloc] initWithUTF16String: string];
}
- initWithUTF16String: (const uint16_t*)string
byteOrder: (of_endianess_t)byteOrder
byteOrder: (of_byte_order_t)byteOrder
{
return (id)[[OFMutableString_UTF8 alloc]
initWithUTF16String: string
byteOrder: byteOrder];
}
- initWithUTF16String: (const uint16_t*)string
length: (size_t)length
{
return (id)[[OFMutableString_UTF8 alloc] initWithUTF16String: string
length: length];
}
- initWithUTF16String: (const uint16_t*)string
byteOrder: (of_endianess_t)byteOrder
byteOrder: (of_byte_order_t)byteOrder
length: (size_t)length
{
return (id)[[OFMutableString_UTF8 alloc]
initWithUTF16String: string
byteOrder: byteOrder
length: length];
}
|
| ︙ | | |
Modified src/OFObject.h
from [7924907748]
to [2329ee91b2].
| ︙ | | |
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
|
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
|
-
-
-
-
+
+
+
+
|
/// The left object is bigger than the right
OF_ORDERED_DESCENDING = 1
} of_comparison_result_t;
/**
* \brief An enum for storing endianess.
*/
typedef enum of_endianess_t {
OF_ENDIANESS_BIG_ENDIAN,
OF_ENDIANESS_LITTLE_ENDIAN
} of_endianess_t;
typedef enum of_byte_order_t {
OF_BYTE_ORDER_BIG_ENDIAN,
OF_BYTE_ORDER_LITTLE_ENDIAN
} of_byte_order_t;
/**
* \brief A range.
*/
typedef struct of_range_t {
/// The start of the range
size_t start;
|
| ︙ | | |
Modified src/OFString.h
from [ef2dd82880]
to [a75e75f59e].
| ︙ | | |
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
|
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
|
-
+
|
* byte order if no BOM is found.
*
* \param string The unicode string
* \param byteOrder The byte order to assume if there is no BOM
* \return A new autoreleased OFString
*/
+ (instancetype)stringWithUnicodeString: (const of_unichar_t*)string
byteOrder: (of_endianess_t)byteOrder;
byteOrder: (of_byte_order_t)byteOrder;
/**
* \brief Creates a new OFString from a unicode string with the specified
* length.
*
* \param string The unicode string
* \param length The length of the unicode string
|
| ︙ | | |
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
|
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
|
-
+
-
+
|
*
* \param string The unicode string
* \param byteOrder The byte order to assume if there is no BOM
* \param length The length of the unicode string
* \return A new autoreleased OFString
*/
+ (instancetype)stringWithUnicodeString: (const of_unichar_t*)string
byteOrder: (of_endianess_t)byteOrder
byteOrder: (of_byte_order_t)byteOrder
length: (size_t)length;
/**
* \brief Creates a new OFString from a UTF-16 encoded string.
*
* \param string The UTF-16 string
* \return A new autoreleased OFString
*/
+ (instancetype)stringWithUTF16String: (const uint16_t*)string;
/**
* \brief Creates a new OFString from a UTF-16 encoded string, assuming the
* specified byte order if no BOM is found.
*
* \param string The UTF-16 string
* \param byteOrder The byte order to assume if there is no BOM
* \return A new autoreleased OFString
*/
+ (instancetype)stringWithUTF16String: (const uint16_t*)string
byteOrder: (of_endianess_t)byteOrder;
byteOrder: (of_byte_order_t)byteOrder;
/**
* \brief Creates a new OFString from a UTF-16 encoded string with the specified
* length.
*
* \param string The UTF-16 string
* \param length The length of the unicode string
|
| ︙ | | |
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
|
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
|
-
+
|
*
* \param string The UTF-16 string
* \param byteOrder The byte order to assume if there is no BOM
* \param length The length of the unicode string
* \return A new autoreleased OFString
*/
+ (instancetype)stringWithUTF16String: (const uint16_t*)string
byteOrder: (of_endianess_t)byteOrder
byteOrder: (of_byte_order_t)byteOrder
length: (size_t)length;
/**
* \brief Creates a new OFString from a format string.
*
* See printf for the format syntax. As an addition, %@ is available as format
* specifier for objects.
|
| ︙ | | |
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
|
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
|
-
+
|
* assuming the specified byte order if no BOM is found.
*
* \param string The unicode string
* \param byteOrder The byte order to assume if there is no BOM
* \return An initialized OFString
*/
- initWithUnicodeString: (const of_unichar_t*)string
byteOrder: (of_endianess_t)byteOrder;
byteOrder: (of_byte_order_t)byteOrder;
/**
* \brief Initializes an already allocated OFString with a unicode string with
* the specified length.
*
* \param string The unicode string
* \param length The length of the unicode string
|
| ︙ | | |
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
|
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
|
-
+
-
+
|
*
* \param string The unicode string
* \param byteOrder The byte order to assume if there is no BOM
* \param length The length of the unicode string
* \return An initialized OFString
*/
- initWithUnicodeString: (const of_unichar_t*)string
byteOrder: (of_endianess_t)byteOrder
byteOrder: (of_byte_order_t)byteOrder
length: (size_t)length;
/**
* \brief Initializes an already allocated OFString with a UTF-16 string.
*
* \param string The UTF-16 string
* \return An initialized OFString
*/
- initWithUTF16String: (const uint16_t*)string;
/**
* \brief Initializes an already allocated OFString with a UTF-16 string,
* assuming the specified byte order if no BOM is found.
*
* \param string The UTF-16 string
* \param byteOrder The byte order to assume if there is no BOM
* \return An initialized OFString
*/
- initWithUTF16String: (const uint16_t*)string
byteOrder: (of_endianess_t)byteOrder;
byteOrder: (of_byte_order_t)byteOrder;
/**
* \brief Initializes an already allocated OFString with a UTF-16 string with
* the specified length.
*
* \param string The UTF-16 string
* \param length The length of the UTF-16 string
|
| ︙ | | |
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
|
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
|
-
+
|
*
* \param string The UTF-16 string
* \param byteOrder The byte order to assume if there is no BOM
* \param length The length of the UTF-16 string
* \return An initialized OFString
*/
- initWithUTF16String: (const uint16_t*)string
byteOrder: (of_endianess_t)byteOrder
byteOrder: (of_byte_order_t)byteOrder
length: (size_t)length;
/**
* \brief Initializes an already allocated OFString with a format string.
*
* See printf for the format syntax. As an addition, %@ is available as format
* specifier for objects.
|
| ︙ | | |
Modified src/OFString.m
from [9dca518311]
to [ba03f0d3c5].
| ︙ | | |
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
|
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
|
-
+
-
+
-
+
-
+
|
- initWithUnicodeString: (const of_unichar_t*)string
{
return (id)[[OFString_UTF8 alloc] initWithUnicodeString: string];
}
- initWithUnicodeString: (const of_unichar_t*)string
byteOrder: (of_endianess_t)byteOrder
byteOrder: (of_byte_order_t)byteOrder
{
return (id)[[OFString_UTF8 alloc] initWithUnicodeString: string
byteOrder: byteOrder];
}
- initWithUnicodeString: (const of_unichar_t*)string
length: (size_t)length
{
return (id)[[OFString_UTF8 alloc] initWithUnicodeString: string
length: length];
}
- initWithUnicodeString: (const of_unichar_t*)string
byteOrder: (of_endianess_t)byteOrder
byteOrder: (of_byte_order_t)byteOrder
length: (size_t)length
{
return (id)[[OFString_UTF8 alloc] initWithUnicodeString: string
byteOrder: byteOrder
length: length];
}
- initWithUTF16String: (const uint16_t*)string
{
return (id)[[OFString_UTF8 alloc] initWithUTF16String: string];
}
- initWithUTF16String: (const uint16_t*)string
byteOrder: (of_endianess_t)byteOrder
byteOrder: (of_byte_order_t)byteOrder
{
return (id)[[OFString_UTF8 alloc] initWithUTF16String: string
byteOrder: byteOrder];
}
- initWithUTF16String: (const uint16_t*)string
length: (size_t)length
{
return (id)[[OFString_UTF8 alloc] initWithUTF16String: string
length: length];
}
- initWithUTF16String: (const uint16_t*)string
byteOrder: (of_endianess_t)byteOrder
byteOrder: (of_byte_order_t)byteOrder
length: (size_t)length
{
return (id)[[OFString_UTF8 alloc] initWithUTF16String: string
byteOrder: byteOrder
length: length];
}
|
| ︙ | | |
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
|
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
|
-
+
-
+
-
+
-
+
|
+ (instancetype)stringWithUnicodeString: (const of_unichar_t*)string
{
return [[[self alloc] initWithUnicodeString: string] autorelease];
}
+ (instancetype)stringWithUnicodeString: (const of_unichar_t*)string
byteOrder: (of_endianess_t)byteOrder
byteOrder: (of_byte_order_t)byteOrder
{
return [[[self alloc] initWithUnicodeString: string
byteOrder: byteOrder] autorelease];
}
+ (instancetype)stringWithUnicodeString: (const of_unichar_t*)string
length: (size_t)length
{
return [[[self alloc] initWithUnicodeString: string
length: length] autorelease];
}
+ (instancetype)stringWithUnicodeString: (const of_unichar_t*)string
byteOrder: (of_endianess_t)byteOrder
byteOrder: (of_byte_order_t)byteOrder
length: (size_t)length
{
return [[[self alloc] initWithUnicodeString: string
byteOrder: byteOrder
length: length] autorelease];
}
+ (instancetype)stringWithUTF16String: (const uint16_t*)string
{
return [[[self alloc] initWithUTF16String: string] autorelease];
}
+ (instancetype)stringWithUTF16String: (const uint16_t*)string
byteOrder: (of_endianess_t)byteOrder
byteOrder: (of_byte_order_t)byteOrder
{
return [[[self alloc] initWithUTF16String: string
byteOrder: byteOrder] autorelease];
}
+ (instancetype)stringWithUTF16String: (const uint16_t*)string
length: (size_t)length
{
return [[[self alloc] initWithUTF16String: string
length: length] autorelease];
}
+ (instancetype)stringWithUTF16String: (const uint16_t*)string
byteOrder: (of_endianess_t)byteOrder
byteOrder: (of_byte_order_t)byteOrder
length: (size_t)length
{
return [[[self alloc] initWithUTF16String: string
byteOrder: byteOrder
length: length] autorelease];
}
|
| ︙ | | |
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
|
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
|
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
@throw [OFNotImplementedException exceptionWithClass: c
selector: _cmd];
}
- initWithUnicodeString: (const of_unichar_t*)string
{
return [self initWithUnicodeString: string
byteOrder: OF_ENDIANESS_NATIVE
byteOrder: OF_BYTE_ORDER_NATIVE
length: of_unicode_string_length(string)];
}
- initWithUnicodeString: (const of_unichar_t*)string
byteOrder: (of_endianess_t)byteOrder
byteOrder: (of_byte_order_t)byteOrder
{
return [self initWithUnicodeString: string
byteOrder: byteOrder
length: of_unicode_string_length(string)];
}
- initWithUnicodeString: (const of_unichar_t*)string
length: (size_t)length
{
return [self initWithUnicodeString: string
byteOrder: OF_ENDIANESS_NATIVE
byteOrder: OF_BYTE_ORDER_NATIVE
length: length];
}
- initWithUnicodeString: (const of_unichar_t*)string
byteOrder: (of_endianess_t)byteOrder
byteOrder: (of_byte_order_t)byteOrder
length: (size_t)length
{
Class c = [self class];
[self release];
@throw [OFNotImplementedException exceptionWithClass: c
selector: _cmd];
}
- initWithUTF16String: (const uint16_t*)string
{
return [self initWithUTF16String: string
byteOrder: OF_ENDIANESS_BIG_ENDIAN
byteOrder: OF_BYTE_ORDER_BIG_ENDIAN
length: of_utf16_string_length(string)];
}
- initWithUTF16String: (const uint16_t*)string
byteOrder: (of_endianess_t)byteOrder
byteOrder: (of_byte_order_t)byteOrder
{
return [self initWithUTF16String: string
byteOrder: byteOrder
length: of_utf16_string_length(string)];
}
- initWithUTF16String: (const uint16_t*)string
length: (size_t)length
{
return [self initWithUTF16String: string
byteOrder: OF_ENDIANESS_BIG_ENDIAN
byteOrder: OF_BYTE_ORDER_BIG_ENDIAN
length: length];
}
- initWithUTF16String: (const uint16_t*)string
byteOrder: (of_endianess_t)byteOrder
byteOrder: (of_byte_order_t)byteOrder
length: (size_t)length
{
Class c = [self class];
[self release];
@throw [OFNotImplementedException exceptionWithClass: c
selector: _cmd];
}
|
| ︙ | | |
Modified src/OFString_UTF8.m
from [8ace43f8fa]
to [134f59b75b].
| ︙ | | |
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
|
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
|
-
+
-
+
|
@throw e;
}
return self;
}
- initWithUnicodeString: (const of_unichar_t*)string
byteOrder: (of_endianess_t)byteOrder
byteOrder: (of_byte_order_t)byteOrder
length: (size_t)length
{
self = [super init];
@try {
size_t i, j = 0;
BOOL swap = NO;
if (length > 0 && *string == 0xFEFF) {
string++;
length--;
} else if (length > 0 && *string == 0xFFFE0000) {
swap = YES;
string++;
length--;
} else if (byteOrder != OF_ENDIANESS_NATIVE)
} else if (byteOrder != OF_BYTE_ORDER_NATIVE)
swap = YES;
s = &s_store;
s->cStringLength = length;
s->cString = [self allocMemoryWithSize: (length * 4) + 1];
s->length = length;
|
| ︙ | | |
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
|
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
|
-
+
-
+
|
@throw e;
}
return self;
}
- initWithUTF16String: (const uint16_t*)string
byteOrder: (of_endianess_t)byteOrder
byteOrder: (of_byte_order_t)byteOrder
length: (size_t)length
{
self = [super init];
@try {
size_t i, j = 0;
BOOL swap = NO;
if (length > 0 && *string == 0xFEFF) {
string++;
length--;
} else if (length > 0 && *string == 0xFFFE) {
swap = YES;
string++;
length--;
} else if (byteOrder != OF_ENDIANESS_NATIVE)
} else if (byteOrder != OF_BYTE_ORDER_NATIVE)
swap = YES;
s = &s_store;
s->cStringLength = length;
s->cString = [self allocMemoryWithSize: (length * 4) + 1];
s->length = length;
|
| ︙ | | |
Modified src/macros.h
from [037045a86a]
to [c89d0aa05c].
| ︙ | | |
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
-
+
-
+
|
# undef OF_BIG_ENDIAN
# if __BIG_ENDIAN__
# define OF_BIG_ENDIAN
# endif
#endif
#ifdef OF_BIG_ENDIAN
# define OF_ENDIANESS_NATIVE OF_ENDIANESS_BIG_ENDIAN
# define OF_BYTE_ORDER_NATIVE OF_BYTE_ORDER_BIG_ENDIAN
#else
# define OF_ENDIANESS_NATIVE OF_ENDIANESS_LITTLE_ENDIAN
# define OF_BYTE_ORDER_NATIVE OF_BYTE_ORDER_LITTLE_ENDIAN
#endif
/* Hopefully no arch needs more than 16 bytes padding */
#ifndef __BIGGEST_ALIGNMENT__
# define __BIGGEST_ALIGNMENT__ 16
#endif
|
| ︙ | | |