mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-07 07:24:05 +00:00
jscript: Use LIST_FOR_EACH_ENTRY_SAFE to clear Map and Set objects.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com> Signed-off-by: Jacek Caban <jacek@codeweavers.com>
This commit is contained in:
parent
34aeef628f
commit
bae77953ed
|
@ -223,6 +223,7 @@ static HRESULT iterate_map(MapInstance *map, script_ctx_t *ctx, unsigned argc, j
|
|||
static HRESULT Map_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
|
||||
jsval_t *r)
|
||||
{
|
||||
struct jsval_map_entry *entry, *entry2;
|
||||
MapInstance *map;
|
||||
HRESULT hres;
|
||||
|
||||
|
@ -232,10 +233,8 @@ static HRESULT Map_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned
|
|||
|
||||
TRACE("%p\n", map);
|
||||
|
||||
while(!list_empty(&map->entries)) {
|
||||
struct jsval_map_entry *entry = LIST_ENTRY(list_head(&map->entries), struct jsval_map_entry, list_entry);
|
||||
LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &map->entries, struct jsval_map_entry, list_entry)
|
||||
delete_map_entry(map, entry);
|
||||
}
|
||||
|
||||
if(r) *r = jsval_undefined();
|
||||
return S_OK;
|
||||
|
@ -443,6 +442,7 @@ static HRESULT Set_add(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned ar
|
|||
static HRESULT Set_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,
|
||||
jsval_t *r)
|
||||
{
|
||||
struct jsval_map_entry *entry, *entry2;
|
||||
MapInstance *set;
|
||||
HRESULT hres;
|
||||
|
||||
|
@ -452,10 +452,8 @@ static HRESULT Set_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned
|
|||
|
||||
TRACE("%p\n", set);
|
||||
|
||||
while(!list_empty(&set->entries)) {
|
||||
struct jsval_map_entry *entry = LIST_ENTRY(list_head(&set->entries), struct jsval_map_entry, list_entry);
|
||||
LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &set->entries, struct jsval_map_entry, list_entry)
|
||||
delete_map_entry(set, entry);
|
||||
}
|
||||
|
||||
if(r) *r = jsval_undefined();
|
||||
return S_OK;
|
||||
|
|
Loading…
Reference in a new issue