summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfireice-uk <fireice2@o2.pl>2017-01-05 21:20:49 +0000
committerfireice-uk <fireice2@o2.pl>2017-01-05 21:20:49 +0000
commitb9c8f59959310a1d8dadef936e47883c2afaef97 (patch)
tree0e7b36c8845a8682137bfc9f15487239d6bde8e9
parent523c63731ca1269da814659e7eeac09f404e370b (diff)
downloadxmr-stak-b9c8f59959310a1d8dadef936e47883c2afaef97.zip
xmr-stak-b9c8f59959310a1d8dadef936e47883c2afaef97.tar.gz
Minor tweaks
-rw-r--r--executor.cpp6
-rw-r--r--jpsock.cpp2
-rw-r--r--minethd.cpp2
-rw-r--r--socks.h5
4 files changed, 7 insertions, 8 deletions
diff --git a/executor.cpp b/executor.cpp
index b3333ae..6028ffe 100644
--- a/executor.cpp
+++ b/executor.cpp
@@ -479,7 +479,7 @@ void executor::hashrate_report()
output.append(hps_format(fHighestHps, num, sizeof(num)));
output.append(" H/s\n");
- fputs(output.c_str(), stdout);
+ printer::inst()->print_str(output.c_str());
}
char* time_format(char* buf, size_t len, std::chrono::system_clock::time_point time)
@@ -562,7 +562,7 @@ void executor::result_report()
else
out.append("Yay! No errors.\n");
- fputs(out.c_str(), stdout);
+ printer::inst()->print_str(output.c_str());
}
void executor::connection_report()
@@ -601,5 +601,5 @@ void executor::connection_report()
else
out.append("Yay! No errors.\n");
- fputs(out.c_str(), stdout);
+ printer::inst()->print_str(output.c_str());
}
diff --git a/jpsock.cpp b/jpsock.cpp
index fd85daa..29f91d4 100644
--- a/jpsock.cpp
+++ b/jpsock.cpp
@@ -24,7 +24,7 @@
#include "jext.h"
#include "socks.h"
-#define AGENTID_STR "geezer-cli/0.9"
+#define AGENTID_STR "xmr-stak-cpu/1.0"
using namespace rapidjson;
diff --git a/minethd.cpp b/minethd.cpp
index 20f298d..c74883c 100644
--- a/minethd.cpp
+++ b/minethd.cpp
@@ -238,7 +238,7 @@ bool minethd::self_test()
if((ctx1 = minethd_alloc_ctx()) == nullptr)
{
- cryptonight_free_ctx(ctx1);
+ cryptonight_free_ctx(ctx0);
return false;
}
diff --git a/socks.h b/socks.h
index 42572c6..2d7c94f 100644
--- a/socks.h
+++ b/socks.h
@@ -19,7 +19,6 @@ inline void sock_init()
}
}
-
inline void sock_close(SOCKET s)
{
shutdown(s, SD_BOTH);
@@ -65,8 +64,8 @@ inline const char* sock_gai_strerror(int err, char* buf, size_t len)
inline void sock_init() {}
typedef int SOCKET;
-#define INVALID_SOCKET (-1)
-#define SOCKET_ERROR (-1)
+#define INVALID_SOCKET (-1)
+#define SOCKET_ERROR (-1)
inline void sock_close(SOCKET s)
{
OpenPOWER on IntegriCloud