diff options
author | Jon Poler <jdp5087@gmail.com> | 2014-12-18 06:40:17 -0500 |
---|---|---|
committer | Jon Poler <jdp5087@gmail.com> | 2014-12-18 06:40:17 -0500 |
commit | 99ae01174d602c355461d4b4666e9747e14b887a (patch) | |
tree | 53bacdbb615428ac2bd0ab1e8946d328a1fd3f48 | |
parent | d6da08fe9d86fa5f03d0a2fe74960d62bc0c00fc (diff) |
Removed calloc from logger_init, because the pid was no longer being appended.
-rw-r--r-- | toxcore/logger.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/toxcore/logger.c b/toxcore/logger.c index fe096843..32131730 100644 --- a/toxcore/logger.c +++ b/toxcore/logger.c | |||
@@ -90,36 +90,24 @@ const char *logger_stringify_level(LoggerLevel level) | |||
90 | 90 | ||
91 | int logger_init(const char *file_name, LoggerLevel level) | 91 | int logger_init(const char *file_name, LoggerLevel level) |
92 | { | 92 | { |
93 | char *final_l = calloc(sizeof(char), strlen(file_name) + 32); | 93 | if (logger.log_file) { |
94 | sprintf(final_l, "%s"/*.%u"*/, file_name/*, logger_get_pid()*/); | 94 | fprintf(stderr, "Error opening logger name: %s with level %d: file already opened!\n", |
95 | 95 | file_name, level); | |
96 | if ( logger.log_file ) { | ||
97 | fprintf(stderr, "Error opening logger name: %s with level %d: file already opened!\n", final_l, level); | ||
98 | free (final_l); | ||
99 | return -1; | 96 | return -1; |
100 | } | 97 | } |
101 | 98 | ||
102 | logger.log_file = fopen(final_l, "ab"); | 99 | logger.log_file = fopen(file_name, "ab"); |
103 | 100 | if (logger.log_file == NULL) { | |
104 | if ( logger.log_file == NULL ) { | 101 | fprintf(stderr, "Error opening logger file: %s; info: %s\n", file_name, strerror(errno)); |
105 | fprintf(stderr, "Error opening logger file: %s; info: %s\n", final_l, strerror(errno)); | ||
106 | |||
107 | free (final_l); | ||
108 | return -1; | 102 | return -1; |
109 | } | 103 | } |
110 | 104 | ||
111 | |||
112 | logger.level = level; | 105 | logger.level = level; |
113 | logger.start_time = current_time_monotonic(); | 106 | logger.start_time = current_time_monotonic(); |
114 | 107 | ||
115 | |||
116 | time_t tim = time(NULL); | 108 | time_t tim = time(NULL); |
117 | logger_write(ERROR, "\n============== Starting logger [%u] ==============\n" | 109 | logger_write(ERROR, "\n============== Starting logger [%u] ==============\n" |
118 | "Time: %s", logger_get_pid(), asctime(localtime(&tim))); | 110 | "Time: %s", logger_get_pid(), asctime(localtime(&tim))); |
119 | |||
120 | |||
121 | |||
122 | free (final_l); | ||
123 | return 0; | 111 | return 0; |
124 | } | 112 | } |
125 | 113 | ||