From 54006de40c10b4dc6a6b049cd458341f0d75e622 Mon Sep 17 00:00:00 2001 From: Eric Leblond Date: Tue, 9 Apr 2013 14:52:02 +0200 Subject: [PATCH] Use new function GetLogDirectory() --- src/alert-pcapinfo.c | 3 +-- src/alert-unified2-alert.c | 3 +-- src/counters.c | 3 +-- src/detect-engine-analyzer.c | 6 ++---- src/log-filestore.c | 3 +-- src/log-pcap.c | 6 ++---- src/log-tlslog.c | 3 +-- src/util-debug.c | 3 +-- src/util-logopenfile.c | 3 +-- src/util-profiling-rules.c | 3 +-- src/util-profiling.c | 9 +++------ 11 files changed, 15 insertions(+), 30 deletions(-) diff --git a/src/alert-pcapinfo.c b/src/alert-pcapinfo.c index e24296003f..3f7abc6512 100644 --- a/src/alert-pcapinfo.c +++ b/src/alert-pcapinfo.c @@ -214,8 +214,7 @@ static int AlertPcapInfoOpenFileCtx(LogFileCtx *file_ctx, const char *filename, char log_path[PATH_MAX]; char *log_dir; - if (ConfGet("default-log-dir", &log_dir) != 1) - log_dir = DEFAULT_LOG_DIR; + log_dir = GetLogDirectory(); snprintf(log_path, PATH_MAX, "%s/%s", log_dir, filename); diff --git a/src/alert-unified2-alert.c b/src/alert-unified2-alert.c index 4146f3928d..3732661067 100644 --- a/src/alert-unified2-alert.c +++ b/src/alert-unified2-alert.c @@ -1096,8 +1096,7 @@ int Unified2AlertOpenFileCtx(LogFileCtx *file_ctx, const char *prefix) /* create the filename to use */ char *log_dir; - if (ConfGet("default-log-dir", &log_dir) != 1) - log_dir = DEFAULT_LOG_DIR; + log_dir = GetLogDirectory(); snprintf(filename, PATH_MAX, "%s/%s.%" PRIu32, log_dir, prefix, (uint32_t)ts.tv_sec); diff --git a/src/counters.c b/src/counters.c index b6b7df8d6a..50296fa84c 100644 --- a/src/counters.c +++ b/src/counters.c @@ -277,8 +277,7 @@ static char *SCPerfGetLogFilename(ConfNode *stats) char *log_filename = NULL; const char* filename = NULL; - if (ConfGet("default-log-dir", &log_dir) != 1) - log_dir = DEFAULT_LOG_DIR; + log_dir = GetLogDirectory(); if ( (log_filename = SCMalloc(PATH_MAX)) == NULL) { return NULL; diff --git a/src/detect-engine-analyzer.c b/src/detect-engine-analyzer.c index 7840562b24..431be57185 100644 --- a/src/detect-engine-analyzer.c +++ b/src/detect-engine-analyzer.c @@ -192,8 +192,7 @@ int SetupFPAnalyzer(void) return 0; char *log_dir; - if (ConfGet("default-log-dir", &log_dir) != 1) - log_dir = DEFAULT_LOG_DIR; + log_dir = GetLogDirectory(); snprintf(log_path, sizeof(log_path), "%s/%s", log_dir, "rules_fast_pattern.txt"); @@ -243,8 +242,7 @@ int SetupRuleAnalyzer(void) } if (enabled) { char *log_dir; - if (ConfGet("default-log-dir", &log_dir) != 1) - log_dir = DEFAULT_LOG_DIR; + log_dir = GetLogDirectory(); snprintf(log_path, sizeof(log_path), "%s/%s", log_dir, "rules_analysis.txt"); rule_engine_analysis_FD = fopen(log_path, "w"); if (rule_engine_analysis_FD == NULL) { diff --git a/src/log-filestore.c b/src/log-filestore.c index 3e19527f14..bba1c3820f 100644 --- a/src/log-filestore.c +++ b/src/log-filestore.c @@ -567,8 +567,7 @@ static OutputCtx *LogFilestoreLogInitCtx(ConfNode *conf) output_ctx->DeInit = LogFilestoreLogDeInitCtx; char *s_default_log_dir = NULL; - if (ConfGet("default-log-dir", &s_default_log_dir) != 1) - s_default_log_dir = DEFAULT_LOG_DIR; + s_default_log_dir = GetLogDirectory(); const char *s_base_dir = NULL; s_base_dir = ConfNodeLookupChildValue(conf, "log-dir"); diff --git a/src/log-pcap.c b/src/log-pcap.c index 053aabcfd7..f14af0dee8 100644 --- a/src/log-pcap.c +++ b/src/log-pcap.c @@ -463,8 +463,7 @@ OutputCtx *PcapLogInitCtx(ConfNode *conf) exit(EXIT_FAILURE); } else { char *log_dir = NULL; - if (ConfGet("default-log-dir", &log_dir) != 1) - log_dir = DEFAULT_LOG_DIR; + log_dir = GetLogDirectory(); strlcpy(pl->dir, log_dir, sizeof(pl->dir)); @@ -476,8 +475,7 @@ OutputCtx *PcapLogInitCtx(ConfNode *conf) s_dir, sizeof(pl->dir)); } else { char *log_dir = NULL; - if (ConfGet("default-log-dir", &log_dir) != 1) - log_dir = DEFAULT_LOG_DIR; + log_dir = GetLogDirectory(); snprintf(pl->dir, sizeof(pl->dir), "%s/%s", log_dir, s_dir); diff --git a/src/log-tlslog.c b/src/log-tlslog.c index 6565297549..9059d18d9a 100644 --- a/src/log-tlslog.c +++ b/src/log-tlslog.c @@ -560,8 +560,7 @@ OutputCtx *LogTlsLogInitCtx(ConfNode *conf) } char *s_default_log_dir = NULL; - if (ConfGet("default-log-dir", &s_default_log_dir) != 1) - s_default_log_dir = DEFAULT_LOG_DIR; + s_default_log_dir = GetLogDirectory(); const char *s_base_dir = NULL; s_base_dir = ConfNodeLookupChildValue(conf, "certs-log-dir"); diff --git a/src/util-debug.c b/src/util-debug.c index 572690e800..6931b01e76 100644 --- a/src/util-debug.c +++ b/src/util-debug.c @@ -1368,8 +1368,7 @@ static char *SCLogGetLogFilename(char *filearg) char *log_dir; char *log_filename; - if (ConfGet("default-log-dir", &log_dir) != 1) - log_dir = DEFAULT_LOG_DIR; + log_dir = GetLogDirectory(); log_filename = SCMalloc(PATH_MAX); if (unlikely(log_filename == NULL)) diff --git a/src/util-logopenfile.c b/src/util-logopenfile.c index 0eae126aa2..3a94e2c7a3 100644 --- a/src/util-logopenfile.c +++ b/src/util-logopenfile.c @@ -130,8 +130,7 @@ SCConfLogOpenGeneric(ConfNode *conf, if (filename == NULL) filename = default_filename; - if (ConfGet("default-log-dir", &log_dir) != 1) - log_dir = DEFAULT_LOG_DIR; + log_dir = GetLogDirectory(); if (PathIsAbsolute(filename)) { snprintf(log_path, PATH_MAX, "%s", filename); diff --git a/src/util-profiling-rules.c b/src/util-profiling-rules.c index e7b7a2e3f2..0480ac71b9 100644 --- a/src/util-profiling-rules.c +++ b/src/util-profiling-rules.c @@ -163,8 +163,7 @@ void SCProfilingRulesGlobalInit(void) { if (filename != NULL) { char *log_dir; - if (ConfGet("default-log-dir", &log_dir) != 1) - log_dir = DEFAULT_LOG_DIR; + log_dir = GetLogDirectory(); profiling_file_name = SCMalloc(PATH_MAX); if (unlikely(profiling_file_name == NULL)) { diff --git a/src/util-profiling.c b/src/util-profiling.c index 7399116f2e..acb28c0d51 100644 --- a/src/util-profiling.c +++ b/src/util-profiling.c @@ -148,8 +148,7 @@ SCProfilingInit(void) if (filename != NULL) { char *log_dir; - if (ConfGet("default-log-dir", &log_dir) != 1) - log_dir = DEFAULT_LOG_DIR; + log_dir = GetLogDirectory(); profiling_packets_file_name = SCMalloc(PATH_MAX); if (unlikely(profiling_packets_file_name == NULL)) { @@ -180,8 +179,7 @@ SCProfilingInit(void) } char *log_dir; - if (ConfGet("default-log-dir", &log_dir) != 1) - log_dir = DEFAULT_LOG_DIR; + log_dir = GetLogDirectory(); profiling_csv_file_name = SCMalloc(PATH_MAX); if (unlikely(profiling_csv_file_name == NULL)) { @@ -227,8 +225,7 @@ SCProfilingInit(void) const char *filename = ConfNodeLookupChildValue(conf, "filename"); if (filename != NULL) { char *log_dir; - if (ConfGet("default-log-dir", &log_dir) != 1) - log_dir = DEFAULT_LOG_DIR; + log_dir = GetLogDirectory(); profiling_locks_file_name = SCMalloc(PATH_MAX); if (unlikely(profiling_locks_file_name == NULL)) {