OLD | NEW |
1 /* ***** BEGIN LICENSE BLOCK ***** | 1 /* ***** BEGIN LICENSE BLOCK ***** |
2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 | 2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
3 * | 3 * |
4 * The contents of this file are subject to the Mozilla Public License Version | 4 * The contents of this file are subject to the Mozilla Public License Version |
5 * 1.1 (the "License"); you may not use this file except in compliance with | 5 * 1.1 (the "License"); you may not use this file except in compliance with |
6 * the License. You may obtain a copy of the License at | 6 * the License. You may obtain a copy of the License at |
7 * http://www.mozilla.org/MPL/ | 7 * http://www.mozilla.org/MPL/ |
8 * | 8 * |
9 * Software distributed under the License is distributed on an "AS IS" basis, | 9 * Software distributed under the License is distributed on an "AS IS" basis, |
10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License | 10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License |
(...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
583 /* | 583 /* |
584 ** Make sure array of ava's are the same length. If not, then we are | 584 ** Make sure array of ava's are the same length. If not, then we are |
585 ** not equal | 585 ** not equal |
586 */ | 586 */ |
587 ac = CountArray((void**) aavas); | 587 ac = CountArray((void**) aavas); |
588 bc = CountArray((void**) bavas); | 588 bc = CountArray((void**) bavas); |
589 if (ac < bc) return SECLessThan; | 589 if (ac < bc) return SECLessThan; |
590 if (ac > bc) return SECGreaterThan; | 590 if (ac > bc) return SECGreaterThan; |
591 | 591 |
592 while (NULL != (aava = *aavas++)) { | 592 while (NULL != (aava = *aavas++)) { |
593 » for (bavas = b->avas; bava = *bavas++; ) { | 593 » for (bavas = b->avas; NULL != (bava = *bavas++); ) { |
594 rv = SECITEM_CompareItem(&aava->type, &bava->type); | 594 rv = SECITEM_CompareItem(&aava->type, &bava->type); |
595 if (SECEqual == rv) { | 595 if (SECEqual == rv) { |
596 rv = CERT_CompareAVA(aava, bava); | 596 rv = CERT_CompareAVA(aava, bava); |
597 if (SECEqual != rv) | 597 if (SECEqual != rv) |
598 return rv; | 598 return rv; |
599 break; | 599 break; |
600 } | 600 } |
601 } | 601 } |
602 if (!bava) /* didn't find a match */ | 602 if (!bava) /* didn't find a match */ |
603 return SECGreaterThan; | 603 return SECGreaterThan; |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
733 } | 733 } |
734 | 734 |
735 avaValue.data = utf8Val; | 735 avaValue.data = utf8Val; |
736 avaValue.len = utf8ValLen; | 736 avaValue.len = utf8ValLen; |
737 } | 737 } |
738 | 738 |
739 retItem = SECITEM_DupItem(&avaValue); | 739 retItem = SECITEM_DupItem(&avaValue); |
740 PORT_FreeArena(newarena, PR_FALSE); | 740 PORT_FreeArena(newarena, PR_FALSE); |
741 return retItem; | 741 return retItem; |
742 } | 742 } |
OLD | NEW |