denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use enumerator instead of deprecated iterator

Browse Source
This commit is contained in:
Martin Willi
2011-01-05 16:45:51 +01:00
parent 9f8ecff2e2
commit 1f5b2bec4b
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/payloads/proposal_substructure.c
+9 -13
View File
@@ -213,22 +213,18 @@ METHOD(payload_t, set_next_type, void,
*/ */
static void compute_length(private_proposal_substructure_t *this) static void compute_length(private_proposal_substructure_t *this)
{ {
iterator_t *iterator; enumerator_t *enumerator;
payload_t *current_transform; payload_t *transform;
size_t transforms_count = 0;
size_t length = PROPOSAL_SUBSTRUCTURE_HEADER_LENGTH;
iterator = this->transforms->create_iterator(this->transforms,TRUE); this->transforms_count = 0;
while (iterator->iterate(iterator, (void**)&current_transform)) this->proposal_length = PROPOSAL_SUBSTRUCTURE_HEADER_LENGTH + this->spi.len;
enumerator = this->transforms->create_enumerator(this->transforms);
while (enumerator->enumerate(enumerator, &transform))
{ {
length += current_transform->get_length(current_transform); this->proposal_length += transform->get_length(transform);
transforms_count++; this->transforms_count++;
} }
iterator->destroy(iterator); enumerator->destroy(enumerator);
length += this->spi.len;
this->transforms_count = transforms_count;
this->proposal_length = length;
} }
METHOD(payload_t, get_length, size_t, METHOD(payload_t, get_length, size_t,