ObjFW  Check-in [9122facff6]

Overview
Comment:Fix missing fast paths in -[isEqual:]
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 9122facff66cb0d9fbc6f248460734c3e9bc445869c3045865f012bc33ba5984
User & Date: js on 2019-10-20 13:15:41
Other Links: manifest | tags
Context
2019-11-17
21:17
Fix incorrect indentation check-in: abc9d84958 user: js tags: trunk
2019-10-20
13:15
Fix missing fast paths in -[isEqual:] check-in: 9122facff6 user: js tags: trunk
01:13
Rename of_dns{_resource -> }_record_type_t check-in: 7fa337b8a4 user: js tags: trunk
Changes

Modified src/OFASN1BitString.m from [060f7fe7bc] to [733ec1dedf].

151
152
153
154
155
156
157



158
159
160
161
162
163
164
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167







+
+
+








	return data;
}

- (bool)isEqual: (id)object
{
	OFASN1BitString *bitString;

	if (object == self)
		return true;

	if (![object isKindOfClass: [OFASN1BitString class]])
		return false;

	bitString = object;

	if (![bitString->_bitStringValue isEqual: _bitStringValue])

Modified src/OFASN1Boolean.m from [661fbaff56] to [743271b1bd].

85
86
87
88
89
90
91



92
93
94
95
96
97
98
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101







+
+
+







	return [OFData dataWithItems: buffer
			       count: sizeof(buffer)];
}

