I can't find that these functions were ever used. Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>
On 02/27/2014 10:15 AM, Tapani Pälli wrote: > 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.pa...@intel.com> > --- > src/mesa/program/symbol_table.c | 86 > ----------------------------------------- > src/mesa/program/symbol_table.h | 13 ------- > 2 files changed, 99 deletions(-) > > diff --git a/src/mesa/program/symbol_table.c b/src/mesa/program/symbol_table.c > index 4f6f31f..2f41322 100644 > --- a/src/mesa/program/symbol_table.c > +++ b/src/mesa/program/symbol_table.c > @@ -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 > * > diff --git a/src/mesa/program/symbol_table.h b/src/mesa/program/symbol_table.h > index f9d9164..1027f47 100644 > --- a/src/mesa/program/symbol_table.h > +++ b/src/mesa/program/symbol_table.h > @@ -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 */ > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev