Auto merge of #2548 - jasondavies:fix-bitcoin-mentions, r=str4d
Replace "Bitcoin" with "Zcash" in thread names and error messages Part of #1756.
This commit is contained in:
commit
4485d5d3f3
|
@ -16,7 +16,7 @@
|
||||||
#include "compat/endian.h"
|
#include "compat/endian.h"
|
||||||
|
|
||||||
#if defined(NDEBUG)
|
#if defined(NDEBUG)
|
||||||
# error "Bitcoin cannot be compiled without assertions."
|
# error "Zcash cannot be compiled without assertions."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
uint16_t static inline ReadLE16(const unsigned char* ptr)
|
uint16_t static inline ReadLE16(const unsigned char* ptr)
|
||||||
|
|
|
@ -267,7 +267,7 @@ static void http_request_cb(struct evhttp_request* req, void* arg)
|
||||||
/** Event dispatcher thread */
|
/** Event dispatcher thread */
|
||||||
static void ThreadHTTP(struct event_base* base, struct evhttp* http)
|
static void ThreadHTTP(struct event_base* base, struct evhttp* http)
|
||||||
{
|
{
|
||||||
RenameThread("bitcoin-http");
|
RenameThread("zcash-http");
|
||||||
LogPrint("http", "Entering http event loop\n");
|
LogPrint("http", "Entering http event loop\n");
|
||||||
event_base_dispatch(base);
|
event_base_dispatch(base);
|
||||||
// Event loop will be interrupted by InterruptHTTPServer()
|
// Event loop will be interrupted by InterruptHTTPServer()
|
||||||
|
@ -316,7 +316,7 @@ static bool HTTPBindAddresses(struct evhttp* http)
|
||||||
/** Simple wrapper to set thread name and run work queue */
|
/** Simple wrapper to set thread name and run work queue */
|
||||||
static void HTTPWorkQueueRun(WorkQueue<HTTPClosure>* queue)
|
static void HTTPWorkQueueRun(WorkQueue<HTTPClosure>* queue)
|
||||||
{
|
{
|
||||||
RenameThread("bitcoin-httpworker");
|
RenameThread("zcash-httpworker");
|
||||||
queue->Run();
|
queue->Run();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1636,7 +1636,7 @@ bool BindListenPort(const CService &addrBind, string& strError, bool fWhiteliste
|
||||||
{
|
{
|
||||||
int nErr = WSAGetLastError();
|
int nErr = WSAGetLastError();
|
||||||
if (nErr == WSAEADDRINUSE)
|
if (nErr == WSAEADDRINUSE)
|
||||||
strError = strprintf(_("Unable to bind to %s on this computer. Bitcoin Core is probably already running."), addrBind.ToString());
|
strError = strprintf(_("Unable to bind to %s on this computer. Zcash is probably already running."), addrBind.ToString());
|
||||||
else
|
else
|
||||||
strError = strprintf(_("Unable to bind to %s on this computer (bind returned error %s)"), addrBind.ToString(), NetworkErrorString(nErr));
|
strError = strprintf(_("Unable to bind to %s on this computer (bind returned error %s)"), addrBind.ToString(), NetworkErrorString(nErr));
|
||||||
LogPrintf("%s\n", strError);
|
LogPrintf("%s\n", strError);
|
||||||
|
|
Loading…
Reference in New Issue