- (bool)isEqual: (id)object
{
	OFASN1Boolean *boolean;

	if (object == self)
		return true;

	if (![object isKindOfClass: [OFASN1Boolean class]])
		return false;

	boolean = object;

	if (boolean->_booleanValue != _booleanValue)

Modified src/OFASN1Enumerated.m from [a4cf04c865] to [bed3413152].

72
73
74
75
76
77
78



79
80
81
82
83
84
85
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88







+
+
+







{
	OF_INVALID_INIT_METHOD
}

- (bool)isEqual: (id)object
{
	OFASN1Enumerated *enumerated;

	if (object == self)
		return true;

	if (![object isKindOfClass: [OFASN1Enumerated class]])
		return false;

	enumerated = object;

	if (enumerated->_integerValue != _integerValue)

Modified src/OFASN1IA5String.m from [ec99f99ba0] to [73d1e395a0].

93
94
95
96
97
98
99



100
101
102
103
104
105
106
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109







+
+
+







{
	return self.IA5StringValue;
}

- (bool)isEqual: (id)object
{
	OFASN1IA5String *IA5String;

	if (object == self)
		return true;

	if (![object isKindOfClass: [OFASN1IA5String class]])
		return false;

	IA5String = object;

	if (![IA5String->_IA5StringValue isEqual: _IA5StringValue])

Modified src/OFASN1Integer.m from [f2823c2ecb] to [8d47f6fa58].

94
95
96
97
98
99
100



101
102
103
104
105
106
107
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110







+
+
+







{
	OF_INVALID_INIT_METHOD
}

- (bool)isEqual: (id)object
{
	OFASN1Integer *integer;

	if (object == self)
		return true;

	if (![object isKindOfClass: [OFASN1Integer class]])
		return false;

	integer = object;

	if (integer->_integerValue != _integerValue)

Modified src/OFASN1NumericString.m from [cdfb24dfd4] to [fcf448a179].

105
106
107
108
109
110
111



112
113
114
115
116
117
118
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121







+
+
+







{
	return self.numericStringValue;
}

- (bool)isEqual: (id)object
{
	OFASN1NumericString *numericString;

	if (object == self)
		return true;

	if (![object isKindOfClass: [OFASN1NumericString class]])
		return false;

	numericString = object;

	if (![numericString->_numericStringValue isEqual: _numericStringValue])

Modified src/OFASN1ObjectIdentifier.m from [531a8feaa4] to [cf088ffc49].

150
151
152
153
154
155
156



157
158
159
160
161
162
163
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166







+
+
+








	[super dealloc];
}

- (bool)isEqual: (id)object
{
	OFASN1ObjectIdentifier *objectIdentifier;

	if (object == self)
		return true;

	if (![object isKindOfClass: [OFASN1ObjectIdentifier class]])
		return false;

	objectIdentifier = object;

	if (![objectIdentifier->_subidentifiers isEqual: _subidentifiers])

Modified src/OFASN1OctetString.m from [3e4389dd2d] to [447d9ff211].

78
79
80
81
82
83
84



85
86
87
88
89
90
91
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94







+
+
+








	[super dealloc];
}

- (bool)isEqual: (id)object
{
	OFASN1OctetString *octetString;

	if (object == self)
		return true;

	if (![object isKindOfClass: [OFASN1OctetString class]])
		return false;

	octetString = object;

	if (![octetString->_octetStringValue isEqual: _octetStringValue])

Modified src/OFASN1PrintableString.m from [24350e65d6] to [08f58a8048].

124
125
126
127
128
129
130



131
132
133
134
135
136
137
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140







+
+
+







{
	return self.printableStringValue;
}

- (bool)isEqual: (id)object
{
	OFASN1PrintableString *printableString;

	if (object == self)
		return true;

	if (![object isKindOfClass: [OFASN1PrintableString class]])
		return false;

	printableString = object;

	if (![printableString->_printableStringValue isEqual:

Modified src/OFASN1UTF8String.m from [5aca8e49db] to [9516b123ef].

92
93
94
95
96
97
98



99
100
101
102
103
104
105
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108







+
+
+







{
	return self.UTF8StringValue;
}

- (bool)isEqual: (id)object
{
	OFASN1UTF8String *UTF8String;

	if (object == self)
		return true;

	if (![object isKindOfClass: [OFASN1UTF8String class]])
		return false;

	UTF8String = object;

	if (![UTF8String->_UTF8StringValue isEqual: _UTF8StringValue])

Modified src/OFASN1Value.m from [826101f4aa] to [f34b7d97f3].

74
75
76
77
78
79
80



81
82
83
84
85
86
87
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90







+
+
+








	[super dealloc];
}

- (bool)isEqual: (id)object
{
	OFASN1Value *value;

	if (object == self)
		return true;

	if (![object isKindOfClass: [OFASN1Value class]])
		return false;

	value = object;

	if (value->_tagClass != _tagClass)

Modified src/OFColor.m from [1d58b7ab36] to [9416cbb4f4].

58
59
60
61
62
63
64



65
66
67
68
69
70
71
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74







+
+
+








	return self;
}

- (bool)isEqual: (id)object
{
	OFColor *other;

	if (object == self)
		return true;

	if (![object isKindOfClass: [OFColor class]])
		return false;

	other = object;

	if (other->_red != _red)

Modified src/OFDNSQuery.m from [031eb7a0f1] to [e62571f4f4].

69
70
71
72
73
74
75



76
77
78
79
80
81
82
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85







+
+
+








	[super dealloc];
}

- (bool)isEqual: (id)object
{
	OFDNSQuery *query;

	if (object == self)
		return true;

	if (![object isKindOfClass: [OFDNSQuery class]])
		return false;

	query = object;

	if (query->_domainName != _domainName &&

Modified src/OFDNSResourceRecord.m from [ee4109c97e] to [817897253d].

197
198
199
200
201
202
203
204

205
206

207



208

209
210
211

212
213

214
215
216

217
218
219

220
221
222

223
224
225
226
227
228
229
197
198
199
200
201
202
203

204
205

206
207
208
209
210

211
212
213

214
215

216
217
218

219
220
221

222
223
224

225
226
227
228
229
230
231
232







-
+

-
+

+
+
+
-
+


-
+

-
+


-
+


-
+


-
+







}

- (const of_socket_address_t *)address
{
	return &_address;
}

- (bool)isEqual: (id)otherObject
- (bool)isEqual: (id)object
{
	OFADNSResourceRecord *otherRecord;
	OFADNSResourceRecord *record;

	if (object == self)
		return true;

	if (![otherObject isKindOfClass: [OFADNSResourceRecord class]])
	if (![object isKindOfClass: [OFADNSResourceRecord class]])
		return false;

	otherRecord = otherObject;
	record = object;

	if (otherRecord->_name != _name && ![otherRecord->_name isEqual: _name])
	if (record->_name != _name && ![record->_name isEqual: _name])
		return false;

	if (otherRecord->_DNSClass != _DNSClass)
	if (record->_DNSClass != _DNSClass)
		return false;

	if (otherRecord->_recordType != _recordType)
	if (record->_recordType != _recordType)
		return false;

	if (!of_socket_address_equal(&otherRecord->_address, &_address))
	if (!of_socket_address_equal(&record->_address, &_address))
		return false;

	return true;
}

- (uint32_t)hash
{
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
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







-
+

-
+

+
+
+
-
+


-
+

-
+


-
+


-
+


-
+







}

- (const of_socket_address_t *)address
{
	return &_address;
}

- (bool)isEqual: (id)otherObject
- (bool)isEqual: (id)object
{
	OFAAAADNSResourceRecord *otherRecord;
	OFAAAADNSResourceRecord *record;

	if (object == self)
		return true;

	if (![otherObject isKindOfClass: [OFAAAADNSResourceRecord class]])
	if (![object isKindOfClass: [OFAAAADNSResourceRecord class]])
		return false;

	otherRecord = otherObject;
	record = object;

	if (otherRecord->_name != _name && ![otherRecord->_name isEqual: _name])
	if (record->_name != _name && ![record->_name isEqual: _name])
		return false;

	if (otherRecord->_DNSClass != _DNSClass)
	if (record->_DNSClass != _DNSClass)
		return false;

	if (otherRecord->_recordType != _recordType)
	if (record->_recordType != _recordType)
		return false;

	if (!of_socket_address_equal(&otherRecord->_address, &_address))
	if (!of_socket_address_equal(&record->_address, &_address))
		return false;

	return true;
}

- (uint32_t)hash
{
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
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
411
412
413
414







-
+

-
+

+
+
+
-
+


-
+

-
+


-
+


-
+


-
-
+







- (void)dealloc
{
	[_alias release];

	[super dealloc];
}

- (bool)isEqual: (id)otherObject
- (bool)isEqual: (id)object
{
	OFCNAMEDNSResourceRecord *otherRecord;
	OFCNAMEDNSResourceRecord *record;

	if (object == self)
		return true;

	if (![otherObject isKindOfClass: [OFCNAMEDNSResourceRecord class]])
	if (![object isKindOfClass: [OFCNAMEDNSResourceRecord class]])
		return false;

	otherRecord = otherObject;
	record = object;

	if (otherRecord->_name != _name && ![otherRecord->_name isEqual: _name])
	if (record->_name != _name && ![record->_name isEqual: _name])
		return false;

	if (otherRecord->_DNSClass != _DNSClass)
	if (record->_DNSClass != _DNSClass)
		return false;

	if (otherRecord->_recordType != _recordType)
	if (record->_recordType != _recordType)
		return false;

	if (otherRecord->_alias != _alias &&
	    ![otherRecord->_alias isEqual: _alias])
	if (record->_alias != _alias && ![record->_alias isEqual: _alias])
		return false;

	return true;
}

- (uint32_t)hash
{
471
472
473
474
475
476
477
478

479
480

481



482

483
484
485

486
487

488
489
490

491
492
493

494
495
496

497
498
499

500
501
502
503
504
505
506
479
480
481
482
483
484
485

486
487

488
489
490
491
492

493
494
495

496
497

498
499
500

501
502
503

504
505
506

507
508
509

510
511
512
513
514
515
516
517







-
+

-
+

+
+
+
-
+


-
+

-
+


-
+


-
+


-
+


-
+







{
	[_CPU release];
	[_OS release];

	[super dealloc];
}

- (bool)isEqual: (id)otherObject
- (bool)isEqual: (id)object
{
	OFHINFODNSResourceRecord *otherRecord;
	OFHINFODNSResourceRecord *record;

	if (object == self)
		return true;

	if (![otherObject isKindOfClass: [OFHINFODNSResourceRecord class]])
	if (![object isKindOfClass: [OFHINFODNSResourceRecord class]])
		return false;

	otherRecord = otherObject;
	record = object;

	if (otherRecord->_name != _name && ![otherRecord->_name isEqual: _name])
	if (record->_name != _name && ![record->_name isEqual: _name])
		return false;

	if (otherRecord->_DNSClass != _DNSClass)
	if (record->_DNSClass != _DNSClass)
		return false;

	if (otherRecord->_recordType != _recordType)
	if (record->_recordType != _recordType)
		return false;

	if (otherRecord->_CPU != _CPU && ![otherRecord->_CPU isEqual: _CPU])
	if (record->_CPU != _CPU && ![record->_CPU isEqual: _CPU])
		return false;

	if (otherRecord->_OS != _OS && ![otherRecord->_OS isEqual: _OS])
	if (record->_OS != _OS && ![record->_OS isEqual: _OS])
		return false;

	return true;
}

- (uint32_t)hash
{
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
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
612
613


614
615
616
617
618
619
620
621
622







-
+

-
+

+
+
+
-
+


-
+

-
+


-
+


-
+


-
+


-
-
+
+







- (void)dealloc
{
	[_mailExchange release];

	[super dealloc];
}

- (bool)isEqual: (id)otherObject
- (bool)isEqual: (id)object
{
	OFMXDNSResourceRecord *otherRecord;
	OFMXDNSResourceRecord *record;

	if (object == self)
		return true;

	if (![otherObject isKindOfClass: [OFMXDNSResourceRecord class]])
	if (![object isKindOfClass: [OFMXDNSResourceRecord class]])
		return false;

	otherRecord = otherObject;
	record = object;

	if (otherRecord->_name != _name && ![otherRecord->_name isEqual: _name])
	if (record->_name != _name && ![record->_name isEqual: _name])
		return false;

	if (otherRecord->_DNSClass != _DNSClass)
	if (record->_DNSClass != _DNSClass)
		return false;

	if (otherRecord->_recordType != _recordType)
	if (record->_recordType != _recordType)
		return false;

	if (otherRecord->_preference != _preference)
	if (record->_preference != _preference)
		return false;

	if (otherRecord->_mailExchange != _mailExchange &&
	    ![otherRecord->_mailExchange isEqual: _mailExchange])
	if (record->_mailExchange != _mailExchange &&
	    ![record->_mailExchange isEqual: _mailExchange])
		return false;

	return true;
}

- (uint32_t)hash
{
673
674
675
676
677
678
679
680

681
682

683



684

685
686
687

688
689

690
691
692

693
694
695

696
697
698
699


700
701
702
703
704
705
706
687
688
689
690
691
692
693

694
695

696
697
698
699
700

701
702
703

704
705

706
707
708

709
710
711

712
713
714


715
716
717
718
719
720
721
722
723







-
+

-
+

+
+
+
-
+


-
+

-
+


-
+


-
+


-
-
+
+







- (void)dealloc
{
	[_authoritativeHost release];

	[super dealloc];
}

- (bool)isEqual: (id)otherObject
- (bool)isEqual: (id)object
{
	OFNSDNSResourceRecord *otherRecord;
	OFNSDNSResourceRecord *record;

	if (object == self)
		return true;

	if (![otherObject isKindOfClass: [OFNSDNSResourceRecord class]])
	if (![object isKindOfClass: [OFNSDNSResourceRecord class]])
		return false;

	otherRecord = otherObject;
	record = object;

	if (otherRecord->_name != _name && ![otherRecord->_name isEqual: _name])
	if (record->_name != _name && ![record->_name isEqual: _name])
		return false;

	if (otherRecord->_DNSClass != _DNSClass)
	if (record->_DNSClass != _DNSClass)
		return false;

	if (otherRecord->_recordType != _recordType)
	if (record->_recordType != _recordType)
		return false;

	if (otherRecord->_authoritativeHost != _authoritativeHost &&
	    ![otherRecord->_authoritativeHost isEqual: _authoritativeHost])
	if (record->_authoritativeHost != _authoritativeHost &&
	    ![record->_authoritativeHost isEqual: _authoritativeHost])
		return false;

	return true;
}

- (uint32_t)hash
{
768
769
770
771
772
773
774
775

776
777

778



779

780
781
782

783
784

785
786
787

788
789
790

791
792
793
794


795
796
797
798
799
800
801
785
786
787
788
789
790
791

792
793

794
795
796
797
798

799
800
801

802
803

804
805
806

807
808
809

810
811
812


813
814
815
816
817
818
819
820
821







-
+

-
+

+
+
+
-
+


-
+

-
+


-
+


-
+


-
-
+
+







- (void)dealloc
{
	[_domainName release];

	[super dealloc];
}

- (bool)isEqual: (id)otherObject
- (bool)isEqual: (id)object
{
	OFPTRDNSResourceRecord *otherRecord;
	OFPTRDNSResourceRecord *record;

	if (object == self)
		return true;

	if (![otherObject isKindOfClass: [OFPTRDNSResourceRecord class]])
	if (![object isKindOfClass: [OFPTRDNSResourceRecord class]])
		return false;

	otherRecord = otherObject;
	record = object;

	if (otherRecord->_name != _name && ![otherRecord->_name isEqual: _name])
	if (record->_name != _name && ![record->_name isEqual: _name])
		return false;

	if (otherRecord->_DNSClass != _DNSClass)
	if (record->_DNSClass != _DNSClass)
		return false;

	if (otherRecord->_recordType != _recordType)
	if (record->_recordType != _recordType)
		return false;

	if (otherRecord->_domainName != _domainName &&
	    ![otherRecord->_domainName isEqual: _domainName])
	if (record->_domainName != _domainName &&
	    ![record->_domainName isEqual: _domainName])
		return false;

	return true;
}

- (uint32_t)hash
{
866
867
868
869
870
871
872
873

874
875

876



877

878
879
880

881
882

883
884
885

886
887
888

889
890
891
892


893
894
895
896


897
898
899
900
901
902
903
886
887
888
889
890
891
892

893
894

895
896
897
898
899

900
901
902

903
904

905
906
907

908
909
910

911
912
913


914
915
916
917


918
919
920
921
922
923
924
925
926







-
+

-
+

+
+
+
-
+


-
+

-
+


-
+


-
+


-
-
+
+


-
-
+
+







{
	[_mailbox release];
	[_TXTDomainName release];

	[super dealloc];
}

- (bool)isEqual: (id)otherObject
- (bool)isEqual: (id)object
{
	OFRPDNSResourceRecord *otherRecord;
	OFRPDNSResourceRecord *record;

	if (object == self)
		return true;

	if (![otherObject isKindOfClass: [OFRPDNSResourceRecord class]])
	if (![object isKindOfClass: [OFRPDNSResourceRecord class]])
		return false;

	otherRecord = otherObject;
	record = object;

	if (otherRecord->_name != _name && ![otherRecord->_name isEqual: _name])
	if (record->_name != _name && ![record->_name isEqual: _name])
		return false;

	if (otherRecord->_DNSClass != _DNSClass)
	if (record->_DNSClass != _DNSClass)
		return false;

	if (otherRecord->_recordType != _recordType)
	if (record->_recordType != _recordType)
		return false;

	if (otherRecord->_mailbox != _mailbox &&
	    ![otherRecord->_mailbox isEqual: _mailbox])
	if (record->_mailbox != _mailbox &&
	    ![record->_mailbox isEqual: _mailbox])
		return false;

	if (otherRecord->_TXTDomainName != _TXTDomainName &&
	    ![otherRecord->_TXTDomainName isEqual: _TXTDomainName])
	if (record->_TXTDomainName != _TXTDomainName &&
	    ![record->_TXTDomainName isEqual: _TXTDomainName])
		return false;

	return true;
}

- (uint32_t)hash
{
984
985
986
987
988
989
990
991

992
993

994



995

996
997
998

999
1000

1001
1002
1003

1004
1005
1006

1007
1008
1009
1010


1011
1012
1013
1014


1015
1016
1017

1018
1019
1020

1021
1022
1023

1024
1025
1026

1027
1028
1029

1030
1031
1032
1033
1034
1035
1036
1007
1008
1009
1010
1011
1012
1013

1014
1015

1016
1017
1018
1019
1020

1021
1022
1023

1024
1025

1026
1027
1028

1029
1030
1031

1032
1033
1034


1035
1036
1037
1038


1039
1040
1041
1042

1043
1044
1045

1046
1047
1048

1049
1050
1051

1052
1053
1054

1055
1056
1057
1058
1059
1060
1061
1062







-
+

-
+

+
+
+
-
+


-
+

-
+


-
+


-
+


-
-
+
+


-
-
+
+


-
+


-
+


-
+


-
+


-
+







{
	[_primaryNameServer release];
	[_responsiblePerson release];

	[super dealloc];
}

- (bool)isEqual: (id)otherObject
- (bool)isEqual: (id)object
{
	OFSOADNSResourceRecord *otherRecord;
	OFSOADNSResourceRecord *record;

	if (object == self)
		return true;

	if (![otherObject isKindOfClass: [OFSOADNSResourceRecord class]])
	if (![object isKindOfClass: [OFSOADNSResourceRecord class]])
		return false;

	otherRecord = otherObject;
	record = object;

	if (otherRecord->_name != _name && ![otherRecord->_name isEqual: _name])
	if (record->_name != _name && ![record->_name isEqual: _name])
		return false;

	if (otherRecord->_DNSClass != _DNSClass)
	if (record->_DNSClass != _DNSClass)
		return false;

	if (otherRecord->_recordType != _recordType)
	if (record->_recordType != _recordType)
		return false;

	if (otherRecord->_primaryNameServer != _primaryNameServer &&
	    ![otherRecord->_primaryNameServer isEqual: _primaryNameServer])
	if (record->_primaryNameServer != _primaryNameServer &&
	    ![record->_primaryNameServer isEqual: _primaryNameServer])
		return false;

	if (otherRecord->_responsiblePerson != _responsiblePerson &&
	    ![otherRecord->_responsiblePerson isEqual: _responsiblePerson])
	if (record->_responsiblePerson != _responsiblePerson &&
	    ![record->_responsiblePerson isEqual: _responsiblePerson])
		return false;

	if (otherRecord->_serialNumber != _serialNumber)
	if (record->_serialNumber != _serialNumber)
		return false;

	if (otherRecord->_refreshInterval != _refreshInterval)
	if (record->_refreshInterval != _refreshInterval)
		return false;

	if (otherRecord->_retryInterval != _retryInterval)
	if (record->_retryInterval != _retryInterval)
		return false;

	if (otherRecord->_expirationInterval != _expirationInterval)
	if (record->_expirationInterval != _expirationInterval)
		return false;

	if (otherRecord->_minTTL != _minTTL)
	if (record->_minTTL != _minTTL)
		return false;

	return true;
}

- (uint32_t)hash
{
1133
1134
1135
1136
1137
1138
1139
1140

1141
1142

1143



1144

1145
1146
1147

1148
1149

1150
1151
1152

1153
1154
1155

1156
1157
1158

1159
1160
1161

1162
1163
1164

1165
1166
1167
1168

1169
1170
1171
1172
1173
1174
1175
1159
1160
1161
1162
1163
1164
1165

1166
1167

1168
1169
1170
1171
1172

1173
1174
1175

1176
1177

1178
1179
1180

1181
1182
1183

1184
1185
1186

1187
1188
1189

1190
1191
1192

1193

1194
1195

1196
1197
1198
1199
1200
1201
1202
1203







-
+

-
+

+
+
+
-
+


-
+

-
+


-
+


-
+


-
+


-
+


-
+
-


-
+







- (void)dealloc
{
	[_target release];

	[super dealloc];
}

- (bool)isEqual: (id)otherObject
- (bool)isEqual: (id)object
{
	OFSRVDNSResourceRecord *otherRecord;
	OFSRVDNSResourceRecord *record;

	if (object == self)
		return true;

	if (![otherObject isKindOfClass: [OFSRVDNSResourceRecord class]])
	if (![object isKindOfClass: [OFSRVDNSResourceRecord class]])
		return false;

	otherRecord = otherObject;
	record = object;

	if (otherRecord->_name != _name && ![otherRecord->_name isEqual: _name])
	if (record->_name != _name && ![record->_name isEqual: _name])
		return false;

	if (otherRecord->_DNSClass != _DNSClass)
	if (record->_DNSClass != _DNSClass)
		return false;

	if (otherRecord->_recordType != _recordType)
	if (record->_recordType != _recordType)
		return false;

	if (otherRecord->_priority != _priority)
	if (record->_priority != _priority)
		return false;

	if (otherRecord->_weight != _weight)
	if (record->_weight != _weight)
		return false;

	if (otherRecord->_target != _target &&
	if (record->_target != _target && ![record->_target isEqual: _target])
	    ![otherRecord->_target isEqual: _target])
		return false;

	if (otherRecord->_port != _port)
	if (record->_port != _port)
		return false;

	return true;
}

- (uint32_t)hash
{
1244
1245
1246
1247
1248
1249
1250
1251

1252
1253

1254



1255

1256
1257
1258

1259
1260

1261
1262
1263

1264
1265
1266

1267
1268
1269
1270


1271
1272
1273
1274
1275
1276
1277
1272
1273
1274
1275
1276
1277
1278

1279
1280

1281
1282
1283
1284
1285

1286
1287
1288

1289
1290

1291
1292
1293

1294
1295
1296

1297
1298
1299


1300
1301
1302
1303
1304
1305
1306
1307
1308







-
+

-
+

+
+
+
-
+


-
+

-
+


-
+


-
+


-
-
+
+







- (void)dealloc
{
	[_textData release];

	[super dealloc];
}

- (bool)isEqual: (id)otherObject
- (bool)isEqual: (id)object
{
	OFTXTDNSResourceRecord *otherRecord;
	OFTXTDNSResourceRecord *record;

	if (object == self)
		return true;

	if (![otherObject isKindOfClass: [OFTXTDNSResourceRecord class]])
	if (![object isKindOfClass: [OFTXTDNSResourceRecord class]])
		return false;

	otherRecord = otherObject;
	record = object;

	if (otherRecord->_name != _name && ![otherRecord->_name isEqual: _name])
	if (record->_name != _name && ![record->_name isEqual: _name])
		return false;

	if (otherRecord->_DNSClass != _DNSClass)
	if (record->_DNSClass != _DNSClass)
		return false;

	if (otherRecord->_recordType != _recordType)
	if (record->_recordType != _recordType)
		return false;

	if (otherRecord->_textData != _textData &&
	    ![otherRecord->_textData isEqual: _textData])
	if (record->_textData != _textData &&
	    ![record->_textData isEqual: _textData])
		return false;

	return true;
}

- (uint32_t)hash
{

Modified src/OFDNSResponse.m from [e97f58bfa9] to [4c41009453].

73
74
75
76
77
78
79



80
81
82
83
84
85
86
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89







+
+
+








	[super dealloc];
}

- (bool)isEqual: (id)object
{
	OFDNSResponse *response;

	if (object == self)
		return true;

	if (![object isKindOfClass: [OFDNSResponse class]])
		return false;

	response = object;

	if (response->_domainName != _domainName &&

Modified src/OFIntrospection.m from [79c1692f33] to [58e26172d8].

341
342
343
344
345
346
347
348

349
350
351
352
353
354
355
341
342
343
344
345
346
347

348
349
350
351
352
353
354
355







-
+







- (bool)isEqual: (id)object
{
	OFProperty *otherProperty;

	if (object == self)
		return true;

	if ([object isKindOfClass: [OFProperty class]])
	if (![object isKindOfClass: [OFProperty class]])
		return false;

	otherProperty = object;

	if (![otherProperty->_name isEqual: _name])
		return false;
	if (otherProperty->_attributes != _attributes)

Modified src/OFSecureData.m from [fa28a56f57] to [4b72bb7708].

541
542
543
544
545
546
547



548
549
550
551
552
553
554
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557







+
+
+







					     count: _count];
}

- (bool)isEqual: (id)object
{
	OFData *otherData;
	unsigned char diff;

	if (object == self)
		return true;

	if (![object isKindOfClass: [OFData class]])
		return false;

	otherData = object;

	if (otherData->_count != _count || otherData->_itemSize != _itemSize)

Modified src/OFValue.m from [50d6956f54] to [2619bc1d62].

164
165
166
167
168
169
170



171
172
173
174
175
176
177
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180







+
+
+







}

- (bool)isEqual: (id)object
{
	const char *objCType;
	size_t size;
	void *value, *otherValue;

	if (object == self)
		return true;

	if (![object isKindOfClass: [OFValue class]])
		return false;

	objCType = self.objCType;

	if (strcmp([object objCType], objCType) != 0)