diff options
| author | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2017-07-28 03:56:02 +0100 |
|---|---|---|
| committer | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2017-07-28 03:56:02 +0100 |
| commit | e08e2bd87aceafc2a34d72ca3fd362f2f2ea90eb (patch) | |
| tree | 4257e57b560f448190a37f93ef3bf7392c448509 /src/core | |
| parent | 437fbef6eb8f605320841cba119d3abbb3571a75 (diff) | |
| download | irssi-e08e2bd87aceafc2a34d72ca3fd362f2f2ea90eb.zip | |
Don't compute log_dir_create_mode in three different places.
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/log.c | 5 | ||||
| -rw-r--r-- | src/core/log.h | 2 | ||||
| -rw-r--r-- | src/core/rawlog.c | 9 |
3 files changed, 5 insertions, 11 deletions
diff --git a/src/core/log.c b/src/core/log.c index 6af1effc..cee1dab5 100644 --- a/src/core/log.c +++ b/src/core/log.c @@ -33,6 +33,8 @@ #define DEFAULT_LOG_FILE_CREATE_MODE 600 GSList *logs; +int log_file_create_mode; +int log_dir_create_mode; static const char *log_item_types[] = { "target", @@ -42,8 +44,6 @@ static const char *log_item_types[] = { }; static char *log_timestamp; -static int log_file_create_mode; -static int log_dir_create_mode; static int rotate_tag; static int log_item_str2type(const char *type) @@ -562,7 +562,6 @@ static void read_settings(void) log_timestamp = g_strdup(settings_get_str("log_timestamp")); log_file_create_mode = octal2dec(settings_get_int("log_create_mode")); - log_dir_create_mode = log_file_create_mode; if (log_file_create_mode & 0400) log_dir_create_mode |= 0100; if (log_file_create_mode & 0040) log_dir_create_mode |= 0010; diff --git a/src/core/log.h b/src/core/log.h index fae872c7..5a07859b 100644 --- a/src/core/log.h +++ b/src/core/log.h @@ -35,6 +35,8 @@ struct _LOG_REC { }; extern GSList *logs; +extern int log_file_create_mode; +extern int log_dir_create_mode; /* Create log record - you still need to call log_update() to actually add it into log list */ diff --git a/src/core/rawlog.c b/src/core/rawlog.c index 5927e730..2192e256 100644 --- a/src/core/rawlog.c +++ b/src/core/rawlog.c @@ -20,6 +20,7 @@ #include "module.h" #include "rawlog.h" +#include "log.h" #include "modules.h" #include "signals.h" #include "commands.h" @@ -31,8 +32,6 @@ static int rawlog_lines; static int signal_rawlog; -static int log_file_create_mode; -static int log_dir_create_mode; RAWLOG_REC *rawlog_create(void) { @@ -174,12 +173,6 @@ void rawlog_set_size(int lines) static void read_settings(void) { rawlog_set_size(settings_get_int("rawlog_lines")); - log_file_create_mode = octal2dec(settings_get_int("log_create_mode")); - log_dir_create_mode = log_file_create_mode; - if (log_file_create_mode & 0400) log_dir_create_mode |= 0100; - if (log_file_create_mode & 0040) log_dir_create_mode |= 0010; - if (log_file_create_mode & 0004) log_dir_create_mode |= 0001; - } static void cmd_rawlog(const char *data, SERVER_REC *server, void *item) |