diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-02-21 11:16:43 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-02-21 11:16:43 +0200 |
| commit | d11dbe7dc24c8ab30afc2ce6b004885979ee8be6 (patch) | |
| tree | 878f7b040b6fa675f6f117b0b7ca285570c4ceb1 /contrib | |
| parent | d2059dfab297c01f0edf35dfb07acf5ebc42543e (diff) | |
| parent | a5a0a3c8944f7cd6b5b72aaf2b9c41c7b3c40358 (diff) | |
| download | monzero-core-d11dbe7dc24c8ab30afc2ce6b004885979ee8be6.tar.gz monzero-core-d11dbe7dc24c8ab30afc2ce6b004885979ee8be6.tar.xz monzero-core-d11dbe7dc24c8ab30afc2ce6b004885979ee8be6.zip | |
Merge pull request #1744
a5a0a3c8 core: updates can now be downloaded (and SHA256 hash checked) (moneromooo-monero)
216f062e util: add a SHA256 function (moneromooo-monero)
4bf78492 mlog: only silence errors for net by default, not net.* (moneromooo-monero)
d282cfcc core: test key images against validity domain (moneromooo-monero)
efb72e74 http_client: add a couple consts (moneromooo-monero)
f640512c Optionally query moneropulse DNS records to check for updates (moneromooo-monero)
e3cae4ae core: display any fork warning at startup too (moneromooo-monero)
969ad710 dns_utils: fix first checked DNS entry being ignored (moneromooo-monero)
08c3f380 util: add a vercmp function to compare version numbers (moneromooo-monero)
e8a7525c dns_utils: factor TXT record loading code from checkpoint code (moneromooo-monero)
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/epee/include/net/http_client.h | 4 | ||||
| -rw-r--r-- | contrib/epee/src/mlog.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/epee/include/net/http_client.h b/contrib/epee/include/net/http_client.h index 3d8c759cd..d73eda39c 100644 --- a/contrib/epee/include/net/http_client.h +++ b/contrib/epee/include/net/http_client.h @@ -107,14 +107,14 @@ using namespace std; //--------------------------------------------------------------------------- static inline const char* get_hex_vals() { - static char hexVals[16] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'}; + static const char hexVals[16] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'}; return hexVals; } static inline const char* get_unsave_chars() { //static char unsave_chars[] = "\"<>%\\^[]`+$,@:;/!#?=&"; - static char unsave_chars[] = "\"<>%\\^[]`+$,@:;!#&"; + static const char unsave_chars[] = "\"<>%\\^[]`+$,@:;!#&"; return unsave_chars; } diff --git a/contrib/epee/src/mlog.cpp b/contrib/epee/src/mlog.cpp index c212456f6..995674abd 100644 --- a/contrib/epee/src/mlog.cpp +++ b/contrib/epee/src/mlog.cpp @@ -88,7 +88,7 @@ static const char *get_default_categories(int level) switch (level) { case 0: - categories = "*:WARNING,net*:FATAL,global:INFO,verify:FATAL,stacktrace:INFO"; + categories = "*:WARNING,net:FATAL,global:INFO,verify:FATAL,stacktrace:INFO"; break; case 1: categories = "*:WARNING,global:INFO,stacktrace:INFO"; |