don't allocate config_t within config.cc

This commit is contained in:
John Wiegley 2004-08-17 02:43:09 -04:00
parent cd7d7e5b88
commit c0d7feac7f
3 changed files with 16 additions and 11 deletions

View file

@ -3,7 +3,7 @@
namespace ledger { namespace ledger {
std::auto_ptr<config_t> config(new config_t); config_t * config = NULL;
const std::string bal_fmt = "%20T %2_%-n\n"; const std::string bal_fmt = "%20T %2_%-n\n";
const std::string reg_fmt const std::string reg_fmt

View file

@ -32,20 +32,20 @@ struct config_t
std::string value_expr; std::string value_expr;
std::string total_expr; std::string total_expr;
unsigned long pricing_leeway; unsigned long pricing_leeway;
bool show_subtotals; bool show_subtotals;
bool show_expanded; bool show_expanded;
bool show_related; bool show_related;
bool show_inverted; bool show_inverted;
bool show_empty; bool show_empty;
bool days_of_the_week; bool days_of_the_week;
bool show_revalued; bool show_revalued;
bool show_revalued_only; bool show_revalued_only;
bool download_quotes; bool download_quotes;
config_t(); config_t();
}; };
extern std::auto_ptr<config_t> config; extern config_t * config;
void option_help(std::ostream& out); void option_help(std::ostream& out);

View file

@ -35,6 +35,11 @@ int main(int argc, char * argv[], char * envp[])
{ {
std::auto_ptr<journal_t> journal(new journal_t); std::auto_ptr<journal_t> journal(new journal_t);
// Initialize the global configuration object for this run
std::auto_ptr<config_t> global_config(new config_t);
config = global_config.get();
// Parse command-line arguments // Parse command-line arguments
TIMER_START(process_args); TIMER_START(process_args);