Merge pull request #98 from kanoi/master Fix compile warnings in api.c/ Fix midstate
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317
diff --git a/api.c b/api.c
index ed17137..e53b1ba 100644
--- a/api.c
+++ b/api.c
@@ -336,7 +336,7 @@ struct CODES {
{ SEVERITY_ERR, MSG_MISFN, PARAM_NONE, "Missing save filename parameter" },
{ SEVERITY_ERR, MSG_BADFN, PARAM_STR, "Can't open or create save file '%s'" },
{ SEVERITY_ERR, MSG_SAVED, PARAM_STR, "Configuration saved to file '%s'" },
- { SEVERITY_FAIL }
+ { SEVERITY_FAIL, 0, 0, NULL }
};
static int bye = 0;
@@ -445,7 +445,7 @@ static char *message(int messageid, int paramid, char *param2, bool isjson)
return msg_buffer;
}
-static void apiversion(SOCKETTYPE c, char *param, bool isjson)
+static void apiversion(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson)
{
if (isjson)
sprintf(io_buffer, "%s," JSON_VERSION "{\"CGMiner\":\"%s\",\"API\":\"%s\"}" JSON_CLOSE,
@@ -457,7 +457,7 @@ static void apiversion(SOCKETTYPE c, char *param, bool isjson)
VERSION, APIVERSION, SEPARATOR);
}
-static void minerconfig(SOCKETTYPE c, char *param, bool isjson)
+static void minerconfig(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson)
{
char buf[BUFSIZ];
int cpucount = 0;
@@ -573,7 +573,7 @@ static void cpustatus(int cpu, bool isjson)
}
#endif
-static void devstatus(SOCKETTYPE c, char *param, bool isjson)
+static void devstatus(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson)
{
int i;
@@ -610,7 +610,7 @@ static void devstatus(SOCKETTYPE c, char *param, bool isjson)
strcat(io_buffer, JSON_CLOSE);
}
-static void gpudev(SOCKETTYPE c, char *param, bool isjson)
+static void gpudev(__maybe_unused SOCKETTYPE c, char *param, bool isjson)
{
int id;
@@ -644,7 +644,7 @@ static void gpudev(SOCKETTYPE c, char *param, bool isjson)
}
#ifdef WANT_CPUMINE
-static void cpudev(SOCKETTYPE c, char *param, bool isjson)
+static void cpudev(__maybe_unused SOCKETTYPE c, char *param, bool isjson)
{
int id;
@@ -678,7 +678,7 @@ static void cpudev(SOCKETTYPE c, char *param, bool isjson)
}
#endif
-static void poolstatus(SOCKETTYPE c, char *param, bool isjson)
+static void poolstatus(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson)
{
char buf[BUFSIZ];
char *status, *lp;
@@ -740,7 +740,7 @@ static void poolstatus(SOCKETTYPE c, char *param, bool isjson)
strcat(io_buffer, JSON_CLOSE);
}
-static void summary(SOCKETTYPE c, char *param, bool isjson)
+static void summary(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson)
{
double utility, mhs;
@@ -786,7 +786,7 @@ static void summary(SOCKETTYPE c, char *param, bool isjson)
#endif
}
-static void gpuenable(SOCKETTYPE c, char *param, bool isjson)
+static void gpuenable(__maybe_unused SOCKETTYPE c, char *param, bool isjson)
{
struct thr_info *thr;
int gpu;
@@ -832,7 +832,7 @@ static void gpuenable(SOCKETTYPE c, char *param, bool isjson)
strcpy(io_buffer, message(MSG_GPUREN, id, NULL, isjson));
}
-static void gpudisable(SOCKETTYPE c, char *param, bool isjson)
+static void gpudisable(__maybe_unused SOCKETTYPE c, char *param, bool isjson)
{
int id;
@@ -862,7 +862,7 @@ static void gpudisable(SOCKETTYPE c, char *param, bool isjson)
strcpy(io_buffer, message(MSG_GPUDIS, id, NULL, isjson));
}
-static void gpurestart(SOCKETTYPE c, char *param, bool isjson)
+static void gpurestart(__maybe_unused SOCKETTYPE c, char *param, bool isjson)
{
int id;
@@ -887,7 +887,7 @@ static void gpurestart(SOCKETTYPE c, char *param, bool isjson)
strcpy(io_buffer, message(MSG_GPUREI, id, NULL, isjson));
}
-static void gpucount(SOCKETTYPE c, char *param, bool isjson)
+static void gpucount(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson)
{
char buf[BUFSIZ];
@@ -901,7 +901,7 @@ static void gpucount(SOCKETTYPE c, char *param, bool isjson)
strcat(io_buffer, buf);
}
-static void cpucount(SOCKETTYPE c, char *param, bool isjson)
+static void cpucount(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson)
{
char buf[BUFSIZ];
int count = 0;
@@ -920,7 +920,7 @@ static void cpucount(SOCKETTYPE c, char *param, bool isjson)
strcat(io_buffer, buf);
}
-static void switchpool(SOCKETTYPE c, char *param, bool isjson)
+static void switchpool(__maybe_unused SOCKETTYPE c, char *param, bool isjson)
{
struct pool *pool;
int id;
@@ -983,7 +983,7 @@ static bool splitgpuvalue(char *param, int *gpu, char **value, bool isjson)
return true;
}
-static void gpuintensity(SOCKETTYPE c, char *param, bool isjson)
+static void gpuintensity(__maybe_unused SOCKETTYPE c, char *param, bool isjson)
{
int id;
char *value;
@@ -1012,7 +1012,7 @@ static void gpuintensity(SOCKETTYPE c, char *param, bool isjson)
strcpy(io_buffer, message(MSG_GPUINT, id, intensitystr, isjson));
}
-static void gpumem(SOCKETTYPE c, char *param, bool isjson)
+static void gpumem(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson)
{
#ifdef HAVE_ADL
int id;
@@ -1033,7 +1033,7 @@ static void gpumem(SOCKETTYPE c, char *param, bool isjson)
#endif
}
-static void gpuengine(SOCKETTYPE c, char *param, bool isjson)
+static void gpuengine(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson)
{
#ifdef HAVE_ADL
int id;
@@ -1054,7 +1054,7 @@ static void gpuengine(SOCKETTYPE c, char *param, bool isjson)
#endif
}
-static void gpufan(SOCKETTYPE c, char *param, bool isjson)
+static void gpufan(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson)
{
#ifdef HAVE_ADL
int id;
@@ -1075,7 +1075,7 @@ static void gpufan(SOCKETTYPE c, char *param, bool isjson)
#endif
}
-static void gpuvddc(SOCKETTYPE c, char *param, bool isjson)
+static void gpuvddc(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, bool isjson)
{
#ifdef HAVE_ADL
int id;
@@ -1098,7 +1098,7 @@ static void gpuvddc(SOCKETTYPE c, char *param, bool isjson)
static void send_result(SOCKETTYPE c, bool isjson);
-void doquit(SOCKETTYPE c, char *param, bool isjson)
+void doquit(SOCKETTYPE c, __maybe_unused char *param, bool isjson)
{
if (isjson)
strcpy(io_buffer, JSON_START JSON_BYE);
@@ -1111,7 +1111,7 @@ void doquit(SOCKETTYPE c, char *param, bool isjson)
kill_work();
}
-void dosave(SOCKETTYPE c, char *param, bool isjson)
+void dosave(__maybe_unused SOCKETTYPE c, char *param, bool isjson)
{
FILE *fcfg;
@@ -1158,7 +1158,7 @@ struct CMDS {
{ "gpuvddc", gpuvddc},
{ "save", dosave },
{ "quit", doquit },
- { NULL }
+ { NULL, NULL }
};
static void send_result(SOCKETTYPE c, bool isjson)
@@ -1251,7 +1251,7 @@ void api(void)
if (!opt_api_network) {
serv.sin_addr.s_addr = inet_addr(localaddr);
- if (serv.sin_addr.s_addr == INVINETADDR) {
+ if (serv.sin_addr.s_addr == (in_addr_t)INVINETADDR) {
applog(LOG_ERR, "API2 initialisation failed (%s)%s", SOCKERRMSG, UNAVAILABLE);
return;
}
diff --git a/miner.h b/miner.h
index 8f4e035..fcef5e5 100644
--- a/miner.h
+++ b/miner.h
@@ -147,6 +147,7 @@ enum {
#define unlikely(expr) (expr)
#define likely(expr) (expr)
#endif
+#define __maybe_unused __attribute__((unused))
#if defined(__i386__)
#define WANT_CRYPTOPP_ASM32
diff --git a/sha2.c b/sha2.c
index 3a270de..34239b9 100644
--- a/sha2.c
+++ b/sha2.c
@@ -40,10 +40,10 @@
#ifndef GET_ULONG_BE
#define GET_ULONG_BE(n,b,i) \
{ \
- (n) = ( (unsigned long) (b)[(i) ] << 24 ) \
- | ( (unsigned long) (b)[(i) + 1] << 16 ) \
- | ( (unsigned long) (b)[(i) + 2] << 8 ) \
- | ( (unsigned long) (b)[(i) + 3] ); \
+ (n) = ( (uint32_t) (b)[(i) ] << 24 ) \
+ | ( (uint32_t) (b)[(i) + 1] << 16 ) \
+ | ( (uint32_t) (b)[(i) + 2] << 8 ) \
+ | ( (uint32_t) (b)[(i) + 3] ); \
}
#endif
@@ -95,8 +95,8 @@ void sha2_starts( sha2_context *ctx, int is224 )
static void sha2_process( sha2_context *ctx, const unsigned char data[64] )
{
- unsigned long temp1, temp2, W[64];
- unsigned long A, B, C, D, E, F, G, H;
+ uint32_t temp1, temp2, W[64];
+ uint32_t A, B, C, D, E, F, G, H;
GET_ULONG_BE( W[ 0], data, 0 );
GET_ULONG_BE( W[ 1], data, 4 );
@@ -230,7 +230,7 @@ static void sha2_process( sha2_context *ctx, const unsigned char data[64] )
void sha2_update( sha2_context *ctx, const unsigned char *input, int ilen )
{
int fill;
- unsigned long left;
+ uint32_t left;
if( ilen <= 0 )
return;
@@ -241,7 +241,7 @@ void sha2_update( sha2_context *ctx, const unsigned char *input, int ilen )
ctx->total[0] += ilen;
ctx->total[0] &= 0xFFFFFFFF;
- if( ctx->total[0] < (unsigned long) ilen )
+ if( ctx->total[0] < (uint32_t) ilen )
ctx->total[1]++;
if( left && ilen >= fill )
@@ -281,8 +281,8 @@ static const unsigned char sha2_padding[64] =
*/
void sha2_finish( sha2_context *ctx, unsigned char output[32] )
{
- unsigned long last, padn;
- unsigned long high, low;
+ uint32_t last, padn;
+ uint32_t high, low;
unsigned char msglen[8];
high = ( ctx->total[0] >> 29 )
diff --git a/sha2.h b/sha2.h
index cdc49a7..e7299de 100644
--- a/sha2.h
+++ b/sha2.h
@@ -26,13 +26,15 @@
#ifndef POLARSSL_SHA2_H
#define POLARSSL_SHA2_H
+#include <stdint.h>
+
/**
* \brief SHA-256 context structure
*/
typedef struct
{
- unsigned long total[2]; /*!< number of bytes processed */
- unsigned long state[8]; /*!< intermediate digest state */
+ uint32_t total[2]; /*!< number of bytes processed */
+ uint32_t state[8]; /*!< intermediate digest state */
unsigned char buffer[64]; /*!< data block being processed */
unsigned char ipad[64]; /*!< HMAC: inner padding */
diff --git a/util.c b/util.c
index 46a2aa3..733d8ad 100644
--- a/util.c
+++ b/util.c
@@ -373,7 +373,7 @@ json_t *json_rpc_call(CURL *curl, const char *url,
headers = curl_slist_append(headers,
"Content-type: application/json");
headers = curl_slist_append(headers,
- "X-Mining-Extensions: longpoll rollntime");
+ "X-Mining-Extensions: longpoll midstate rollntime");
headers = curl_slist_append(headers, len_hdr);
headers = curl_slist_append(headers, user_agent_hdr);
headers = curl_slist_append(headers, "Expect:"); /* disable Expect hdr*/