don't allocate config_t within config.cc

3 files changed, 16 insertions, 11 deletions

diff --git a/config.cc b/config.cc
index 3a9ce1ac..99c4d4b4 100644
--- a/config.cc
+++ b/config.cc
@@ -3,7 +3,7 @@
 
 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 reg_fmt
diff --git a/config.h b/config.h
index c026bdec..a5319059 100644
--- a/config.h
+++ b/config.h
@@ -32,20 +32,20 @@ struct config_t
   std::string   value_expr;
   std::string   total_expr;
   unsigned long pricing_leeway;
-  bool	      	show_subtotals;
-  bool	      	show_expanded;
-  bool	      	show_related;
-  bool	      	show_inverted;
-  bool	      	show_empty;
-  bool	      	days_of_the_week;
-  bool	      	show_revalued;
-  bool	      	show_revalued_only;
-  bool	      	download_quotes;
+  bool		show_subtotals;
+  bool		show_expanded;
+  bool		show_related;
+  bool		show_inverted;
+  bool		show_empty;
+  bool		days_of_the_week;
+  bool		show_revalued;
+  bool		show_revalued_only;
+  bool		download_quotes;
 
   config_t();
 };
 
-extern std::auto_ptr<config_t> config;
+extern config_t * config;
 
 void option_help(std::ostream& out);
 
diff --git a/main.cc b/main.cc
index 4223b3ff..d8d54567 100644
--- a/main.cc
+++ b/main.cc
@@ -35,6 +35,11 @@ int main(int argc, char * argv[], char * envp[])
 {
   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
 
   TIMER_START(process_args);