aboutsummaryrefslogtreecommitdiff
path: root/contrib/epee/src
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-04-25 20:40:27 +0100
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-04-25 20:42:11 +0100
commit18c2f6e21de7f23dd159267aeff859ae4374b45e (patch)
tree1598df910511b01068a17affbc7f014940c17aff /contrib/epee/src
parentMerge pull request #3670 (diff)
downloadmonero-18c2f6e21de7f23dd159267aeff859ae4374b45e.tar.xz
mlog: fix setting no logs
Diffstat (limited to 'contrib/epee/src')
-rw-r--r--contrib/epee/src/mlog.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/contrib/epee/src/mlog.cpp b/contrib/epee/src/mlog.cpp
index 5b9472006..fb0b4ac2b 100644
--- a/contrib/epee/src/mlog.cpp
+++ b/contrib/epee/src/mlog.cpp
@@ -202,7 +202,12 @@ void mlog_set_log(const char *log)
long level;
char *ptr = NULL;
- level = strtoll(log, &ptr, 10);
+ if (!*log)
+ {
+ mlog_set_categories(log);
+ return;
+ }
+ level = strtol(log, &ptr, 10);
if (ptr && *ptr)
{
// we can have a default level, eg, 2,foo:ERROR