diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2013-07-27 18:53:27 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2013-07-27 18:53:27 +0200 |
| commit | 08c6bcb98e4f9c6da6dd819becc136efa3455466 (patch) | |
| tree | f2a4bcaddc05df627d92d8144f6df1107ebb9afe /mmss/config.cpp | |
| parent | 379b2b37010cff9343cb9cc468c5c0b17a37ff7e (diff) | |
| download | gmrf-08c6bcb98e4f9c6da6dd819becc136efa3455466.tar gmrf-08c6bcb98e4f9c6da6dd819becc136efa3455466.zip | |
Move logging into context_t
Diffstat (limited to 'mmss/config.cpp')
| -rw-r--r-- | mmss/config.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mmss/config.cpp b/mmss/config.cpp index 4492ffd..5897720 100644 --- a/mmss/config.cpp +++ b/mmss/config.cpp @@ -38,7 +38,7 @@ namespace MMSS { namespace Config { void add_network(context_t *mmss, config_t *conf, const char *name) { - logf(mmss, LOG_NOTICE, "adding network `%s'", name); + mmss->logf(LOG_NOTICE, "adding network `%s'", name); std::shared_ptr<network_t> net = std::make_shared<network_t>(); @@ -74,7 +74,7 @@ bool read_config(context_t *mmss, config_t *conf, const char *filename) { else { file = fopen(filename, "r"); if (!file) { - logf(mmss, LOG_ERR, "can't open config file `%s': %s", filename, strerror(errno)); + mmss->logf(LOG_ERR, "can't open config file `%s': %s", filename, strerror(errno)); ret = false; goto end_free; } @@ -87,7 +87,7 @@ bool read_config(context_t *mmss, config_t *conf, const char *filename) { dir = dirname(filename2); if (chdir(dir)) { - logf(mmss, LOG_ERR, "change from directory `%s' to `%s' failed", oldcwd, dir); + mmss->logf(LOG_ERR, "change from directory `%s' to `%s' failed", oldcwd, dir); ret = false; goto end_free; } @@ -97,7 +97,7 @@ bool read_config(context_t *mmss, config_t *conf, const char *filename) { token = mmss_config_yylex(&token_val, &loc, scanner); if (token < 0) { - logf(mmss, LOG_ERR, "config error: %s at %s:%i:%i", token_val.error, filename, loc.first_line, loc.first_column); + mmss->logf(LOG_ERR, "config error: %s at %s:%i:%i", token_val.error, filename, loc.first_line, loc.first_column); ret = false; goto end_free; } @@ -122,7 +122,7 @@ bool read_config(context_t *mmss, config_t *conf, const char *filename) { mmss_config_yylex_destroy(scanner); if(chdir(oldcwd)) - logf(mmss, LOG_ERR, "can't chdir to `%s': %s", oldcwd, strerror(errno)); + mmss->logf(LOG_ERR, "can't chdir to `%s': %s", oldcwd, strerror(errno)); free(filename2); free(oldcwd); |