summaryrefslogtreecommitdiff
path: root/main.cc
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2006-02-16 01:01:38 +0000
committerJohn Wiegley <johnw@newartisans.com>2008-04-13 02:41:23 -0400
commit4aea9709bb25a3be567ad8c25cdd4458e813a10f (patch)
treeab9f540eb655848acc8f324afe171775affe2f39 /main.cc
parent17e872689ead6d2250af3997c3944b081b4ad9ef (diff)
downloadledger-4aea9709bb25a3be567ad8c25cdd4458e813a10f.tar.gz
ledger-4aea9709bb25a3be567ad8c25cdd4458e813a10f.tar.bz2
ledger-4aea9709bb25a3be567ad8c25cdd4458e813a10f.zip
Made several changes to the parsing infrastructure to allow passing
the "config_t" object around. This is needed for parsing option settings in the initialization file.
Diffstat (limited to 'main.cc')
-rw-r--r--main.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/main.cc b/main.cc
index cf53be68..89f032b1 100644
--- a/main.cc
+++ b/main.cc
@@ -68,8 +68,10 @@ int parse_and_report(int argc, char * argv[], char * envp[])
config.process_option("file", p);
if (const char * p = std::getenv("LEDGER_INIT"))
config.process_option("init-file", p);
+#if 0
if (const char * p = std::getenv("PRICE_HIST"))
config.process_option("price-db", p);
+#endif
if (const char * p = std::getenv("PRICE_EXP"))
config.process_option("price-exp", p);
#endif
@@ -128,7 +130,7 @@ int parse_and_report(int argc, char * argv[], char * envp[])
TIMER_START(parse);
- if (parse_ledger_data(journal.get(), config) == 0)
+ if (parse_ledger_data(config, journal.get()) == 0)
throw error("Please specify ledger file using -f"
" or LEDGER_FILE environment variable.");