"Glen Choo via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > -static inline struct config_source *config_reader_pop_source() > +static inline struct config_source *config_reader_pop_source(struct config_reader *reader) > { > struct config_source *ret; > - if (!cf_global) > + if (!reader->source) > BUG("tried to pop config source, but we weren't reading config"); > - ret = cf_global; > - cf_global = cf_global->prev; > + ret = reader->source; > + reader->source = reader->source->prev; > + /* FIXME remove this when cf is removed. */ > + cf_global = reader->source; > return ret; > } In the FIXME, it's cf_global not cf. Everything else looks good.