kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 00:24:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "vector: After remove element recheck index" into 13

Browse Source
This commit is contained in:
zuul
2016-10-11 16:51:30 -05:00
committed by Gerrit Code Review
parent 64b43d4474 a884b26392
commit 39dbe7aba4
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/asterisk/vector.h
View File

@@ -367,11 +367,13 @@
int count = 0; \ int count = 0; \
size_t idx; \ size_t idx; \
typeof(value) __value = (value); \ typeof(value) __value = (value); \
for (idx = 0; idx < (vec)->current; ++idx) { \ for (idx = 0; idx < (vec)->current; ) { \
if (cmp((vec)->elems[idx], __value)) { \ if (cmp((vec)->elems[idx], __value)) { \
cleanup((vec)->elems[idx]); \ cleanup((vec)->elems[idx]); \
AST_VECTOR_REMOVE_UNORDERED((vec), idx); \ AST_VECTOR_REMOVE_UNORDERED((vec), idx); \
++count; \ ++count; \
} else { \
++idx; \
} \ } \
} \ } \
count; \ count; \
@@ -417,14 +419,16 @@
int count = 0; \ int count = 0; \
size_t idx; \ size_t idx; \
typeof(value) __value = (value); \ typeof(value) __value = (value); \
for (idx = 0; idx < (vec)->current; ++idx) { \ for (idx = 0; idx < (vec)->current; ) { \
if (cmp((vec)->elems[idx], __value)) { \ if (cmp((vec)->elems[idx], __value)) { \
cleanup((vec)->elems[idx]); \ cleanup((vec)->elems[idx]); \
AST_VECTOR_REMOVE_ORDERED((vec), idx); \ AST_VECTOR_REMOVE_ORDERED((vec), idx); \
++count; \ ++count; \
} else { \
++idx; \
} \ } \
} \ } \
oount; \ count; \
}) })
/*! /*!
@@ -445,7 +449,7 @@
for (idx = 0; idx < (vec)->current; ++idx) { \ for (idx = 0; idx < (vec)->current; ++idx) { \
if (cmp((vec)->elems[idx], __value)) { \ if (cmp((vec)->elems[idx], __value)) { \
cleanup((vec)->elems[idx]); \ cleanup((vec)->elems[idx]); \
AST_VECTOR_REMOVE_ORDERED((vec), idx); \ AST_VECTOR_REMOVE_ORDERED((vec), idx); \
res = 0; \ res = 0; \
break; \ break; \
} \ } \