Bladeren bron

mesa: remove _mesa_symbol_table_iterator structure

Nothing uses this structure, removal fixes Klocwork error about
the possible oom condition in _mesa_symbol_table_iterator_ctor.

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
undefined
Tapani Pälli 11 jaren geleden
bovenliggende
commit
aa0d95a08d
2 gewijzigde bestanden met toevoegingen van 0 en 99 verwijderingen
  1. 0
    86
      src/mesa/program/symbol_table.c
  2. 0
    13
      src/mesa/program/symbol_table.h

+ 0
- 86
src/mesa/program/symbol_table.c Bestand weergeven

@@ -112,24 +112,6 @@ struct _mesa_symbol_table {
};


struct _mesa_symbol_table_iterator {
/**
* Name space of symbols returned by this iterator.
*/
int name_space;


/**
* Currently iterated symbol
*
* The next call to \c _mesa_symbol_table_iterator_get will return this
* value. It will also update this value to the value that should be
* returned by the next call.
*/
struct symbol *curr;
};


static void
check_symbol_table(struct _mesa_symbol_table *table)
{
@@ -201,74 +183,6 @@ find_symbol(struct _mesa_symbol_table *table, const char *name)
}


struct _mesa_symbol_table_iterator *
_mesa_symbol_table_iterator_ctor(struct _mesa_symbol_table *table,
int name_space, const char *name)
{
struct _mesa_symbol_table_iterator *iter = calloc(1, sizeof(*iter));
struct symbol_header *const hdr = find_symbol(table, name);
iter->name_space = name_space;

if (hdr != NULL) {
struct symbol *sym;

for (sym = hdr->symbols; sym != NULL; sym = sym->next_with_same_name) {
assert(sym->hdr == hdr);

if ((name_space == -1) || (sym->name_space == name_space)) {
iter->curr = sym;
break;
}
}
}

return iter;
}


void
_mesa_symbol_table_iterator_dtor(struct _mesa_symbol_table_iterator *iter)
{
free(iter);
}


void *
_mesa_symbol_table_iterator_get(struct _mesa_symbol_table_iterator *iter)
{
return (iter->curr == NULL) ? NULL : iter->curr->data;
}


int
_mesa_symbol_table_iterator_next(struct _mesa_symbol_table_iterator *iter)
{
struct symbol_header *hdr;

if (iter->curr == NULL) {
return 0;
}

hdr = iter->curr->hdr;
iter->curr = iter->curr->next_with_same_name;

while (iter->curr != NULL) {
assert(iter->curr->hdr == hdr);
(void)hdr;

if ((iter->name_space == -1)
|| (iter->curr->name_space == iter->name_space)) {
return 1;
}

iter->curr = iter->curr->next_with_same_name;
}

return 0;
}


/**
* Determine the scope "distance" of a symbol from the current scope
*

+ 0
- 13
src/mesa/program/symbol_table.h Bestand weergeven

@@ -24,7 +24,6 @@
#define MESA_SYMBOL_TABLE_H

struct _mesa_symbol_table;
struct _mesa_symbol_table_iterator;

extern void _mesa_symbol_table_push_scope(struct _mesa_symbol_table *table);

@@ -47,16 +46,4 @@ extern struct _mesa_symbol_table *_mesa_symbol_table_ctor(void);

extern void _mesa_symbol_table_dtor(struct _mesa_symbol_table *);

extern struct _mesa_symbol_table_iterator *_mesa_symbol_table_iterator_ctor(
struct _mesa_symbol_table *table, int name_space, const char *name);

extern void _mesa_symbol_table_iterator_dtor(
struct _mesa_symbol_table_iterator *);

extern void *_mesa_symbol_table_iterator_get(
struct _mesa_symbol_table_iterator *iter);

extern int _mesa_symbol_table_iterator_next(
struct _mesa_symbol_table_iterator *iter);

#endif /* MESA_SYMBOL_TABLE_H */

Laden…
Annuleren
Opslaan